Skip to content

fix Server-side request forgery on WebProxyServer() #127390

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

Closed
wants to merge 1 commit into from
Closed

fix Server-side request forgery on WebProxyServer() #127390

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
18 changes: 17 additions & 1 deletion ...y-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/WebProxyServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
*/
class WebProxyServer extends MockHttpProxyServer {

private static final Set<String> ALLOWED_HOSTS = Set.of(
"example.com", // Add allowed hosts here
"api.example.com"
);

private boolean isAllowedHost(String host) {
return ALLOWED_HOSTS.contains(host);
}

private static final Set<String> BLOCKED_HEADERS = Stream.of(
"Host",
"Proxy-Connection",
Expand All @@ -51,7 +60,14 @@ public String getMethod() {
return request.getRequestLine().getMethod();
}
};
upstreamRequest.setURI(URI.create(request.getRequestLine().getUri()));
String requestUri = request.getRequestLine().getUri();
URI uri = URI.create(requestUri);
// Validate the URI against a whitelist of allowed hosts
if (!isAllowedHost(uri.getHost())) {
response.setStatusLine(request.getProtocolVersion(), 403, "Forbidden");
return;
}
upstreamRequest.setURI(uri);
upstreamRequest.setHeader("X-Via", "test-web-proxy-server");
for (Header requestHeader : request.getAllHeaders()) {
String headerName = requestHeader.getName();
Expand Down