Comparing version 1.6.2 to 1.7.0
@@ -109,6 +109,29 @@ 'use strict'; | ||
[date, region, service, 'aws4_request'].forEach(function (data) { | ||
return signingKey = hmac(signingKey, data); | ||
}); | ||
var steps = [date, region, service, 'aws4_request']; | ||
var _iteratorNormalCompletion = true; | ||
var _didIteratorError = false; | ||
var _iteratorError = undefined; | ||
try { | ||
for (var _iterator = steps[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { | ||
var data = _step.value; | ||
signingKey = hmac(signingKey, data); | ||
} | ||
} catch (err) { | ||
_didIteratorError = true; | ||
_iteratorError = err; | ||
} finally { | ||
try { | ||
if (!_iteratorNormalCompletion && _iterator.return) { | ||
_iterator.return(); | ||
} | ||
} finally { | ||
if (_didIteratorError) { | ||
throw _iteratorError; | ||
} | ||
} | ||
} | ||
return hmac(signingKey, stringToSign, 'hex'); | ||
@@ -129,11 +152,3 @@ } | ||
function authorization(algorithm, accessKeyId, credentialScope, signedHeaders, signature) { | ||
var auth = { | ||
'Credential': accessKeyId + '/' + credentialScope, | ||
'SignedHeaders': signedHeaders, | ||
'Signature': signature | ||
}; | ||
return [algorithm, Object.keys(auth).map(function (key) { | ||
return key + '=' + auth[key]; | ||
}).join(', ')].join(' '); | ||
return algorithm + ' Credential=' + accessKeyId + '/' + credentialScope + ', SignedHeaders=' + signedHeaders + ', ' + ('Signature=' + signature); | ||
} | ||
@@ -307,27 +322,48 @@ | ||
rawHeaders.forEach(function (header) { | ||
var _header$split$slice = header.split(/:(.+)/).slice(0, 2); | ||
var _iteratorNormalCompletion2 = true; | ||
var _didIteratorError2 = false; | ||
var _iteratorError2 = undefined; | ||
var _header$split$slice2 = _slicedToArray(_header$split$slice, 2); | ||
try { | ||
for (var _iterator2 = rawHeaders[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { | ||
var header = _step2.value; | ||
var name = _header$split$slice2[0]; | ||
var value = _header$split$slice2[1]; | ||
var _header$split$slice = header.split(/:(.+)/).slice(0, 2); | ||
var _header$split$slice2 = _slicedToArray(_header$split$slice, 2); | ||
if (value) { | ||
name = name.toLowerCase(); | ||
lastHeaderName = name; | ||
} else { | ||
name = lastHeaderName; | ||
value = header; | ||
} | ||
var name = _header$split$slice2[0]; | ||
var value = _header$split$slice2[1]; | ||
value = value.replace(/\s+/g, ' ').trim(); | ||
if (name in headersMap) { | ||
headersMap[name].push(value); | ||
} else { | ||
headersMap[name] = [value]; | ||
if (value) { | ||
name = name.toLowerCase(); | ||
lastHeaderName = name; | ||
} else { | ||
name = lastHeaderName; | ||
value = header; | ||
} | ||
value = value.replace(/\s+/g, ' ').trim(); | ||
if (name in headersMap) { | ||
headersMap[name].push(value); | ||
} else { | ||
headersMap[name] = [value]; | ||
} | ||
} | ||
}); | ||
} catch (err) { | ||
_didIteratorError2 = true; | ||
_iteratorError2 = err; | ||
} finally { | ||
try { | ||
if (!_iteratorNormalCompletion2 && _iterator2.return) { | ||
_iterator2.return(); | ||
} | ||
} finally { | ||
if (_didIteratorError2) { | ||
throw _iteratorError2; | ||
} | ||
} | ||
} | ||
@@ -334,0 +370,0 @@ var signedHeadersList = Object.keys(headersMap).sort(); |
{ | ||
"name": "aws-sigv4", | ||
"version": "1.6.2", | ||
"version": "1.7.0", | ||
"dependencies": {} | ||
} |
{ | ||
"name": "aws-sigv4", | ||
"version": "1.6.2", | ||
"version": "1.7.0", | ||
"description": "AWS Signature Version 4", | ||
@@ -27,3 +27,3 @@ "main": "lib/index.js", | ||
"coveralls": "^2.11.4", | ||
"eslint": "^2.1.0", | ||
"eslint": "^2.13.1", | ||
"gulp": "^3.9.0", | ||
@@ -33,5 +33,5 @@ "gulp-download": "0.0.1", | ||
"gulp-util": "^3.0.7", | ||
"mocha": "^2.3.3", | ||
"mocha-eslint": "^2.0.2", | ||
"nyc": "^6.4.0" | ||
"mocha": "^2.5.3", | ||
"mocha-eslint": "^2.1.1", | ||
"nyc": "^6.6.1" | ||
}, | ||
@@ -38,0 +38,0 @@ "babel": { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
56763
363