Add support for "derived" execution attributes. #4396
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,12 @@ import software.amazon.awssdk.annotations.SdkProtectedApi; | |
| import software.amazon.awssdk.awscore.endpoints.authscheme.EndpointAuthScheme; | ||
| import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4AuthScheme; | ||
| import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme; | ||
| import software.amazon.awssdk.core.SelectedAuthScheme; | ||
| import software.amazon.awssdk.core.exception.SdkClientException; | ||
| import software.amazon.awssdk.core.interceptor.ExecutionAttributes; | ||
| import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute; | ||
| import software.amazon.awssdk.http.auth.spi.AuthSchemeOption; | ||
| import software.amazon.awssdk.identity.spi.Identity; | ||
| import software.amazon.awssdk.utils.Logger; | ||
|
|
||
| @SdkProtectedApi | ||
|
|
@@ -50,56 +55,71 @@ public final class AuthSchemeUtils { | |
|
|
||
| String authSchemeName = scheme.get(Identifier.of("name")).expectString(); | ||
| switch (authSchemeName) { | ||
| case SIGV4A_NAME: { | ||
| SigV4aAuthScheme.Builder schemeBuilder = SigV4aAuthScheme.builder(); | ||
|
|
||
| Value signingName = scheme.get(Identifier.of("signingName")); | ||
| if (signingName != null) { | ||
| schemeBuilder.signingName(signingName.expectString()); | ||
| } | ||
|
|
||
| Value signingRegionSet = scheme.get(Identifier.of("signingRegionSet")); | ||
| if (signingRegionSet != null) { | ||
| Value.Array signingRegionSetArray = signingRegionSet.expectArray(); | ||
| for (int j = 0; j < signingRegionSetArray.size(); ++j) { | ||
| schemeBuilder.addSigningRegion(signingRegionSetArray.get(j).expectString()); | ||
| } | ||
| } | ||
|
|
||
| Value disableDoubleEncoding = scheme.get(Identifier.of("disableDoubleEncoding")); | ||
| if (disableDoubleEncoding != null) { | ||
| schemeBuilder.disableDoubleEncoding(disableDoubleEncoding.expectBool()); | ||
| } | ||
|
|
||
| authSchemes.add(schemeBuilder.build()); | ||
| } | ||
| break; | ||
| case SIGV4_NAME: { | ||
| SigV4AuthScheme.Builder schemeBuilder = SigV4AuthScheme.builder(); | ||
|
|
||
| Value signingName = scheme.get(Identifier.of("signingName")); | ||
| if (signingName != null) { | ||
| schemeBuilder.signingName(signingName.expectString()); | ||
| } | ||
|
|
||
| Value signingRegion = scheme.get(Identifier.of("signingRegion")); | ||
| if (signingRegion != null) { | ||
| schemeBuilder.signingRegion(signingRegion.expectString()); | ||
| } | ||
|
|
||
| Value disableDoubleEncoding = scheme.get(Identifier.of("disableDoubleEncoding")); | ||
| if (disableDoubleEncoding != null) { | ||
| schemeBuilder.disableDoubleEncoding(disableDoubleEncoding.expectBool()); | ||
| } | ||
|
|
||
| authSchemes.add(schemeBuilder.build()); | ||
| } | ||
| break; | ||
| default: | ||
| LOG.debug(() -> "Ignoring unknown auth scheme: " + authSchemeName); | ||
| break; | ||
| } | ||
| } | ||
| return authSchemes; | ||
| } | ||
|
|
||
| public static <T extends Identity> void putSelectedAuthScheme(ExecutionAttributes attributes, | ||
| SelectedAuthScheme<T> selectedAuthScheme) { | ||
| SelectedAuthScheme<?> existingAuthScheme = attributes.getAttribute(SdkInternalExecutionAttribute.SELECTED_AUTH_SCHEME); | ||
| if (existingAuthScheme != null) { | ||
| AuthSchemeOption.Builder selectedOption = selectedAuthScheme.authSchemeOption().toBuilder(); | ||
| existingAuthScheme.authSchemeOption().forEachIdentityProperty(selectedOption::putIdentityPropertyIfAbsent); | ||
| existingAuthScheme.authSchemeOption().forEachSignerProperty(selectedOption::putSignerPropertyIfAbsent); | ||
gosar marked this conversation as resolved.
Show resolved
Hide resolved
Comment on lines
+116
to
+117
Contributor
There was a problem hiding this comment. the putIfAbsent here means if the selectedAuthScheme overwrites the existingAuthScheme's values - this seems fine. IIUC, the only case where existingAuthScheme would be non-null when it reaches this code path would be for attributes set here before calling the AuthSchemeInterceptor (which calls this AuthSchemeUtils) few lines later here. Though makes me wonder if this method should have comments on appropriate use and prevent it getting used in some other context. Not a big deal I think, though probably another reason to move this method inside AuthSchemeInterceptor. |
||
| selectedAuthScheme = new SelectedAuthScheme<>(selectedAuthScheme.identity(), | ||
| selectedAuthScheme.signer(), | ||
| selectedOption.build()); | ||
| } | ||
|
|
||
| attributes.putAttribute(SdkInternalExecutionAttribute.SELECTED_AUTH_SCHEME, selectedAuthScheme); | ||
| } | ||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method is unrelated to endpoint rules, but I guess it is convenient to put this method in endpoint rules related utils class; instead of a new one or generate it in AuthSchemeInterceptorSpec itself.