habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

internal: fix race conditions when accessing settings before bootstrap

Browse Source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer
2022-08-06 00:24:49 +02:00
parent d5703dce39
commit 85640d402f
6 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/config/config.go
View File

@ -9,7 +9,6 @@ import (
"strings"
env "github.com/Netflix/go-env"
"github.com/imdario/mergo"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)
@ -18,8 +17,9 @@ var cfg *Config
func Get() *Config {
if cfg == nil {
cfg = defaultConfig()
cfg.Setup()
c := defaultConfig()
c.Setup()
cfg = c
}
return cfg
}
@ -28,10 +28,12 @@ func defaultConfig() *Config {
return &Config{
Debug: false,
Listen: ListenConfig{
HTTP: "localhost:9000",
HTTPS: "localhost:9443",
LDAP: "localhost:3389",
LDAPS: "localhost:6636",
HTTP: "0.0.0.0:9000",
HTTPS: "0.0.0.0:9443",
LDAP: "0.0.0.0:3389",
LDAPS: "0.0.0.0:6636",
Metrics: "0.0.0.0:9300",
Debug: "0.0.0.0:9900",
},
Paths: PathsConfig{
Media: "./media",
@ -64,28 +66,20 @@ func (c *Config) LoadConfig(path string) error {
if err != nil {
return fmt.Errorf("Failed to load config file: %w", err)
}
nc := Config{}
err = yaml.Unmarshal(raw, &nc)
err = yaml.Unmarshal(raw, c)
if err != nil {
return fmt.Errorf("Failed to parse YAML: %w", err)
}
if err := mergo.Merge(c, nc, mergo.WithOverride); err != nil {
return fmt.Errorf("failed to overlay config: %w", err)
}
c.walkScheme(c)
log.WithField("path", path).Debug("Loaded config")
return nil
}
func (c *Config) fromEnv() error {
nc := Config{}
_, err := env.UnmarshalFromEnviron(&nc)
_, err := env.UnmarshalFromEnviron(c)
if err != nil {
return fmt.Errorf("failed to load environment variables: %w", err)
}
if err := mergo.Merge(c, nc, mergo.WithOverride); err != nil {
return fmt.Errorf("failed to overlay config: %w", err)
}
c.walkScheme(c)
log.Debug("Loaded config from environment")
return nil