diff options
| author | Corey Hulen <corey@hulen.com> | 2017-08-10 18:44:28 -0700 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-11 09:44:28 +0800 |
| commit | 48741434aa955d93e15e44f207294f0d90c2e0da (patch) | |
| tree | a349f421a6c0d08555773791a8c4a050b50ebdb5 /app/file.go | |
| parent | 3ff4719d4658bd9fd0627459bb976675e3841e83 (diff) | |
| download | chat-48741434aa955d93e15e44f207294f0d90c2e0da.tar.gz chat-48741434aa955d93e15e44f207294f0d90c2e0da.tar.bz2 chat-48741434aa955d93e15e44f207294f0d90c2e0da.zip | |
PLT-7360 Adding SSE to compliance (#7165)
* Adding SSE to E20
* Fixing UI bug
* Fixing loc strings
Diffstat (limited to 'app/file.go')
| -rw-r--r-- | app/file.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/file.go b/app/file.go index 03d898acd..2ec6694b4 100644 --- a/app/file.go +++ b/app/file.go @@ -115,8 +115,11 @@ func MoveFile(oldPath, newPath string) *model.AppError { secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey secure := *utils.Cfg.FileSettings.AmazonS3SSL signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - encrypt := *utils.Cfg.FileSettings.AmazonS3SSE region := utils.Cfg.FileSettings.AmazonS3Region + encrypt := false + if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed && *utils.License.Features.Compliance { + encrypt = true + } s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return model.NewLocAppError("moveFile", "api.file.write_file.s3.app_error", nil, err.Error()) @@ -156,8 +159,12 @@ func WriteFile(f []byte, path string) *model.AppError { secretKey := utils.Cfg.FileSettings.AmazonS3SecretAccessKey secure := *utils.Cfg.FileSettings.AmazonS3SSL signV2 := *utils.Cfg.FileSettings.AmazonS3SignV2 - encrypt := *utils.Cfg.FileSettings.AmazonS3SSE region := utils.Cfg.FileSettings.AmazonS3Region + encrypt := false + if *utils.Cfg.FileSettings.AmazonS3SSE && utils.IsLicensed && *utils.License.Features.Compliance { + encrypt = true + } + s3Clnt, err := s3New(endpoint, accessKey, secretKey, secure, signV2, region) if err != nil { return model.NewLocAppError("WriteFile", "api.file.write_file.s3.app_error", nil, err.Error()) |