summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-09-06 09:21:18 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-09-06 08:21:18 -0400
commit886ab34443b25fa8f4d81e954dd8e4bfe6f99511 (patch)
tree404d54866b20140e97fdfcfe87a011a83ed60c9a /utils
parent4bd5935bd825eaa92b9d534d9554b762c38e6250 (diff)
downloadchat-886ab34443b25fa8f4d81e954dd8e4bfe6f99511.tar.gz
chat-886ab34443b25fa8f4d81e954dd8e4bfe6f99511.tar.bz2
chat-886ab34443b25fa8f4d81e954dd8e4bfe6f99511.zip
PLT-4005 Generates default Salts if empty in the config file (#3950)
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index a42b608b2..f4186d352 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -165,12 +165,21 @@ func LoadConfig(fileName string) {
CfgFileName = fileName
}
+ needSave := len(config.SqlSettings.AtRestEncryptKey) == 0 || len(*config.FileSettings.PublicLinkSalt) == 0 ||
+ len(config.EmailSettings.InviteSalt) == 0 || len(config.EmailSettings.PasswordResetSalt) == 0
+
config.SetDefaults()
if err := config.IsValid(); err != nil {
panic(T(err.Id))
}
+ if needSave {
+ if err := SaveConfig(fileName, &config); err != nil {
+ l4g.Warn(T(err.Id))
+ }
+ }
+
if err := ValidateLdapFilter(&config); err != nil {
panic(T(err.Id))
}