Apache Solr open-source search software
SOLR-15617: Add kerberos.name.rules.mechanism support to KerberosPlugin (#306)
Kevin Risden678f1372ad7a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex f7e288b49ce..9279c94c1ea 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -158,6 +158,8 @@ when told to. The admin UI now tells it to. (Nazerke Seidan, David Smiley)* SOLR-15301: Eliminate repetitive index size calculation for Solr metrics (Andras Salamon)+* SOLR-15617: Add kerberos.name.rules.mechanism support to KerberosPlugin (Kevin Risden)+Build---------------------diff --git a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.javaindex 804566c9357..5da7c29e6fa 100644--- a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;import com.fasterxml.jackson.core.JsonGenerator;import com.google.common.annotations.VisibleForTesting;+import org.apache.hadoop.security.authentication.util.KerberosName;import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticationHandler;import org.apache.http.HttpRequest;import org.apache.http.protocol.HttpContext;@@ -58,6 +59,7 @@ public class KerberosPlugin extends AuthenticationPlugin implements HttpClientBuprivate Filter kerberosFilter;public static final String NAME_RULES_PARAM = "solr.kerberos.name.rules";+ public static final String NAME_RULES_MECHANISM_PARAM = "solr.kerberos.name.rules.mechanism";public static final String COOKIE_DOMAIN_PARAM = "solr.kerberos.cookie.domain";public static final String COOKIE_PATH_PARAM = "solr.kerberos.cookie.path";public static final String PRINCIPAL_PARAM = "solr.kerberos.principal";@@ -105,6 +107,7 @@ public class KerberosPlugin extends AuthenticationPlugin implements HttpClientBuMap<String, String> params = new HashMap<>();params.put("type", "kerberos");putParam(params, "kerberos.name.rules", NAME_RULES_PARAM, "DEFAULT");+ putParam(params, "kerberos.name.rules.mechanism", NAME_RULES_MECHANISM_PARAM, KerberosName.DEFAULT_MECHANISM);putParam(params, "token.valid", TOKEN_VALID_PARAM, "30");putParam(params, "cookie.path", COOKIE_PATH_PARAM, "/");if (!skipKerberosChecking) {diff --git a/solr/solr-ref-guide/src/kerberos-authentication-plugin.adoc b/solr/solr-ref-guide/src/kerberos-authentication-plugin.adocindex 0370de917f4..1ba50ab1a64 100644--- a/solr/solr-ref-guide/src/kerberos-authentication-plugin.adoc+++ b/solr/solr-ref-guide/src/kerberos-authentication-plugin.adoc@@ -272,6 +272,15 @@ These parameters can be passed at the command line with the `bin/solr` start comUsed to map Kerberos principals to short names.Example of a name rule: `RULE:[1:$1@$0](.\*EXAMPLE.COM)s/@.*//`.+`solr.kerberos.name.rules.mechanism`::+++[%autowidth,frame=none]+|===+|Optional |Default: `hadoop`+|===+++The mechanism used to map Kerberos principals to short names. This can be either `hadoop` or `mit`.+`solr.kerberos.cookie.domain`::+[%autowidth,frame=none]