Skip to content

Set TIME_OFFSET attribtue in SRA signin methods #4483

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
zoewangg merged 1 commit into from
Sep 26, 2023
Merged

Set TIME_OFFSET attribtue in SRA signin methods #4483

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
1 change: 1 addition & 0 deletions ...ain/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncSigningStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ private <T extends Identity> CompletableFuture<SdkHttpFullRequest> sraSignReques
RequestExecutionContext context,
SelectedAuthScheme<T> selectedAuthScheme) {
updateHttpRequestInInterceptorContext(request, context.executionContext());
adjustForClockSkew(context.executionAttributes());
CompletableFuture<? extends T> identityFuture = selectedAuthScheme.identity();
return identityFuture.thenCompose(identity -> {
CompletableFuture<SdkHttpFullRequest> signedRequestFuture = MetricUtils.reportDuration(
Expand Down
1 change: 1 addition & 0 deletions ...src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ private <T extends Identity> SdkHttpFullRequest sraSignRequest(SdkHttpFullReques
RequestExecutionContext context,
SelectedAuthScheme<T> selectedAuthScheme) {
updateHttpRequestInInterceptorContext(request, context.executionContext());
adjustForClockSkew(context.executionAttributes());
CompletableFuture<? extends T> identityFuture = selectedAuthScheme.identity();
T identity = CompletableFutureUtils.joinLikeSync(identityFuture);

Expand Down
12 changes: 12 additions & 0 deletions ...java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncSigningStageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public void execute_selectedAuthScheme_nullSigner_doesSraSign() throws Exception

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down Expand Up @@ -172,6 +174,8 @@ public void execute_selectedAuthScheme_nullSigner_timeOffsetSet_doesSraSignAndAd
httpClientDependencies.updateTimeOffset(TEST_TIME_OFFSET);
SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down Expand Up @@ -222,6 +226,8 @@ public void execute_selectedAuthScheme_nullSigner_doesSraSignAndDoesNotOverrideA

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down Expand Up @@ -273,6 +279,8 @@ public void execute_selectedAuthScheme_asyncRequestBody_doesSraSignAsync() throw

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that contexts are updated with result
Expand Down Expand Up @@ -323,6 +331,8 @@ public void execute_selectedNoAuthAuthScheme_nullSigner_doesSraSign() throws Exc

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that contexts are updated with result
Expand Down Expand Up @@ -472,6 +482,8 @@ public void execute_nullSelectedAuthScheme_signer_usesTimeOffset() throws Except
when(oldSigner.sign(request, context.executionAttributes().copy().putAttribute(TIME_OFFSET, 100))).thenReturn(signedRequest);

SdkHttpFullRequest result = stage.execute(request, context).join();
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down
9 changes: 9 additions & 0 deletions ...test/java/software/amazon/awssdk/core/internal/http/pipeline/stages/SigningStageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import software.amazon.awssdk.core.http.ExecutionContext;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.core.interceptor.InterceptorContext;
import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
import software.amazon.awssdk.core.signer.Signer;
Expand Down Expand Up @@ -115,6 +116,8 @@ public void execute_selectedAuthScheme_nullSigner_doesSraSign() throws Exception

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context);
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down Expand Up @@ -159,6 +162,8 @@ public void execute_selectedAuthScheme_nullSigner_timeOffsetSet_doesSraSignAndAd

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context);
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// Assert that interceptor context is updated with result
Expand Down Expand Up @@ -206,6 +211,8 @@ public void execute_selectedAuthScheme_nullSigner_doesSraSignAndDoesNotOverrideA

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context);
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down Expand Up @@ -247,6 +254,8 @@ public void execute_selectedNoAuthAuthScheme_nullSigner_doesSraSign() throws Exc

SdkHttpFullRequest request = ValidSdkObjects.sdkHttpFullRequest().build();
SdkHttpFullRequest result = stage.execute(request, context);
assertThat(context.executionAttributes().getAttribute(TIME_OFFSET))
.isEqualTo(httpClientDependencies.timeOffset());

assertThat(result).isSameAs(signedRequest);
// assert that interceptor context is updated with result
Expand Down