Skip to content

Updated to latest commit #18

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to latest commit #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7d7b4
Update S3 Support
juniarz Jul 21, 2019
9ff6fc4
Merge branch 'master' into patch-1
Apr 3, 2020
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
24 changes: 18 additions & 6 deletions lib/s3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
* keyStart: 'editor/',
* acl: 'public-read',
* accessKey: 'YOUR-AMAZON-S3-PUBLIC-ACCESS-KEY',
* secretKey: 'YOUR-AMAZON-S3-SECRET-ACCESS-KEY'
* secretKey: 'YOUR-AMAZON-S3-SECRET-ACCESS-KEY',
* sessionToken: 'YOUR_AWS_SESSION_TOKEN (required if using temporary credentials)'
* }
*
* @return:
Expand All @@ -25,7 +26,8 @@
* 'x-amz-algorithm': 'AWS4-HMAC-SHA256',
* 'x-amz-credential': xAmzCredential,
* 'x-amz-date': xAmzDate,
* 'x-amz-signature': signature
* 'x-amz-signature': signature,
* 'x-amz-security-token': sessionToken (if using temporary credentials)
* }
* }
*/
Expand All @@ -44,6 +46,7 @@ function getHash(config) {
// These can be found on your Account page, under Security Credentials > Access Keys.
var accessKeyId = config.accessKey;
var secret = config.secretKey;
var sessionToken = config.sessionToken;

var date = new Date().toISOString();
var dateString = date.substr(0, 4) + date.substr(5, 2) + date.substr(8, 2); // Ymd format.
Expand All @@ -66,6 +69,11 @@ function getHash(config) {
['starts-with', '$Content-Type', ''] // accept all files
],
}

if (sessionToken) {
policy.conditions.push({'x-amz-security-token': sessionToken});
}

var policyBase64 = new Buffer(JSON.stringify(policy)).toString('base64');


Expand All @@ -81,10 +89,9 @@ function getHash(config) {
var signingKey = hmac(dateRegionServiceKey, 'aws4_request');
var signature = hmac(signingKey, policyBase64).toString('hex');


return {
const hash = {
bucket: bucket,
region: region != 'us-east-1' ? 's3-' + region : 's3',
region: region != 'us-east-1' ? 's3.' + region : 's3',
keyStart: keyStart,
params: {
acl: acl,
Expand All @@ -94,10 +101,15 @@ function getHash(config) {
'x-amz-date': xAmzDate,
'x-amz-signature': signature
}
};

if (sessionToken) {
hash.params['x-amz-security-token'] = sessionToken;
}

return hash
}

exports.S3 = {
getHash: getHash
}
}