Skip to content

Make sure headers are always lowercase to avoid duplicate headers #307

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 1 commit into
base: master
Choose a base branch
from
Open

Make sure headers are always lowercase to avoid duplicate headers #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 29 additions & 17 deletions lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ function autoDetermineStyle(options) {

function getCopyHeaders(sourceBucket, sourceFilename, headers) {
sourceFilename = encodeSpecialCharacters(ensureLeadingSlash(sourceFilename));
headers = utils.merge({}, headers || {});
headers = headers ? utils.lowercase({}, headers) : {};
headers['x-amz-copy-source'] = '/' + sourceBucket + sourceFilename;
headers['Content-Length'] = 0; // to avoid Node's automatic chunking if omitted
headers['content-length'] = 0; // to avoid Node's automatic chunking if omitted
return headers;
}

Expand Down Expand Up @@ -322,7 +322,7 @@ Client.prototype.request = function(method, filename, headers){
*/

Client.prototype.put = function(filename, headers){
headers = utils.merge({}, headers || {});
headers = headers ? utils.lowercase({}, headers) : {};
return this.request('PUT', encodeSpecialCharacters(filename), headers);
};

Expand Down Expand Up @@ -354,7 +354,8 @@ Client.prototype.putFile = function(src, filename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

debug('put %s', src);
fs.stat(src, function (err, stat) {
Expand All @@ -369,8 +370,8 @@ Client.prototype.putFile = function(src, filename, headers, fn){
}

headers = utils.merge({
'Content-Length': stat.size
, 'Content-Type': contentType
'content-length': stat.size
, 'content-type': contentType
}, headers);

var stream = fs.createReadStream(src);
Expand Down Expand Up @@ -441,9 +442,10 @@ Client.prototype.putBuffer = function(buffer, filename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

headers['Content-Length'] = buffer.length;
headers['content-length'] = buffer.length;

var req = this.put(filename, headers);
fn = once(fn);
Expand Down Expand Up @@ -481,7 +483,8 @@ Client.prototype.copyFile = function(sourceFilename, destFilename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var req = this.copy(sourceFilename, destFilename, headers);
fn = once(fn);
Expand Down Expand Up @@ -529,7 +532,8 @@ Client.prototype.copyFileTo = function(sourceFilename, destBucket, destFilename,
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var req = this.copyTo(sourceFilename, destBucket, destFilename, headers);
fn = once(fn);
Expand Down Expand Up @@ -565,7 +569,8 @@ Client.prototype.getFile = function(filename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var req = this.get(filename, headers);
registerReqListeners(req, fn);
Expand Down Expand Up @@ -600,7 +605,9 @@ Client.prototype.headFile = function(filename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var req = this.head(filename, headers);
fn = once(fn);
registerReqListeners(req, fn);
Expand Down Expand Up @@ -635,7 +642,9 @@ Client.prototype.deleteFile = function(filename, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var req = this.del(filename, headers);
fn = once(fn);
registerReqListeners(req, fn);
Expand Down Expand Up @@ -680,12 +689,13 @@ Client.prototype.deleteMultiple = function(filenames, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);

var xml = makeDeleteXmlBuffer(filenames);

headers['Content-Length'] = xml.length;
headers['Content-MD5'] = crypto.createHash('md5').update(xml).digest('base64');
headers['content-length'] = xml.length;
headers['content-md5'] = crypto.createHash('md5').update(xml).digest('base64');

var req = this.request('POST', '/?delete', headers);
fn = once(fn);
Expand Down Expand Up @@ -769,7 +779,9 @@ Client.prototype.list = function(params, headers, fn){
if ('function' == typeof headers) {
fn = headers;
headers = {};
}
} else
headers = utils.lowercase({}, headers);


if ('function' == typeof params) {
fn = params;
Expand Down
18 changes: 18 additions & 0 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,24 @@ exports.merge = function(a, b){
return a;
};

/**
* Transform all object properties to lowercase
*
* @param {Object} out
* @param {Object} input
* @return {Object} out
* @api private
*/

exports.lowercase = function (out, input) {
var keys = Object.keys(input);
for (var i = 0, len = keys.length; i < len; ++i) {
var key = keys[i];
out[key.toLowerCase()] = input[key];
}
return out;
}

/**
* Base64.
*/
Expand Down