Skip to content

Fix for readPolicy filenames that need to be encoded. #4

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
davidworkman9 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for readPolicy filenames that need to be encoded. #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a577a3
modified read policy to wrap in filename in quotes(chrome needs this …
davidworkman9 Sep 13, 2013
7d79380
updated to be inline with meteor project
davidworkman9 Dec 22, 2014
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
32 changes: 17 additions & 15 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,25 @@ function s3instance(accessKey, secretKey) {
this.accessKey = accessKey;
this.secretKey = secretKey;

this.readPolicy = function(key, bucket, duration, download, cb) {
this.readPolicy = function(key, bucket, duration, download, regionDomain) {
var dateObj = new Date;
var expiration = new Date(dateObj.getTime() + duration * 1000);
expiration = Math.round(expiration.getTime() / 1000);
regionDomain = regionDomain || 's3';


var policy = 'GET\n\n\n' + expiration + '\n';
policy += '/' + bucket + '/' + key;
if (download) {
policy += '?response-content-disposition=attachment;filename=' + encodeURIComponent(download);
if(download[0] !== '"' || download[download.length-1] !== '"') {
download = '"' + download + '"';
}
policy += '?response-content-disposition=attachment;filename=' + download;
}

var signature = crypto.createHmac("sha1", this.secretKey).update(policy);

var url = 'https://s3.amazonaws.com/';
var url = 'https://'+regionDomain+'.amazonaws.com/';
url += bucket + '/';
url += key;
url += '?AWSAccessKeyId=' + this.accessKey;
Expand All @@ -31,14 +36,10 @@ function s3instance(accessKey, secretKey) {
if (download) {
url += '&response-content-disposition=attachment;filename=' + encodeURIComponent(download);
}
if (cb) {
cb(null, url);
} else {
return url;
}
return url;
};

this.writePolicy = function(key, bucket, duration, filesize, cb) {
this.writePolicy = function(key, bucket, duration, filesize, useEncryption) {
var dateObj = new Date;
var dateExp = new Date(dateObj.getTime() + duration * 1000);
var policy = {
Expand All @@ -52,6 +53,10 @@ function s3instance(accessKey, secretKey) {
]
};

if(useEncryption) {
policy.conditions.push({ 'x-amz-server-side-encryption': 'AES256' });
}

var policyString = JSON.stringify(policy);
var policyBase64 = new Buffer(policyString).toString('base64');
var signature = crypto.createHmac("sha1", this.secretKey).update(policyBase64);
Expand All @@ -61,13 +66,10 @@ function s3instance(accessKey, secretKey) {
s3Signature:signature.digest("base64"),
s3Key:accessKey
};
if (cb) {
cb(s3Credentials);
} else {
return s3Credentials;
}

return s3Credentials;
};

}

module.exports = s3instance;
module.exports = s3instance;