UniqueSoft/wg-portal
2
0
Fork 0
mirror of https://github.com/h44z/wg-portal synced 2025-06-26 18:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added TLS support for web

Browse Source 
- Added optional configurations `cert_file` and `key_file` to run web server with https

Signed-off-by: Dmytro Bondar <git@bonddim.com>
This commit is contained in:
Dmytro Bondar 2024-09-18 11:13:48 +02:00
parent a46dabc1d3
commit b30fb72a91
No known key found for this signature in database
GPG Key ID: C123CD37BBED8BB7
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -143,7 +143,8 @@ The following configuration options are available:
| csrf_secret | web | extremely_secret | The CSRF secret. | | csrf_secret | web | extremely_secret | The CSRF secret. |
| site_title | web | WireGuard Portal | The title that is shown in the web frontend. | | site_title | web | WireGuard Portal | The title that is shown in the web frontend. |
| site_company_name | web | WireGuard Portal | The company name that is shown at the bottom of the web frontend. | | site_company_name | web | WireGuard Portal | The company name that is shown at the bottom of the web frontend. |
| cert_file | web | | (Optional) Path to the TLS certificate file |
| key_file | web | | (Optional) Path to the TLS certificate key file |
## Upgrading from V1 ## Upgrading from V1

11
internal/app/api/core/server.go
View File

@ -68,8 +68,7 @@ func NewServer(cfg *config.Config, endpoints ...ApiEndpointSetupFunc) (*Server,
c.Writer.Header().Set("X-Served-By", hostname) c.Writer.Header().Set("X-Served-By", hostname)
c.Next() c.Next()
}).Use(func(c *gin.Context) { }).Use(func(c *gin.Context) {
var xRequestID string xRequestID := uuid(16)
xRequestID = uuid(16)
c.Request.Header.Set(RequestIDKey, xRequestID) c.Request.Header.Set(RequestIDKey, xRequestID)
c.Set(RequestIDKey, xRequestID) c.Set(RequestIDKey, xRequestID)
@ -106,7 +105,13 @@ func (s *Server) Run(ctx context.Context, listenAddress string) {
srvContext, cancelFn := context.WithCancel(ctx) srvContext, cancelFn := context.WithCancel(ctx)
go func() { go func() {
if err := srv.ListenAndServe(); err != nil { var err error
if s.cfg.Web.CertFile != "" && s.cfg.Web.KeyFile != "" {
err = srv.ListenAndServeTLS(s.cfg.Web.CertFile, s.cfg.Web.KeyFile)
} else {
err = srv.ListenAndServe()
}
if err != nil {
logrus.Infof("web service on %s exited: %v", listenAddress, err) logrus.Infof("web service on %s exited: %v", listenAddress, err)
cancelFn() cancelFn()
} }

2
internal/config/web.go
View File

@ -9,4 +9,6 @@ type WebConfig struct {
CsrfSecret string `yaml:"csrf_secret"` CsrfSecret string `yaml:"csrf_secret"`
SiteTitle string `yaml:"site_title"` SiteTitle string `yaml:"site_title"`
SiteCompanyName string `yaml:"site_company_name"` SiteCompanyName string `yaml:"site_company_name"`
CertFile string `yaml:"cert_file"`
KeyFile string `yaml:"key_file"`
} }