nastra commented on code in PR #6951: URL: https://github.com/apache/iceberg/pull/6951#discussion_r1120061824
########## 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"); Review Comment: is this something we'd eventually want to set from the outside? If so, then it might be worth pulling those out into constants for easier reuse ########## 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( Review Comment: ```suggestion signedSdkRequest.forEachHeader((name, values) -> request.setHeader(name, values.get(0))); ``` ########## aws/src/test/java/org/apache/iceberg/aws/RESTSigV4SignerTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.Header.header; +import static org.mockserver.model.HttpRequest.request; + +import java.io.IOException; +import java.util.Map; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.iceberg.CatalogProperties; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.rest.HTTPClient; +import org.apache.iceberg.rest.auth.OAuth2Util; +import org.apache.iceberg.rest.responses.ConfigResponse; +import org.apache.iceberg.rest.responses.OAuthTokenResponse; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockserver.integration.ClientAndServer; +import org.mockserver.model.HttpResponse; +import software.amazon.awssdk.auth.signer.internal.SignerConstant; + +public class RESTSigV4SignerTest { + private static ClientAndServer mockServer; + private static HTTPClient client; + + @BeforeClass + public static void beforeClass() { + mockServer = ClientAndServer.startClientAndServer(); + + System.setProperty("aws.accessKeyId", "fake_id"); + System.setProperty("aws.secretAccessKey", "fake_secret"); + + Map<String, String> properties = + ImmutableMap.of( + CatalogProperties.URI, + "http://localhost:"; + mockServer.getLocalPort(), + "http.request.interceptor-impl", + RESTSigV4Signer.class.getName()); + client = HTTPClient.buildFrom(properties); + } + + @AfterClass + public static void afterClass() throws IOException { + mockServer.stop(); + client.close(); + } + + @Test + public void signRequestWithoutBody() { + mockServer + .when( + request() + .withMethod("GET") + .withPath("/v1/config") + .withHeader(header(HttpHeaders.AUTHORIZATION, "AWS4-HMAC-SHA256.*"))) + .respond(HttpResponse.response().withStatusCode(HttpStatus.SC_OK).withBody("{}")); + + ConfigResponse response = + client.get("v1/config", ConfigResponse.class, ImmutableMap.of(), e -> {}); + assertThat(response.defaults()).isEmpty(); + } + + @Test + public void signRequestWithBody() { + mockServer + .when( + request() + .withMethod("POST") + .withPath("/v1/oauth/token") + .withHeader(header(HttpHeaders.AUTHORIZATION, "AWS4-HMAC-SHA256.*")) + .withHeader(header(SignerConstant.X_AMZ_CONTENT_SHA256))) + .respond( + HttpResponse.response() + .withStatusCode(HttpStatus.SC_OK) + .withBody( + OAuth2Util.tokenResponseToJson( + OAuthTokenResponse.builder() + .withToken("fake_token") + .withTokenType("bearer") + .withIssuedTokenType("n/a") + .build()))); + + Map<String, String> formData = Maps.newHashMap(); + formData.put("client_id", "asdfasd"); + formData.put("client_secret", "asdfasdf"); + formData.put("scope", "catalog"); + + OAuthTokenResponse response = + client.postForm( + "v1/oauth/token", formData, OAuthTokenResponse.class, ImmutableMap.of(), e -> {}); + assertThat(response.token()).isNotNull(); Review Comment: maybe there should be a few more assertions here? ``` assertThat(response.token()).isEqualTo("fake_token"); assertThat(response.tokenType()).isEqualTo("bearer"); assertThat(response.issuedTokenType()).isEqualTo("n/a"); ``` ########## 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: ```suggestion throw new RESTException(e, "Failed to sign request due to invalid uri"); ``` ########## 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: also should the URI be mentioned in the error msg? ########## core/src/main/java/org/apache/iceberg/rest/HTTPClient.java: ########## @@ -361,6 +383,54 @@ public void close() throws IOException { httpClient.close(CloseMode.GRACEFUL); } + public static HTTPClient buildFrom(Map<String, String> properties) { + Builder builder = HTTPClient.builder(); + + builder.uri(properties.get(CatalogProperties.URI)); + + if (properties.containsKey(REQUEST_INTERCEPTOR_IMPL)) { + HttpRequestInterceptor interceptor = + loadInterceptorDynamically(properties.get(REQUEST_INTERCEPTOR_IMPL), properties); + builder.withRequestInterceptor(interceptor); + } + + return builder.build(); + } + + public static HttpRequestInterceptor loadInterceptorDynamically( Review Comment: I think it would be good to add a few unit tests for this, similar to how dynamic loading is tested in `TestCatalogUtil` ########## aws/src/test/java/org/apache/iceberg/aws/RESTSigV4SignerTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.Header.header; +import static org.mockserver.model.HttpRequest.request; + +import java.io.IOException; +import java.util.Map; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.iceberg.CatalogProperties; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.rest.HTTPClient; +import org.apache.iceberg.rest.auth.OAuth2Util; +import org.apache.iceberg.rest.responses.ConfigResponse; +import org.apache.iceberg.rest.responses.OAuthTokenResponse; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockserver.integration.ClientAndServer; +import org.mockserver.model.HttpResponse; +import software.amazon.awssdk.auth.signer.internal.SignerConstant; + +public class RESTSigV4SignerTest { Review Comment: nit: it appears that tests usually start with `TestXyz` across the codebase ########## aws/src/test/java/org/apache/iceberg/aws/RESTSigV4SignerTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.Header.header; +import static org.mockserver.model.HttpRequest.request; + +import java.io.IOException; +import java.util.Map; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.iceberg.CatalogProperties; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.rest.HTTPClient; +import org.apache.iceberg.rest.auth.OAuth2Util; +import org.apache.iceberg.rest.responses.ConfigResponse; +import org.apache.iceberg.rest.responses.OAuthTokenResponse; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockserver.integration.ClientAndServer; +import org.mockserver.model.HttpResponse; +import software.amazon.awssdk.auth.signer.internal.SignerConstant; + +public class RESTSigV4SignerTest { + private static ClientAndServer mockServer; + private static HTTPClient client; + + @BeforeClass + public static void beforeClass() { + mockServer = ClientAndServer.startClientAndServer(); + + System.setProperty("aws.accessKeyId", "fake_id"); + System.setProperty("aws.secretAccessKey", "fake_secret"); + + Map<String, String> properties = + ImmutableMap.of( + CatalogProperties.URI, + "http://localhost:"; + mockServer.getLocalPort(), + "http.request.interceptor-impl", + RESTSigV4Signer.class.getName()); + client = HTTPClient.buildFrom(properties); + } + + @AfterClass + public static void afterClass() throws IOException { + mockServer.stop(); + client.close(); Review Comment: should we maybe clear the aws properties that were set? ########## core/src/main/java/org/apache/iceberg/rest/HTTPClient.java: ########## @@ -393,10 +464,16 @@ public Builder withObjectMapper(ObjectMapper objectMapper) { return this; } + public Builder withRequestInterceptor(HttpRequestInterceptor interceptor) { + this.requestInterceptor = interceptor; + Review Comment: nit: unnecessary whitespace ########## aws/src/test/java/org/apache/iceberg/aws/RESTSigV4SignerTest.java: ########## @@ -0,0 +1,114 @@ +/* + * 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 static org.assertj.core.api.Assertions.assertThat; +import static org.mockserver.model.Header.header; +import static org.mockserver.model.HttpRequest.request; + +import java.io.IOException; +import java.util.Map; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.HttpStatus; +import org.apache.iceberg.CatalogProperties; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.rest.HTTPClient; +import org.apache.iceberg.rest.auth.OAuth2Util; +import org.apache.iceberg.rest.responses.ConfigResponse; +import org.apache.iceberg.rest.responses.OAuthTokenResponse; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.mockserver.integration.ClientAndServer; +import org.mockserver.model.HttpResponse; +import software.amazon.awssdk.auth.signer.internal.SignerConstant; + +public class RESTSigV4SignerTest { + private static ClientAndServer mockServer; + private static HTTPClient client; + + @BeforeClass + public static void beforeClass() { + mockServer = ClientAndServer.startClientAndServer(); + + System.setProperty("aws.accessKeyId", "fake_id"); + System.setProperty("aws.secretAccessKey", "fake_secret"); + + Map<String, String> properties = + ImmutableMap.of( + CatalogProperties.URI, + "http://localhost:"; + mockServer.getLocalPort(), + "http.request.interceptor-impl", + RESTSigV4Signer.class.getName()); + client = HTTPClient.buildFrom(properties); + } + + @AfterClass + public static void afterClass() throws IOException { + mockServer.stop(); + client.close(); + } + + @Test + public void signRequestWithoutBody() { + mockServer + .when( + request() + .withMethod("GET") + .withPath("/v1/config") + .withHeader(header(HttpHeaders.AUTHORIZATION, "AWS4-HMAC-SHA256.*"))) + .respond(HttpResponse.response().withStatusCode(HttpStatus.SC_OK).withBody("{}")); + + ConfigResponse response = + client.get("v1/config", ConfigResponse.class, ImmutableMap.of(), e -> {}); + assertThat(response.defaults()).isEmpty(); Review Comment: is there anything else we could check here? -- 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
