Skip to content
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

Update uri with encoded path if it was part of the original request #45

Closed
wants to merge 2 commits into from
Closed

Update uri with encoded path if it was part of the original request #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
652597a
Update uri with encoded path if it was part of the original request
Jan 26, 2017
3f2c199
Handle queries correctly
Jan 26, 2017
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
5 changes: 5 additions & 0 deletions aws4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ RequestSigner.prototype.sign = function() {

this.request.path = this.formatPath()

if (this.request.uri) {
var uriParts = this.request.uri.match(/(http(?:s|):\/\/)([^\/]+)(.+)/)
this.request.uri = uriParts[1] + uriParts[2] + this.request.path
}

return this.request
}

Expand Down
57 changes: 57 additions & 0 deletions test/fast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,63 @@ describe('aws4', function() {
})
})

describe('#sign() without uri', function() {
it('should not add add uri to request', function() {
var opts = aws4.sign({
service: 'dynamodb',
path: '/items/module:sub-module:item.collection:12345' + iso,
headers: {
'Content-Type': 'application/x-amz-json-1.0',
'X-Amz-Target': 'DynamoDB_20120810.ListTables'
},
body: '{}',
signQuery: true
})
if (opts.uri !== undefined) {
throw 'uri has been added to the original request'
}
})
})

describe('#sign() with uri and signQuery=false', function() {
it('should update uri in request with encoded path', function() {
var opts = aws4.sign({
service: 'dynamodb',
path: '/items/module:sub-module:item.collection:12345',
host: 'host.of.app',
uri: 'https://host.of.app/items/module:sub-module:item.collection:12345',
headers: {
'Content-Type': 'application/x-amz-json-1.0',
'X-Amz-Target': 'DynamoDB_20120810.ListTables'
},
body: '{}',
signQuery: false
})
opts.uri.should.equal('https://host.of.app/items/module%3Asub-module%3Aitem.collection%3A12345')
})
})

describe('#sign() with uri and signQuery=true', function() {
it('should update uri in request with encoded path', function() {
var opts = aws4.sign({
service: 'dynamodb',
path: '/items/module:sub-module:item.collection:12345' + '/?X-Amz-Date=' + iso,
host: 'host.of.app',
uri: 'https://host.of.app/items/module:sub-module:item.collection:12345',
headers: {
'Content-Type': 'application/x-amz-json-1.0',
'X-Amz-Target': 'DynamoDB_20120810.ListTables'
},
body: '{}',
signQuery: true
})
opts.uri.should.equal('https://host.of.app/items/module%3Asub-module%3Aitem.collection%3A12345/?X-Amz-Date=20121226T061030Z&' +
'X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=ABCDEF%2F20121226%2Fus-east-1%2Fdynamodb%2Faws4_request&' +
'X-Amz-SignedHeaders=content-type%3Bhost%3Bx-amz-target&' +
'X-Amz-Signature=4d6b0a644e1b9e98d966f4590b2c1c6c0aff90738522fe988175deb348f0daa9')
})
})

describe('#signature() with CodeCommit Git access', function() {
it('should generate signature correctly', function() {
var signer = new RequestSigner({
Expand Down