-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
243 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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 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
24 changes: 24 additions & 0 deletions
24
trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/rest/ErrorResponse.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed 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 io.trino.aws.proxy.server.rest; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| @JacksonXmlRootElement(localName = "Error") | ||
| public record ErrorResponse(String code, String message, String resource, Optional<String> requestId) | ||
| { } |
This file contains 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
85 changes: 85 additions & 0 deletions
85
trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/rest/ThrowableMapper.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Licensed 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 io.trino.aws.proxy.server.rest; | ||
|
|
||
| import com.fasterxml.jackson.dataformat.xml.XmlMapper; | ||
| import com.google.inject.Inject; | ||
| import io.airlift.http.client.HttpStatus; | ||
| import io.airlift.log.Logger; | ||
| import io.trino.aws.proxy.spi.rest.Request; | ||
| import jakarta.ws.rs.WebApplicationException; | ||
| import jakarta.ws.rs.container.ResourceContext; | ||
| import jakarta.ws.rs.core.Context; | ||
| import jakarta.ws.rs.core.Response; | ||
| import jakarta.ws.rs.core.Response.ResponseBuilder; | ||
| import jakarta.ws.rs.ext.ExceptionMapper; | ||
| import org.glassfish.jersey.server.ContainerRequest; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; | ||
| import static jakarta.ws.rs.core.MediaType.APPLICATION_XML_TYPE; | ||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public class ThrowableMapper | ||
| implements ExceptionMapper<Throwable> | ||
| { | ||
| private static final Logger log = Logger.get(ThrowableMapper.class); | ||
| private static final String X_AMZ_REQUEST_ID = "x-amz-request-id"; | ||
|
|
||
| @Context | ||
| private ResourceContext resourceContext; | ||
|
|
||
| private final XmlMapper xmlMapper; | ||
|
|
||
| @Inject | ||
| public ThrowableMapper(XmlMapper xmlMapper) | ||
| { | ||
| this.xmlMapper = requireNonNull(xmlMapper, "xmlMapper is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public Response toResponse(Throwable throwable) | ||
| { | ||
| ContainerRequest containerRequest = resourceContext.getResource(ContainerRequest.class); | ||
| Optional<String> requestId = Optional.ofNullable((Request) containerRequest.getProperty(Request.class.getName())) | ||
| .map(Request::requestId) | ||
| .map(UUID::toString); | ||
|
|
||
| HttpStatus status = switch (throwable) { | ||
| case WebApplicationException webApplicationException -> HttpStatus.fromStatusCode(webApplicationException.getResponse().getStatus()); | ||
| default -> { | ||
| log.error(throwable, "Request failed for %s", containerRequest.getRequestUri()); | ||
| yield HttpStatus.INTERNAL_SERVER_ERROR; | ||
| } | ||
| }; | ||
|
|
||
| try { | ||
| ErrorResponse response = new ErrorResponse( | ||
| status.reason(), | ||
| throwable.getMessage(), | ||
| containerRequest.getRequestUri().getPath(), | ||
| requestId); | ||
|
|
||
| ResponseBuilder responseBuilder = Response.status(status.code()) | ||
| .header(CONTENT_TYPE, APPLICATION_XML_TYPE); | ||
| requestId.ifPresent(id -> responseBuilder.header(X_AMZ_REQUEST_ID, id)); | ||
| return responseBuilder.entity(xmlMapper.writeValueAsString(response)).build(); | ||
| } | ||
| catch (Exception e) { | ||
| return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); | ||
| } | ||
| } | ||
| } |
This file contains 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
38 changes: 38 additions & 0 deletions
38
...xy/src/test/java/io/trino/aws/proxy/server/credentials/DelegatingCredentialsProvider.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * Licensed 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 io.trino.aws.proxy.server.credentials; | ||
|
|
||
| import io.trino.aws.proxy.spi.credentials.Credentials; | ||
| import io.trino.aws.proxy.spi.credentials.CredentialsProvider; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public class DelegatingCredentialsProvider | ||
| implements CredentialsProvider | ||
| { | ||
| private CredentialsProvider delegate; | ||
|
|
||
| public void setDelegate(CredentialsProvider delegate) | ||
| { | ||
| this.delegate = requireNonNull(delegate, "delegate is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<Credentials> credentials(String emulatedAccessKey, Optional<String> session) | ||
| { | ||
| return requireNonNull(delegate, "delegate is null").credentials(emulatedAccessKey, session); | ||
| } | ||
| } |
82 changes: 82 additions & 0 deletions
82
.../trino/aws/proxy/server/plugin/exception/TestCredentialsProviderExceptionPropagation.java
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Licensed 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 io.trino.aws.proxy.server.plugin.exception; | ||
|
|
||
| import com.google.inject.Inject; | ||
| import com.google.inject.Scopes; | ||
| import io.airlift.http.client.HttpStatus; | ||
| import io.trino.aws.proxy.server.credentials.DelegatingCredentialsProvider; | ||
| import io.trino.aws.proxy.server.testing.TestingTrinoAwsProxyServer.Builder; | ||
| import io.trino.aws.proxy.server.testing.harness.BuilderFilter; | ||
| import io.trino.aws.proxy.server.testing.harness.TrinoAwsProxyTest; | ||
| import jakarta.ws.rs.WebApplicationException; | ||
| import org.junit.jupiter.api.Test; | ||
| import software.amazon.awssdk.services.s3.S3Client; | ||
| import software.amazon.awssdk.services.s3.model.S3Exception; | ||
|
|
||
| import static io.trino.aws.proxy.spi.plugin.TrinoAwsProxyServerBinding.credentialsProviderModule; | ||
| import static java.util.Objects.requireNonNull; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.assertThatThrownBy; | ||
| import static org.assertj.core.api.InstanceOfAssertFactories.type; | ||
|
|
||
| @TrinoAwsProxyTest(filters = TestCredentialsProviderExceptionPropagation.Filter.class) | ||
| public class TestCredentialsProviderExceptionPropagation | ||
| { | ||
| private final DelegatingCredentialsProvider delegatingCredentialsProvider; | ||
| private final S3Client internalClient; | ||
|
|
||
| public static class Filter | ||
| implements BuilderFilter | ||
| { | ||
| @Override | ||
| public Builder filter(Builder builder) | ||
| { | ||
| return builder.withoutTestingCredentialsRoleProviders() | ||
| .addModule(credentialsProviderModule("testing", DelegatingCredentialsProvider.class, binder -> binder.bind(DelegatingCredentialsProvider.class).in(Scopes.SINGLETON))) | ||
| .withProperty("credentials-provider.type", "testing"); | ||
| } | ||
| } | ||
|
|
||
| @Inject | ||
| public TestCredentialsProviderExceptionPropagation(DelegatingCredentialsProvider delegatingCredentialsProvider, S3Client internalClient) | ||
| { | ||
| this.delegatingCredentialsProvider = requireNonNull(delegatingCredentialsProvider, "delegatingCredentialsProvider is null"); | ||
| this.internalClient = requireNonNull(internalClient, "internalClient is null"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRuntimeException() | ||
| { | ||
| delegatingCredentialsProvider.setDelegate((_, _) -> { throw new RuntimeException("Testing exception"); }); | ||
| assertThatThrownBy(internalClient::listBuckets) | ||
| .asInstanceOf(type(S3Exception.class)) | ||
| .satisfies(s3Exception -> { | ||
| assertThat(s3Exception.statusCode()).isEqualTo(500); | ||
| assertThat(s3Exception.awsErrorDetails().errorMessage()).isEqualTo("Testing exception"); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWebApplicationException() | ||
| { | ||
| delegatingCredentialsProvider.setDelegate((_, _) -> { throw new WebApplicationException("Testing exception", HttpStatus.IM_A_TEAPOT.code()); }); | ||
| assertThatThrownBy(internalClient::listBuckets) | ||
| .asInstanceOf(type(S3Exception.class)) | ||
| .satisfies(s3Exception -> { | ||
| assertThat(s3Exception.statusCode()).isEqualTo(418); | ||
| assertThat(s3Exception.awsErrorDetails().errorMessage()).isEqualTo("Testing exception"); | ||
| }); | ||
| } | ||
| } |