Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10868. Addendum

This commit is contained in:
Alejandro Abdelnur 2014-09-15 19:39:12 -07:00
parent e59f6771e8
commit 1023196cea
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/ZKSignerSecretProvider.java
View File

@ -139,6 +139,9 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider {
ZOOKEEPER_SIGNER_SECRET_PROVIDER_CURATOR_CLIENT_ATTRIBUTE = ZOOKEEPER_SIGNER_SECRET_PROVIDER_CURATOR_CLIENT_ATTRIBUTE =
CONFIG_PREFIX + "curator.client"; CONFIG_PREFIX + "curator.client";
private static final String JAAS_LOGIN_ENTRY_NAME =
"ZKSignerSecretProviderClient";
private static Logger LOG = LoggerFactory.getLogger( private static Logger LOG = LoggerFactory.getLogger(
ZKSignerSecretProvider.class); ZKSignerSecretProvider.class);
private String path; private String path;
@ -384,7 +387,7 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider {
+ "and using 'sasl' ACLs"); + "and using 'sasl' ACLs");
String principal = setJaasConfiguration(config); String principal = setJaasConfiguration(config);
System.setProperty(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY, System.setProperty(ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY,
"ZKSignerSecretProviderClient"); JAAS_LOGIN_ENTRY_NAME);
System.setProperty("zookeeper.authProvider.1", System.setProperty("zookeeper.authProvider.1",
"org.apache.zookeeper.server.auth.SASLAuthenticationProvider"); "org.apache.zookeeper.server.auth.SASLAuthenticationProvider");
aclProvider = new SASLOwnerACLProvider(principal); aclProvider = new SASLOwnerACLProvider(principal);
@ -417,7 +420,7 @@ public class ZKSignerSecretProvider extends RolloverSignerSecretProvider {
// This is equivalent to writing a jaas.conf file and setting the system // This is equivalent to writing a jaas.conf file and setting the system
// property, "java.security.auth.login.config", to point to it // property, "java.security.auth.login.config", to point to it
JaasConfiguration jConf = JaasConfiguration jConf =
new JaasConfiguration("Client", principal, keytabFile); new JaasConfiguration(JAAS_LOGIN_ENTRY_NAME, principal, keytabFile);
Configuration.setConfiguration(jConf); Configuration.setConfiguration(jConf);
return principal.split("[/@]")[0]; return principal.split("[/@]")[0];
} }