Skip to content

Avoid calling TypeConverters when injecting a header #26748

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
Sep 30, 2025
+9 −4
Merged

Avoid calling TypeConverters when injecting a header #26748

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
13 changes: 9 additions & 4 deletions core/trino-main/src/main/java/io/trino/server/ExternalUriInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
*/
package io.trino.server;

import jakarta.ws.rs.HeaderParam;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriBuilderException;
import jakarta.ws.rs.core.UriInfo;

import java.net.URI;
import java.net.URISyntaxException;

import static com.google.common.base.MoreObjects.firstNonNull;
import static java.util.Objects.requireNonNull;
import static java.util.Objects.requireNonNullElse;

/**
* Provides external URI information for the current request. The external URI may have a path prefix when behind a reverse proxy.
Expand All @@ -37,10 +37,15 @@ public class ExternalUriInfo
private final UriInfo uriInfo;
private final String forwardedPrefix;

public ExternalUriInfo(@Context UriInfo uriInfo, @HeaderParam(X_FORWARDED_PREFIX) String forwardedPrefix)
public ExternalUriInfo(@Context UriInfo uriInfo, @Context HttpHeaders httpHeaders)
{
this(uriInfo, requireNonNull(httpHeaders, "httpHeaders is null").getHeaderString(X_FORWARDED_PREFIX));
}

ExternalUriInfo(UriInfo uriInfo, String forwardedPrefix)
{
this.uriInfo = requireNonNull(uriInfo, "uriInfo is null");
this.forwardedPrefix = requireNonNullElse(forwardedPrefix, "");
this.forwardedPrefix = firstNonNull(forwardedPrefix, "");
}

public static ExternalUriInfo from(ContainerRequestContext requestContext)
Expand Down
Loading