Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18270 CertAuthPlugin : update the lookup attribute (without parametrization) (#4474)

heitzjm647de260b06f
diff --git a/changelog/unreleased/SOLR-18270-easy-fix-without-parametrization.yml b/changelog/unreleased/SOLR-18270-easy-fix-without-parametrization.yml
new file mode 100644
index 00000000000..6dd0337fb27
--- /dev/null
+++ b/changelog/unreleased/SOLR-18270-easy-fix-without-parametrization.yml
@@ -0,0 +1,8 @@
+title: CertAuthPlugin now uses correct Jetty attribute for certificate lookup for SSL authentication
+type: fixed
+authors:
+ - name: Jean-Marie HEITZ
+ nick: heitzjm
+links:
+ - name: SOLR-18270
+ url: https://issues.apache.org/jira/browse/SOLR-18270
diff --git a/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
index 091191fd409..84f4a5289b5 100644
--- a/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
+++ b/solr/core/src/java/org/apache/solr/security/CertAuthPlugin.java
@@ -39,6 +39,9 @@ public class CertAuthPlugin extends AuthenticationPlugin {
private static final String PARAM_CLASS = "class";
private static final String PARAM_PARAMS = "params";
+ private static final String JAKARTA_REQUEST_ATTRIBUTE_NAME =
+ "jakarta.servlet.request.X509Certificate";
+
private static final CertPrincipalResolver DEFAULT_PRINCIPAL_RESOLVER =
certificate -> certificate.getSubjectX500Principal();
protected final CoreContainer coreContainer;
@@ -102,7 +105,8 @@ public class CertAuthPlugin extends AuthenticationPlugin {
HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws Exception {
X509Certificate[] certs =
- (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate");
+ (X509Certificate[]) request.getAttribute(JAKARTA_REQUEST_ATTRIBUTE_NAME);
+
if (certs == null || certs.length == 0) {
return sendError(response, "require certificate");
}