diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-10-27 11:48:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 11:48:21 +0200 |
| commit | a32cf74fda51dbc0ed01fd9f9ae1e238246be8cd (patch) | |
| tree | 49b8d8ed8cd42f618681057805e89d7fd9fc4bb2 | |
| parent | 818292768fafbc728ef4af71599b8ea9b6278b4f (diff) | |
| parent | eb9bec9da0ccc3330a8b6739ad66e518cde4cb78 (diff) | |
Merge pull request #24614 from vespa-engine/bjorncs/jetty
Use new constant
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java | 2 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java index b3c4b165270..d45a8789e4c 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java @@ -94,6 +94,6 @@ class HttpRequestFactory { } private static X509Certificate[] getCertChain(HttpServletRequest servletRequest) { - return (X509Certificate[]) servletRequest.getAttribute("javax.servlet.request.X509Certificate"); + return (X509Certificate[]) servletRequest.getAttribute(RequestUtils.SERVLET_REQUEST_X509CERT); } } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java index 7dd715a23bf..da4de957739 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/RequestUtils.java @@ -6,6 +6,7 @@ import org.eclipse.jetty.http2.server.HTTP2ServerConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.SecureRequestCustomizer; /** * @author bjorncs @@ -14,7 +15,7 @@ public class RequestUtils { public static final String JDISC_REQUEST_X509CERT = "jdisc.request.X509Certificate"; public static final String JDISC_REQUEST_CHAIN = "jdisc.request.chain"; public static final String JDISC_RESPONSE_CHAIN = "jdisc.response.chain"; - public static final String SERVLET_REQUEST_X509CERT = "javax.servlet.request.X509Certificate"; + public static final String SERVLET_REQUEST_X509CERT = SecureRequestCustomizer.JAKARTA_SERVLET_REQUEST_X_509_CERTIFICATE; // The local port as reported by servlet spec. This will be influenced by Host header and similar mechanisms. // The request URI uses the local listen port as the URI is used for handler routing/bindings. |