Skip to content

[8.x] Generalize S3HttpHandler request matching (#125670) #125729

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

Merged
merged 1 commit into from
Mar 26, 2025
Merged

[8.x] Generalize S3HttpHandler request matching (#125670) #125729

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
28 changes: 24 additions & 4 deletions test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public void handle(final HttpExchange exchange) throws IOException {
exchange.sendResponseHeaders(RestStatus.OK.getStatus(), response.length);
exchange.getResponseBody().write(response);

} else if (Regex.simpleMatch("PUT /" + path + "/*?uploadId=*&partNumber=*", request)) {
} else if (isUploadPartRequest(request)) {
final Map<String, String> params = new HashMap<>();
RestUtils.decodeQueryString(request, request.indexOf('?') + 1, params);

Expand Down Expand Up @@ -212,7 +212,7 @@ public void handle(final HttpExchange exchange) throws IOException {
exchange.getResponseHeaders().add("ETag", blob.v1());
exchange.sendResponseHeaders(RestStatus.OK.getStatus(), -1);

} else if (Regex.simpleMatch("GET /" + bucket + "/?prefix=*", request)) {
} else if (isListObjectsRequest(request)) {
final Map<String, String> params = new HashMap<>();
RestUtils.decodeQueryString(request, request.indexOf('?') + 1, params);
if (params.get("list-type") != null) {
Expand Down Expand Up @@ -319,7 +319,7 @@ public void handle(final HttpExchange exchange) throws IOException {
}
exchange.sendResponseHeaders((deletions > 0 ? RestStatus.OK : RestStatus.NO_CONTENT).getStatus(), -1);

} else if (Regex.simpleMatch("POST /" + bucket + "/?delete", request)) {
} else if (isMultiObjectDeleteRequest(request)) {
final String requestBody = Streams.copyToString(new InputStreamReader(exchange.getRequestBody(), UTF_8));

final StringBuilder deletes = new StringBuilder();
Expand All @@ -341,16 +341,36 @@ public void handle(final HttpExchange exchange) throws IOException {
exchange.getResponseBody().write(response);

} else {
logger.error("unknown request: {}", request);
exchange.sendResponseHeaders(RestStatus.INTERNAL_SERVER_ERROR.getStatus(), -1);
}
} catch (Exception e) {
logger.error("exception in request " + request, e);
throw e;
} finally {
exchange.close();
}
}

private boolean isUploadPartRequest(String request) {
return Regex.simpleMatch("PUT /" + path + "/*?uploadId=*&partNumber=*", request)
|| Regex.simpleMatch("PUT /" + path + "/*?partNumber=*&uploadId=*", request);
}

private boolean isListMultipartUploadsRequest(String request) {
return Regex.simpleMatch("GET /" + bucket + "/?uploads&prefix=*", request)
|| Regex.simpleMatch("GET /" + bucket + "/?uploads&max-uploads=*&prefix=*", request);
|| Regex.simpleMatch("GET /" + bucket + "/?uploads&max-uploads=*&prefix=*", request)
|| Regex.simpleMatch("GET /" + bucket + "?uploads&prefix=*", request)
|| Regex.simpleMatch("GET /" + bucket + "?uploads&max-uploads=*&prefix=*", request);
}

private boolean isListObjectsRequest(String request) {
return Regex.simpleMatch("GET /" + bucket + "/?prefix=*", request)
|| Regex.simpleMatch("GET /" + bucket + "?list-type=2&*prefix=*", request);
}

private boolean isMultiObjectDeleteRequest(String request) {
return request.equals("POST /" + bucket + "/?delete") || request.equals("POST /" + bucket + "?delete");
}

public Map<String, BytesReference> blobs() {
Expand Down