Skip to content

Fixed issue where specifying a custom presigning time causes a runtime exception. #1310

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

Merged
merged 2 commits into from
Jun 26, 2019
Merged

Fixed issue where specifying a custom presigning time causes a runtime exception. #1310

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
f6413e7
Fixed issue where specifying a custom presigning time causes a runtim…
millems Jun 26, 2019
1573acd
Merge branch 'master' into millem/fix-presigner
millems Jun 26, 2019
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 .changes/next-release/bugfix-AWSSDKforJavav2-c566d54.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"category": "AWS SDK for Java v2",
"type": "bugfix",
"description": "Fixed issue where specifying a custom presigning time causes a runtime exception."
}
19 changes: 9 additions & 10 deletions core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/AbstractAws4Signer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.io.InputStream;
import java.nio.charset.Charset;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -99,7 +98,7 @@ protected SdkHttpFullRequest.Builder doPresign(SdkHttpFullRequest request,

SdkHttpFullRequest.Builder mutableRequest = request.toBuilder();

long expirationInSeconds = generateExpirationTime(signingParams);
long expirationInSeconds = getSignatureDurationInSeconds(requestParams, signingParams);
addHostHeader(mutableRequest);

AwsCredentials sanitizedCredentials = sanitizeCredentials(signingParams.awsCredentials());
Expand All @@ -112,9 +111,7 @@ protected SdkHttpFullRequest.Builder doPresign(SdkHttpFullRequest request,
}

// Add the important parameters for v4 signing
String timeStamp = requestParams.getFormattedRequestSigningDateTime();

addPreSignInformationToRequest(mutableRequest, sanitizedCredentials, requestParams, timeStamp, expirationInSeconds);
addPreSignInformationToRequest(mutableRequest, sanitizedCredentials, requestParams, expirationInSeconds);

String contentSha256 = calculateContentHashPresign(mutableRequest, signingParams);

Expand Down Expand Up @@ -275,13 +272,12 @@ private String buildAuthorizationHeader(byte[] signature,
private void addPreSignInformationToRequest(SdkHttpFullRequest.Builder mutableRequest,
AwsCredentials sanitizedCredentials,
Aws4SignerRequestParams signerParams,
String timeStamp,
long expirationInSeconds) {

String signingCredentials = sanitizedCredentials.accessKeyId() + "/" + signerParams.getScope();

mutableRequest.putRawQueryParameter(SignerConstant.X_AMZ_ALGORITHM, SignerConstant.AWS4_SIGNING_ALGORITHM);
mutableRequest.putRawQueryParameter(SignerConstant.X_AMZ_DATE, timeStamp);
mutableRequest.putRawQueryParameter(SignerConstant.X_AMZ_DATE, signerParams.getFormattedRequestSigningDateTime());
mutableRequest.putRawQueryParameter(SignerConstant.X_AMZ_SIGNED_HEADER,
getSignedHeadersString(mutableRequest.headers()));
mutableRequest.putRawQueryParameter(SignerConstant.X_AMZ_EXPIRES,
Expand Down Expand Up @@ -397,10 +393,13 @@ private void addDateHeader(SdkHttpFullRequest.Builder mutableRequest, String dat
* Generates an expiration time for the presigned url. If user has specified
* an expiration time, check if it is in the given limit.
*/
private long generateExpirationTime(U signingParams) {
private long getSignatureDurationInSeconds(Aws4SignerRequestParams requestParams,
U signingParams) {

long expirationInSeconds = signingParams.expirationTime().map(Instant::getEpochSecond)
.orElse(SignerConstant.PRESIGN_URL_MAX_EXPIRATION_SECONDS);
long expirationInSeconds = signingParams.expirationTime()
.map(t -> t.getEpochSecond() -
(requestParams.getRequestSigningDateTimeMilli() / 1000))
.orElse(SignerConstant.PRESIGN_URL_MAX_EXPIRATION_SECONDS);

if (expirationInSeconds > SignerConstant.PRESIGN_URL_MAX_EXPIRATION_SECONDS) {
throw SdkClientException.builder()
Expand Down