IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-7360 Adding SSE to compliance (#7165)

Browse Source 
* Adding SSE to E20

* Fixing UI bug

* Fixing loc strings
This commit is contained in:
Corey Hulen
2017-08-10 18:44:28 -07:00
committed by Saturnino Abril
parent 3ff4719d46
commit 48741434aa
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/file.go
View File

@@ -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())

44
webapp/components/admin_console/storage_settings.jsx
View File

@@ -68,6 +68,7 @@ export default class StorageSettings extends AdminSettings {
}
renderSettings() {
let amazonSSEComp;
const mobileUploadDownloadSettings = [];
if (window.mm_license.IsLicensed === 'true' && window.mm_license.Compliance === 'true') {
mobileUploadDownloadSettings.push(
@@ -113,6 +114,29 @@ export default class StorageSettings extends AdminSettings {
disabled={!this.state.enableFileAttachments}
/>
);
amazonSSEComp =
(
<BooleanSetting
id='amazonS3SSE'
label={
<FormattedMessage
id='admin.image.amazonS3SSETitle'
defaultMessage='Enable Server-Side Encryption for Amazon S3:'
/>
}
placeholder={Utils.localizeMessage('admin.image.amazonS3SSEExample', 'Ex "false"')}
helpText={
<FormattedHTMLMessage
id='admin.image.amazonS3SSEDescription'
defaultMessage='When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href="https://about.mattermost.com/default-server-side-encryption" target="_blank">documentation</a> to learn more.'
/>
}
value={this.state.amazonS3SSE}
onChange={this.handleChange}
disabled={this.state.driverName !== DRIVER_S3}
/>
);
}
return (
@@ -254,25 +278,7 @@ export default class StorageSettings extends AdminSettings {
onChange={this.handleChange}
disabled={this.state.driverName !== DRIVER_S3}
/>
<BooleanSetting
id='AmazonSSE'
label={
<FormattedMessage
id='admin.image.AmazonSSETitle'
defaultMessage='Enable Server-Side Encryption for Amazon S3:'
/>
}
placeholder={Utils.localizeMessage('admin.image.AmazonSSEExample', 'Ex "false"')}
helpText={
<FormattedMessage
id='admin.image.AmazonSSEDescription'
defaultMessage='When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href="https://about.mattermost.com/default-server-side-encryption" target="_blank">documentation</a> to learn more.'
/>
}
value={this.state.AmazonSSE}
onChange={this.handleChange}
disabled={this.state.driverName !== DRIVER_S3}
/>
{amazonSSEComp}
<BooleanSetting
id='enableFileAttachments'
label={