Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom expiry time setting for Amazon S3 download links #3846

Merged
merged 5 commits into from
Aug 2, 2016
Merged

Custom expiry time setting for Amazon S3 download links #3846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59d2f64
Less spartan expiry time for Amazon S3 download links.
iroes Jul 23, 2016
f54cc0a
Merge branch 'develop' into awss3-longer-expiry
iroes Jul 26, 2016
171ac59
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
iroes Jul 28, 2016
b34a05b
Merge branch 'awss3-longer-expiry' of https://github.com/iroes/Rocket…
iroes Jul 28, 2016
a0a5f8c
Add URL expiry timespan to Amazon S3 URLs
iroes Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* globals Slingshot, FileUpload, AWS, SystemLogger */
var crypto = Npm.require('crypto');

var S3accessKey, S3secretKey;
var S3accessKey, S3secretKey, S3expiryTimeSpan;

var generateURL = function(file) {
if (!file || !file.s3) {
return;
}
let resourceURL = '/' + file.s3.bucket + '/' + file.s3.path + file._id;
let expires = parseInt(new Date().getTime() / 1000) + 60;
let expires = parseInt(new Date().getTime() / 1000) + Math.max(5, S3expiryTimeSpan);
let StringToSign = 'GET\n\n\n' + expires +'\n'+resourceURL;
let signature = crypto.createHmac('sha1', S3secretKey).update(new Buffer(StringToSign, 'utf-8')).digest('base64');
return file.url + '?AWSAccessKeyId='+encodeURIComponent(S3accessKey)+'&Expires='+expires+'&Signature='+encodeURIComponent(signature);
Expand Down Expand Up @@ -117,6 +117,11 @@ RocketChat.settings.get('FileUpload_S3_AWSSecretAccessKey', function(key, value)
createS3Directive();
});

RocketChat.settings.get('FileUpload_S3_URLExpiryTimeSpan', function(key, value) {
S3expiryTimeSpan = value;
createS3Directive();
});

RocketChat.settings.get('FileUpload_S3_CDN', createS3Directive);

RocketChat.settings.get('FileUpload_S3_Region', createS3Directive);
Expand Down
8 changes: 8 additions & 0 deletions packages/rocketchat-file-upload/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,14 @@ RocketChat.settings.addGroup('FileUpload', function() {
},
i18nDescription: 'Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given.'
});
this.add('FileUpload_S3_URLExpiryTimeSpan', 120, {
type: 'int',
enableQuery: {
_id: 'FileUpload_Storage_Type',
value: 'AmazonS3'
},
i18nDescription: 'FileUpload_S3_URLExpiryTimeSpan_Description'
});
});

this.section('File System', function() {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-lib/i18n/ca.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@
"FileUpload_S3_BucketURL" : "Bucket URL",
"FileUpload_S3_CDN" : "Domini CDN per descàrregues",
"FileUpload_S3_Region" : "Regió S3",
"FileUpload_S3_URLExpiryTimeSpan" : "Caducitat de les URL",
"FileUpload_S3_URLExpiryTimeSpan_Description" : "Temps després el qual les adreces d'Amazon S3 generades deixaran de ser vàlides (en segons). Si s'estableix a menys de 5 segons, aquest camp serà ignorat.",
"FileUpload_Storage_Type" : "Tipus d'emmagatzematge",
"Flags" : "Indicadors",
"Follow_social_profiles" : "Segueix els nostres perfils, fes-nos un fork a GitHub i comparteix la teva opinió sobre Rocket.Chat al nostre tauler de Trello.",
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-lib/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,8 @@
"FileUpload_S3_BucketURL" : "Bucket URL",
"FileUpload_S3_CDN" : "CDN domain for downloads",
"FileUpload_S3_Region" : "Region",
"FileUpload_S3_URLExpiryTimeSpan" : "URLs expiration timespan",
"FileUpload_S3_URLExpiryTimeSpan_Description" : "Time after which Amazon S3 generated URLs will no longer be valid (in seconds). If set to less than 5 seconds, this field will be ignored.",
"FileUpload_Storage_Type" : "Storage Type",
"Flags" : "Flags",
"Follow_social_profiles" : "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.",
Expand Down