Implemented file alternatives to sensitive env variables for Docker Secret integration

This commit is contained in:
Cameron Wichman 2023-06-14 16:33:54 -07:00
parent b9e5ddf194
commit 6213293ae2
5 changed files with 91 additions and 43 deletions

View file

@ -107,7 +107,7 @@ func (o *JsonDB) Init() error {
globalSetting.UpdatedAt = time.Now().UTC()
o.conn.Write("server", "global_settings", globalSetting)
}
// hashes
if _, err := os.Stat(hashesPath); os.IsNotExist(err) {
clientServerHashes := new(model.ClientServerHashes)
@ -124,13 +124,20 @@ func (o *JsonDB) Init() error {
user.Admin = util.DefaultIsAdmin
user.PasswordHash = util.LookupEnvOrString(util.PasswordHashEnvVar, "")
if user.PasswordHash == "" {
plaintext := util.LookupEnvOrString(util.PasswordEnvVar, util.DefaultPassword)
hash, err := util.HashPassword(plaintext)
if err != nil {
return err
user.PasswordHash = util.LookupEnvOrFile(util.PasswordHashFileEnvVar, "")
if user.PasswordHash == "" {
plaintext := util.LookupEnvOrString(util.PasswordEnvVar, util.DefaultPassword)
if plaintext == util.DefaultPassword {
plaintext = util.LookupEnvOrFile(util.PasswordFileEnvVar, util.DefaultPassword)
}
hash, err := util.HashPassword(plaintext)
if err != nil {
return err
}
user.PasswordHash = hash
}
user.PasswordHash = hash
}
o.conn.Write("users", user.Username, user)
}