This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new b207244 HADOOP-16069. Support configure ZK_DTSM_ZK_KERBEROS_PRINCIPAL
in ZKDelegationTokenSecretManager using principal with Schema /_HOST.
Contributed by luhuachao.
b207244 is described below
commit b2072444ab471125ab63592b50106961166bde7a
Author: Takanobu Asanuma <tasan...@apache.org>
AuthorDate: Fri Sep 20 13:55:34 2019 +0900
HADOOP-16069. Support configure ZK_DTSM_ZK_KERBEROS_PRINCIPAL in
ZKDelegationTokenSecretManager using principal with Schema /_HOST. Contributed
by luhuachao.
(cherry picked from commit 298f07abceb4bb854630c9058e1697d4ef3d2ae2)
---
.../security/token/delegation/ZKDelegationTokenSecretManager.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index dca9e2f..cce124e 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -52,6 +52,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.delegation.web.DelegationTokenManager;
import org.apache.zookeeper.CreateMode;
@@ -221,6 +222,7 @@ public abstract class
ZKDelegationTokenSecretManager<TokenIdent extends Abstract
}
String principal =
config.get(ZK_DTSM_ZK_KERBEROS_PRINCIPAL, "").trim();
+ principal = SecurityUtil.getServerPrincipal(principal, "");
if (principal == null || principal.length() == 0) {
throw new IllegalArgumentException(ZK_DTSM_ZK_KERBEROS_PRINCIPAL
+ " must be specified");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
