summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-08-15 17:38:55 -0400
committerenahum <nahumhbl@gmail.com>2016-08-15 16:38:55 -0500
commitc5fc504cb26be0c2e96083c0bad6c79d278e3afc (patch)
tree5b160834ad1382ba77a5d63411817469a019862a /utils
parent782d5f64e7661f123be112e67037b99cea180923 (diff)
downloadchat-c5fc504cb26be0c2e96083c0bad6c79d278e3afc.tar.gz
chat-c5fc504cb26be0c2e96083c0bad6c79d278e3afc.tar.bz2
chat-c5fc504cb26be0c2e96083c0bad6c79d278e3afc.zip
PLT-3617 Switched public file links to use a sha256 hash (#3792)
* Changed FileSettings.PublicLinkSalt to be a pointer * Switched public file links to use a sha256 hash
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/config.go b/utils/config.go
index 6a4c9c90c..06d0dc440 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -334,8 +334,8 @@ func Desanitize(cfg *model.Config) {
*cfg.LdapSettings.BindPassword = *Cfg.LdapSettings.BindPassword
}
- if cfg.FileSettings.PublicLinkSalt == model.FAKE_SETTING {
- cfg.FileSettings.PublicLinkSalt = Cfg.FileSettings.PublicLinkSalt
+ if *cfg.FileSettings.PublicLinkSalt == model.FAKE_SETTING {
+ *cfg.FileSettings.PublicLinkSalt = *Cfg.FileSettings.PublicLinkSalt
}
if cfg.FileSettings.AmazonS3SecretAccessKey == model.FAKE_SETTING {
cfg.FileSettings.AmazonS3SecretAccessKey = Cfg.FileSettings.AmazonS3SecretAccessKey