Skip to content

Bump software.amazon.awssdk:auth from 2.25.2 to 2.26.4 #291

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump software.amazon.awssdk:auth from 2.25.2 to 2.26.4 #291

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
d799977
HSEARCH-5179 Bump software.amazon.awssdk:auth from 2.25.2 to 2.26.4
dependabot[bot] Jun 18, 2024
f06fe4a
HSEARCH-5179 Replace deprecated request signer
marko-bekhta Jun 18, 2024
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
24 changes: 11 additions & 13 deletions ...ava/org/hibernate/search/backend/elasticsearch/aws/impl/AwsSigningRequestInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,24 @@
import org.apache.http.protocol.HttpCoreContext;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.signer.Aws4Signer;
import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
import software.amazon.awssdk.http.ContentStreamProvider;
import software.amazon.awssdk.http.SdkHttpFullRequest;
import software.amazon.awssdk.http.SdkHttpMethod;
import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner;
import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
import software.amazon.awssdk.regions.Region;

class AwsSigningRequestInterceptor implements HttpRequestInterceptor {

private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );

private final Aws4Signer signer;
private final AwsV4HttpSigner signer;
private final Region region;
private final String service;
private final AwsCredentialsProvider credentialsProvider;

AwsSigningRequestInterceptor(Region region, String service, AwsCredentialsProvider credentialsProvider) {
this.signer = Aws4Signer.create();
this.signer = AwsV4HttpSigner.create();
this.region = region;
this.service = service;
this.credentialsProvider = credentialsProvider;
Expand All @@ -68,18 +68,16 @@ private void sign(HttpRequest request, HttpContext context, HttpEntityContentStr
AwsCredentials credentials = credentialsProvider.resolveCredentials();
log.tracef( "AWS credentials: %s", credentials );

Aws4SignerParams signerParams = Aws4SignerParams.builder()
.awsCredentials( credentials )
.signingRegion( region )
.signingName( service )
.build();

awsRequest = signer.sign( awsRequest, signerParams );
SignedRequest signedRequest = signer.sign( r -> r.identity( credentials )
.request( awsRequest )
.payload( awsRequest.contentStreamProvider().orElse( null ) )
.putProperty( AwsV4HttpSigner.SERVICE_SIGNING_NAME, service )
.putProperty( AwsV4HttpSigner.REGION_NAME, region.id() ) );

// The AWS SDK added some headers.
// Let's just override the existing headers with whatever the AWS SDK came up with.
// We don't expect signing to affect anything else (path, query, content, ...).
for ( Map.Entry<String, List<String>> header : awsRequest.headers().entrySet() ) {
for ( Map.Entry<String, List<String>> header : signedRequest.request().headers().entrySet() ) {
String name = header.getKey();
boolean first = true;
for ( String value : header.getValue() ) {
Expand All @@ -94,7 +92,7 @@ private void sign(HttpRequest request, HttpContext context, HttpEntityContentStr
}

if ( log.isTraceEnabled() ) {
log.tracef( "AWS request (after signing): %s", awsRequest );
log.tracef( "AWS request (after signing): %s", signedRequest );
log.tracef( "HTTP request (after signing): %s", request );
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/parents/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<documentation.org.opensearch.url>https://opensearch.org/docs/${parsed-version.org.opensearch.compatible.main.majorVersion}.${parsed-version.org.opensearch.compatible.main.minorVersion}</documentation.org.opensearch.url>

<version.com.google.code.gson>2.11.0</version.com.google.code.gson>
<version.software.amazon.awssdk>2.25.2</version.software.amazon.awssdk>
<version.software.amazon.awssdk>2.26.4</version.software.amazon.awssdk>
<!-- Jackson: used by the Elasticsearch REST client, by Avro, by the AWS SDK and in tests (wiremock, ...) -->
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
<!-- slf4j: used by the AWS SDK -->
Expand Down