Skip to content
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

Require client to specify HTTP methods for pre-signed URLs #161

Closed
wants to merge 1 commit into from
Closed

Require client to specify HTTP methods for pre-signed URLs #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/rest/RequestHeadersBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
import java.util.function.Function;

import static com.google.common.collect.ImmutableList.toImmutableList;
import static io.trino.aws.proxy.server.rest.S3PresignController.PRESIGNED_URL_METHODS_HEADER_NAME;
import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
import static jakarta.ws.rs.core.Response.Status.LENGTH_REQUIRED;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;

Expand All @@ -50,7 +52,8 @@ private RequestHeadersBuilder() {}
"connection",
"amz-sdk-invocation-id",
"amx-sdk-request",
"host");
"host",
PRESIGNED_URL_METHODS_HEADER_NAME.toLowerCase(ENGLISH));

record InternalRequestHeaders(
RequestHeaders requestHeaders,
Expand Down
25 changes: 24 additions & 1 deletion trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/rest/S3PresignController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/
package io.trino.aws.proxy.server.rest;

import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject;
import io.trino.aws.proxy.server.TrinoAwsProxyConfig;
import io.trino.aws.proxy.server.security.S3SecurityController;
Expand All @@ -23,19 +24,27 @@
import io.trino.aws.proxy.spi.signing.SigningContext;
import io.trino.aws.proxy.spi.signing.SigningController;
import io.trino.aws.proxy.spi.signing.SigningMetadata;
import jakarta.ws.rs.WebApplicationException;

import java.net.URI;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;

import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.common.collect.Sets.intersection;
import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
import static java.util.Locale.ENGLISH;
import static java.util.Objects.requireNonNull;

public class S3PresignController
{
static final String PRESIGNED_URL_METHODS_HEADER_NAME = "X-Trino-Pre-Signed-Url-Methods";

private final SigningController signingController;
private final Duration presignUrlDuration;
private final S3SecurityController s3SecurityController;
Expand All @@ -53,11 +62,25 @@ public Map<String, URI> buildPresignedRemoteUrls(SigningMetadata signingMetadata
{
Optional<Instant> signatureExpiry = Optional.of(Instant.now().plusMillis(presignUrlDuration.toMillis()));

return Stream.of("GET", "PUT", "POST", "DELETE")
return getPresignedUrlRequestedMethods(request).stream()
.flatMap(httpMethod -> buildPresignedRemoteUrl(httpMethod, signingMetadata, request, targetRequestTimestamp, remoteUri, signatureExpiry))
.collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
}

private Set<String> getPresignedUrlRequestedMethods(ParsedS3Request request)
{
Set<String> requestedMethods = request.requestHeaders().unmodifiedHeaders().get(PRESIGNED_URL_METHODS_HEADER_NAME).stream()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PresignAwareAmazonS3 and PresignAwareS3Client need to be updated with this new header.

.map(value -> value.toUpperCase(ENGLISH))
.collect(toImmutableSet());
Set<String> filtered = intersection(ImmutableSet.of("GET", "PUT", "POST", "DELETE"), requestedMethods);

if (requestedMethods.size() != filtered.size()) {
throw new WebApplicationException(BAD_REQUEST);
}

return filtered;
}

private Stream<Map.Entry<String, URI>> buildPresignedRemoteUrl(String httpMethod, SigningMetadata signingMetadata, ParsedS3Request request, Instant targetRequestTimestamp, URI remoteUri, Optional<Instant> signatureExpiry)
{
SigningContext signingContext = signingController.presignRequest(
Expand Down
Loading