colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #734 from gotify/panic-bool 

fix: panic when setting bool via envvar
This commit is contained in:
Jannis Mattheis 2024-11-16 09:31:15 +01:00 committed by GitHub
parent 8639316ead 6b3ff77651
commit cc7da2ace3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.go
View File

@ -16,15 +16,15 @@ type Configuration struct {
Port int `default:"80"` Port int `default:"80"`
SSL struct { SSL struct {
Enabled *bool `default:"false"` Enabled bool `default:"false"`
RedirectToHTTPS *bool `default:"true"` RedirectToHTTPS bool `default:"true"`
ListenAddr string `default:""` ListenAddr string `default:""`
Port int `default:"443"` Port int `default:"443"`
CertFile string `default:""` CertFile string `default:""`
CertKey string `default:""` CertKey string `default:""`
LetsEncrypt struct { LetsEncrypt struct {
Enabled *bool `default:"false"` Enabled bool `default:"false"`
AcceptTOS *bool `default:"false"` AcceptTOS bool `default:"false"`
Cache string `default:"data/certs"` Cache string `default:"data/certs"`
Hosts []string Hosts []string
} }

2
router/router.go
View File

@ -41,7 +41,7 @@ func Create(db *database.GormDatabase, vInfo *model.VersionInfo, conf *config.Co
g.Use(gin.LoggerWithFormatter(logFormatter), gin.Recovery(), gerror.Handler(), location.Default()) g.Use(gin.LoggerWithFormatter(logFormatter), gin.Recovery(), gerror.Handler(), location.Default())
g.NoRoute(gerror.NotFound()) g.NoRoute(gerror.NotFound())
if conf.Server.SSL.Enabled != nil && conf.Server.SSL.RedirectToHTTPS != nil && *conf.Server.SSL.Enabled && *conf.Server.SSL.RedirectToHTTPS { if conf.Server.SSL.Enabled && conf.Server.SSL.RedirectToHTTPS {
g.Use(func(ctx *gin.Context) { g.Use(func(ctx *gin.Context) {
if ctx.Request.TLS != nil { if ctx.Request.TLS != nil {
ctx.Next() ctx.Next()

6
runner/runner.go
View File

@ -28,8 +28,8 @@ func Run(router http.Handler, conf *config.Configuration) error {
defer httpListener.Close() defer httpListener.Close()
s := &http.Server{Handler: router} s := &http.Server{Handler: router}
if *conf.Server.SSL.Enabled { if conf.Server.SSL.Enabled {
if *conf.Server.SSL.LetsEncrypt.Enabled { if conf.Server.SSL.LetsEncrypt.Enabled {
applyLetsEncrypt(s, conf) applyLetsEncrypt(s, conf)
} }
@ -93,7 +93,7 @@ func getNetworkAndAddr(listenAddr string, port int) (string, string) {
func applyLetsEncrypt(s *http.Server, conf *config.Configuration) { func applyLetsEncrypt(s *http.Server, conf *config.Configuration) {
certManager := autocert.Manager{ certManager := autocert.Manager{
Prompt: func(tosURL string) bool { return *conf.Server.SSL.LetsEncrypt.AcceptTOS }, Prompt: func(tosURL string) bool { return conf.Server.SSL.LetsEncrypt.AcceptTOS },
HostPolicy: autocert.HostWhitelist(conf.Server.SSL.LetsEncrypt.Hosts...), HostPolicy: autocert.HostWhitelist(conf.Server.SSL.LetsEncrypt.Hosts...),
Cache: autocert.DirCache(conf.Server.SSL.LetsEncrypt.Cache), Cache: autocert.DirCache(conf.Server.SSL.LetsEncrypt.Cache),
} }