mjjo/hackpad
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #17 from kyleconroy/kjc-s3-region

Browse Source 
Make S3 region configurable.
This commit is contained in:
igorkofman
2015-09-20 13:04:59 -07:00
parent 54a312f973 e1b8de5373
commit 1c8029d514
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etherpad/etc/etherpad.local.properties.tmpl
View File

@@ -33,6 +33,7 @@ smtpPass = __smtp_password__
awsUser = __aws_key_id__
awsPass = __aws_secret__
s3Bucket = __aws_attachments_bucket__
s3Region = us-east-1
solrHostPort = 127.0.0.1:9000
solrOnly = false
etherpad.syndicateChanges = true

1
etherpad/etc/etherpad.localdev-default.properties
View File

@@ -54,3 +54,4 @@ accountIdEncryptionKey = 0123456789abcdef
collectionIdEncryptionKey = 0123456789abcdef
welcomePadSourceId = WELCOMEPAD
featureHelpPadId = FEATUREHELPPAD
s3Region = us-east-1

5
infrastructure/framework-src/modules/s3.js
View File

@@ -73,7 +73,6 @@ function getBytes(bucketName, keyName) {
}
}
var AWS_REGION = 'us-east-1';
var AWS_SERVICE = 's3';
var AWS_REQUEST = 'aws4_request';
/**
@@ -102,7 +101,7 @@ function _getS3Policy(domain, localPadId, userId, expirationDate, utcDateStr) {
{"x-amz-credential":
appjet.config.awsUser + "/" +
utcDateStr + "/" +
AWS_REGION + "/" +
appjet.config.s3Region + "/" +
AWS_SERVICE + "/" +
AWS_REQUEST
},
@@ -135,7 +134,7 @@ function getS3PolicyAndSig(domain, localPadId, userId) {
var awsSecretKey = new java.lang.String("AWS4" + AWSSecretAccessKey).getBytes("UTF8");
var dateKey = crypto.signString(awsSecretKey, utcDateStr);
var dateRegionKey = crypto.signString(dateKey, AWS_REGION);
var dateRegionKey = crypto.signString(dateKey, appjet.config.s3Region);
var dateRegionServiceKey = crypto.signString(dateRegionKey, AWS_SERVICE);
var signingKey = crypto.signString(dateRegionServiceKey, AWS_REQUEST);
var signature = crypto.signString(signingKey, s3Policy);