-
Notifications
You must be signed in to change notification settings - Fork 976
Choose next potential scheme if signer not found #4952
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.
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
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
...classes-test/src/test/java/software/amazon/awssdk/services/AuthSchemeInterceptorTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package software.amazon.awssdk.services; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.spy; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider; | ||
| import software.amazon.awssdk.core.SelectedAuthScheme; | ||
| import software.amazon.awssdk.core.interceptor.Context; | ||
| import software.amazon.awssdk.core.interceptor.ExecutionAttributes; | ||
| import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute; | ||
| import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute; | ||
| import software.amazon.awssdk.http.auth.aws.scheme.AwsV4AuthScheme; | ||
| import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme; | ||
| import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption; | ||
| import software.amazon.awssdk.http.auth.spi.signer.HttpSigner; | ||
| import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity; | ||
| import software.amazon.awssdk.identity.spi.IdentityProvider; | ||
| import software.amazon.awssdk.identity.spi.IdentityProviders; | ||
| import software.amazon.awssdk.services.protocolrestjson.auth.scheme.ProtocolRestJsonAuthSchemeParams; | ||
| import software.amazon.awssdk.services.protocolrestjson.auth.scheme.ProtocolRestJsonAuthSchemeProvider; | ||
| import software.amazon.awssdk.services.protocolrestjson.auth.scheme.internal.ProtocolRestJsonAuthSchemeInterceptor; | ||
|
|
||
| public class AuthSchemeInterceptorTest { | ||
| private static final ProtocolRestJsonAuthSchemeInterceptor INTERCEPTOR = new ProtocolRestJsonAuthSchemeInterceptor(); | ||
|
|
||
| private Context.BeforeExecution mockContext; | ||
|
|
||
| @BeforeEach | ||
| public void setup() { | ||
| mockContext = mock(Context.BeforeExecution.class); | ||
| } | ||
|
|
||
| @Test | ||
| public void resolveAuthScheme_authSchemeSignerThrows_continuesToNextAuthScheme() { | ||
| ProtocolRestJsonAuthSchemeProvider mockAuthSchemeProvider = mock(ProtocolRestJsonAuthSchemeProvider.class); | ||
| List<AuthSchemeOption> authSchemeOptions = Arrays.asList( | ||
| AuthSchemeOption.builder().schemeId(TestAuthScheme.SCHEME_ID).build(), | ||
| AuthSchemeOption.builder().schemeId(AwsV4AuthScheme.SCHEME_ID).build() | ||
| ); | ||
| when(mockAuthSchemeProvider.resolveAuthScheme(any(ProtocolRestJsonAuthSchemeParams.class))).thenReturn(authSchemeOptions); | ||
|
|
||
| IdentityProviders mockIdentityProviders = mock(IdentityProviders.class); | ||
| when(mockIdentityProviders.identityProvider(any(Class.class))).thenReturn(AnonymousCredentialsProvider.create()); | ||
|
|
||
| Map<String, AuthScheme<?>> authSchemes = new HashMap<>(); | ||
| authSchemes.put(AwsV4AuthScheme.SCHEME_ID, AwsV4AuthScheme.create()); | ||
|
|
||
| TestAuthScheme notProvidedAuthScheme = spy(new TestAuthScheme()); | ||
| authSchemes.put(TestAuthScheme.SCHEME_ID, notProvidedAuthScheme); | ||
|
|
||
| ExecutionAttributes attributes = new ExecutionAttributes(); | ||
| attributes.putAttribute(SdkExecutionAttribute.OPERATION_NAME, "GetFoo"); | ||
| attributes.putAttribute(SdkInternalExecutionAttribute.AUTH_SCHEME_RESOLVER, mockAuthSchemeProvider); | ||
| attributes.putAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDERS, mockIdentityProviders); | ||
| attributes.putAttribute(SdkInternalExecutionAttribute.AUTH_SCHEMES, authSchemes); | ||
|
|
||
| INTERCEPTOR.beforeExecution(mockContext, attributes); | ||
|
|
||
| SelectedAuthScheme<?> selectedAuthScheme = attributes.getAttribute(SdkInternalExecutionAttribute.SELECTED_AUTH_SCHEME); | ||
|
|
||
| verify(notProvidedAuthScheme).signer(); | ||
| assertThat(selectedAuthScheme.authSchemeOption().schemeId()).isEqualTo(AwsV4AuthScheme.SCHEME_ID); | ||
| } | ||
|
|
||
| private static class TestAuthScheme implements AuthScheme<AwsCredentialsIdentity> { | ||
| public static final String SCHEME_ID = "codegen-test-scheme"; | ||
|
|
||
| @Override | ||
| public String schemeId() { | ||
| return SCHEME_ID; | ||
| } | ||
|
|
||
| @Override | ||
| public IdentityProvider<AwsCredentialsIdentity> identityProvider(IdentityProviders providers) { | ||
| return providers.identityProvider(AwsCredentialsIdentity.class); | ||
| } | ||
|
|
||
| @Override | ||
| public HttpSigner<AwsCredentialsIdentity> signer() { | ||
| throw new RuntimeException("Not on classpath"); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.