From 0a577a3496097c3b196a688eb6cd14a0b3fc7c1a Mon Sep 17 00:00:00 2001
From: Dave Workman <davidworkman9@gmail.com>
Date: Fri, 13 Sep 2013 11:19:49 -0400
Subject: [PATCH 1/2] modified read policy to wrap in filename in quotes(chrome
 needs this if there are spaces in the filename or else you will get a
 duplicate headers error) and took out the encodeURIComponent of the filename
 variable.

---
 main.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/main.js b/main.js
index 1ca9fa3..38a0def 100644
--- a/main.js
+++ b/main.js
@@ -14,10 +14,14 @@ function s3instance(accessKey, secretKey) {
         var expiration = new Date(dateObj.getTime() + duration * 1000);
         expiration = Math.round(expiration.getTime() / 1000);
 
+        if(download[0] !== '"' || download[download.length-1] !== '"') {
+            download = '"' + download + '"';
+        }
+
         var policy = 'GET\n\n\n' + expiration + '\n';
         policy += '/' + bucket + '/' + key;
         if (download) {
-            policy += '?response-content-disposition=attachment;filename=' + encodeURIComponent(download);
+            policy += '?response-content-disposition=attachment;filename=' + download;
         }
 
         var signature = crypto.createHmac("sha1", this.secretKey).update(policy);
@@ -70,4 +74,4 @@ function s3instance(accessKey, secretKey) {
 
 }
 
-module.exports = s3instance;
\ No newline at end of file
+module.exports = s3instance;

From 7d79380337d7b6da7246a0d3b4fe45e20802cda3 Mon Sep 17 00:00:00 2001
From: Dave Workman <davidworkman9@gmail.com>
Date: Mon, 22 Dec 2014 13:32:58 -0500
Subject: [PATCH 2/2] updated to be inline with meteor project

---
 main.js | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/main.js b/main.js
index 38a0def..6381a25 100644
--- a/main.js
+++ b/main.js
@@ -9,24 +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';
 
-        if(download[0] !== '"' || download[download.length-1] !== '"') {
-            download = '"' + download + '"';
-        }
-
+        
         var policy = 'GET\n\n\n' + expiration + '\n';
         policy += '/' + bucket + '/' + key;
         if (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;
@@ -35,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 = {
@@ -56,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);
@@ -65,11 +66,8 @@ function s3instance(accessKey, secretKey) {
             s3Signature:signature.digest("base64"),
             s3Key:accessKey
         };
-        if (cb) {
-            cb(s3Credentials);
-        } else {
-            return s3Credentials;
-        }
+
+        return s3Credentials;
     };
 
 }