Validate AWS signer region and service in tests #125559
Merged
Conversation
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
Extends the predicate in `AwsCredentialsUtils` to verify that we are using a proper AWS v4 signature complete with the correct region and service, rather than just looking for the access key as a substring.
DaveCTurner
added
>test
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
elasticsearchmachine
added
the
Team:Distributed Coordination
DiannaHohensee
approved these changes
Mar 25, 2025
| * @see <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-auth-using-authorization-header.html">AWS v4 Signatures</a> | ||
| */ | ||
| public static BiPredicate<String, String> fixedAccessKeyAndToken(String accessKey, String sessionToken) { | ||
| public static BiPredicate<String, String> fixedAccessKeyAndToken(String accessKey, String sessionToken, String region, String service) { |
There was a problem hiding this comment.
Suggested change
| public static BiPredicate<String, String> fixedAccessKeyAndToken(String accessKey, String sessionToken, String region, String service) { | |
| public static BiPredicate<String, String> fixedAccessKeyAndToken(String accessKey, String sessionToken, String region, String awsServiceName) { |
There was a problem hiding this comment.
Going for serviceName - this is all AWS-related so we could really add an aws prefix everywhere if we start going down that path :)
There was a problem hiding this comment.
Fine by me 👍
Though I was thinking about our own service classes as opposed to cloud services.
modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java
Outdated
Show resolved
Hide resolved
| return authorizationHeader.contains("/" + service + "/aws4_request, "); | ||
| } | ||
|
|
||
| final var remainder = authorizationHeader.substring(expectedPrefix.length() + 8 /* YYYYMMDD not validated */); |
There was a problem hiding this comment.
Suggested change
| final var remainder = authorizationHeader.substring(expectedPrefix.length() + 8 /* YYYYMMDD not validated */); | |
| final var remainder = authorizationHeader.substring(expectedPrefix.length() + 8 /* add 8 to skip YYYYMMDD, not validated */); |
There was a problem hiding this comment.
👍 going for "YYYYMMDD".length() /* date not validated */ - no need for a magic 8
| } | ||
|
|
||
| if (region.equals("*")) { | ||
| // skip region validation; TODO eliminate this when region is fixed in all tests |
There was a problem hiding this comment.
I'd put this in the method comment, since callers use it: it's a feature.
DaveCTurner
added
auto-merge-without-approval
💔 Backport failedThe backport operation could not be completed due to the following error: You can use sqren/backport to manually backport by running |
DaveCTurner
added a commit
that referenced
this pull request
Mar 25, 2025
Extends the predicate in `AwsCredentialsUtils` to verify that we are using a proper AWS v4 signature complete with the correct region and service, rather than just looking for the access key as a substring.
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Mar 26, 2025
Following on from elastic#125559, we can validate the region and service name in tests that use `DynamicAwsCredentials` too.
DaveCTurner
added a commit
that referenced
this pull request
Mar 27, 2025
Following on from #125559, we can validate the region and service name in tests that use `DynamicAwsCredentials` too.
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Mar 27, 2025
Following on from elastic#125559, we can validate the region and service name in tests that use `DynamicAwsCredentials` too.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Mar 27, 2025
Following on from #125559, we can validate the region and service name in tests that use `DynamicAwsCredentials` too.
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
Extends the predicate in `AwsCredentialsUtils` to verify that we are using a proper AWS v4 signature complete with the correct region and service, rather than just looking for the access key as a substring.
omricohenn
pushed a commit
to omricohenn/elasticsearch
that referenced
this pull request
Mar 28, 2025
Following on from elastic#125559, we can validate the region and service name in tests that use `DynamicAwsCredentials` too.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Extends the predicate in
AwsCredentialsUtilsto verify that we areusing a proper AWS v4 signature complete with the correct region and
service, rather than just looking for the access key as a substring.