Skip to content

Commit

Permalink
fix STS token support for presign
Browse files Browse the repository at this point in the history
PR #830 was incomplete, this PR completes
sessionToken support

Fixes #829
  • Loading branch information
harshavardhana authored and minio-trusted committed Feb 22, 2020
1 parent cf1b28f commit 127425b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/main/minio.js
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,7 @@ export class Client {
query})
try {
url = presignSignatureV4(reqOptions, this.accessKey, this.secretKey,
region, requestDate, expires)
this.sessionToken, region, requestDate, expires)
} catch (pe) {
return cb(pe)
}
Expand Down
4 changes: 1 addition & 3 deletions src/main/signing.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ export function signV4(request, accessKey, secretKey, region, requestDate) {
}

// returns a presigned URL string
export function presignSignatureV4(request, accessKey, secretKey, region, requestDate, expires) {
export function presignSignatureV4(request, accessKey, secretKey, sessionToken, region, requestDate, expires) {
if (!isObject(request)) {
throw new TypeError('request should be of type "object"')
}
Expand Down Expand Up @@ -262,8 +262,6 @@ export function presignSignatureV4(request, accessKey, secretKey, region, reques
requestQuery.push(`X-Amz-Date=${iso8601Date}`)
requestQuery.push(`X-Amz-Expires=${expires}`)
requestQuery.push(`X-Amz-SignedHeaders=${uriEscape(signedHeaders.join(';').toLowerCase())}`)

var sessionToken = request.headers['x-amz-security-token']
if (sessionToken) {
requestQuery.push(`X-Amz-Security-Token=${sessionToken}`)
}
Expand Down

0 comments on commit 127425b

Please sign in to comment.