danielcweeks commented on code in PR #6951: URL: https://github.com/apache/iceberg/pull/6951#discussion_r1120803491
########## aws/src/main/java/org/apache/iceberg/aws/RESTSigV4Signer.java: ########## @@ -0,0 +1,110 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License 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 org.apache.iceberg.aws; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; +import org.apache.hc.core5.http.EntityDetails; +import org.apache.hc.core5.http.Header; +import org.apache.hc.core5.http.HttpRequest; +import org.apache.hc.core5.http.HttpRequestInterceptor; +import org.apache.hc.core5.http.io.entity.StringEntity; +import org.apache.hc.core5.http.protocol.HttpContext; +import org.apache.iceberg.exceptions.RESTException; +import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; +import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; +import software.amazon.awssdk.auth.signer.Aws4Signer; +import software.amazon.awssdk.auth.signer.internal.SignerConstant; +import software.amazon.awssdk.auth.signer.params.Aws4SignerParams; +import software.amazon.awssdk.auth.signer.params.SignerChecksumParams; +import software.amazon.awssdk.core.checksums.Algorithm; +import software.amazon.awssdk.http.SdkHttpFullRequest; +import software.amazon.awssdk.http.SdkHttpMethod; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain; + +public class RESTSigV4Signer implements HttpRequestInterceptor { + private final Aws4Signer signer = Aws4Signer.create(); + private final AwsCredentialsProvider credentialsProvider = + DefaultCredentialsProvider.builder().build(); + + private String signingName; + private Region signingRegion; + + public void initialize(Map<String, String> properties) { + Region defaultRegion = DefaultAwsRegionProviderChain.builder().build().getRegion(); + this.signingRegion = + Region.of(properties.getOrDefault("aws.http.sigv4.signing-region", defaultRegion.id())); + this.signingName = properties.getOrDefault("aws.http.sigv4.signing-name", "execute-api"); + } + + @Override + public void process(HttpRequest request, EntityDetails entity, HttpContext context) { + try { + Aws4SignerParams params = + Aws4SignerParams.builder() + .signingName(signingName) + .signingRegion(signingRegion) + .awsCredentials(credentialsProvider.resolveCredentials()) + .checksumParams( + SignerChecksumParams.builder() + .algorithm(Algorithm.SHA256) + .isStreamingRequest(false) + .checksumHeaderName(SignerConstant.X_AMZ_CONTENT_SHA256) + .build()) + .build(); + + SdkHttpFullRequest.Builder sdkRequestBuilder = SdkHttpFullRequest.builder(); + + sdkRequestBuilder + .method(SdkHttpMethod.fromValue(request.getMethod())) + .protocol(request.getScheme()) + .uri(request.getUri()) + .headers( + Arrays.stream(request.getHeaders()) + .collect( + Collectors.groupingBy( + Header::getName, + Collectors.mapping(Header::getValue, Collectors.toList())))); + + if (entity instanceof StringEntity) { + sdkRequestBuilder.contentStreamProvider( + () -> { + try { + return ((StringEntity) entity).getContent(); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }); + } + + SdkHttpFullRequest signedSdkRequest = signer.sign(sdkRequestBuilder.build(), params); + signedSdkRequest.forEachHeader( + (name, values) -> { + request.setHeader(name, values.get(0)); + }); + } catch (URISyntaxException e) { + throw new RESTException(e, "Failed to sign request due invalid uri"); Review Comment: Accessing the URI is what throws in the first place. I changed the message to log the request, which should include the URI. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
