From c5fc504cb26be0c2e96083c0bad6c79d278e3afc Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 15 Aug 2016 17:38:55 -0400 Subject: 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 --- model/config.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'model') diff --git a/model/config.go b/model/config.go index d13ba19e6..f73cb290b 100644 --- a/model/config.go +++ b/model/config.go @@ -129,7 +129,7 @@ type FileSettings struct { DriverName string Directory string EnablePublicLink bool - PublicLinkSalt string + PublicLinkSalt *string ThumbnailWidth int ThumbnailHeight int PreviewWidth int @@ -350,8 +350,9 @@ func (o *Config) SetDefaults() { *o.FileSettings.MaxFileSize = 52428800 // 50 MB } - if len(o.FileSettings.PublicLinkSalt) == 0 { - o.FileSettings.PublicLinkSalt = NewRandomString(32) + if len(*o.FileSettings.PublicLinkSalt) == 0 { + o.FileSettings.PublicLinkSalt = new(string) + *o.FileSettings.PublicLinkSalt = NewRandomString(32) } if o.FileSettings.AmazonS3LocationConstraint == nil { @@ -930,7 +931,7 @@ func (o *Config) IsValid() *AppError { return NewLocAppError("Config.IsValid", "model.config.is_valid.file_thumb_width.app_error", nil, "") } - if len(o.FileSettings.PublicLinkSalt) < 32 { + if len(*o.FileSettings.PublicLinkSalt) < 32 { return NewLocAppError("Config.IsValid", "model.config.is_valid.file_salt.app_error", nil, "") } @@ -1070,7 +1071,7 @@ func (o *Config) Sanitize() { *o.LdapSettings.BindPassword = FAKE_SETTING } - o.FileSettings.PublicLinkSalt = FAKE_SETTING + *o.FileSettings.PublicLinkSalt = FAKE_SETTING if len(o.FileSettings.AmazonS3SecretAccessKey) > 0 { o.FileSettings.AmazonS3SecretAccessKey = FAKE_SETTING } -- cgit v1.2.3-1-g7c22