big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-16199. KMSLoadBlanceClientProvider does not select token correctly. Contributed by Xiaoyu Yao.

Browse Source 
This closes  #642.
This commit is contained in:
Xiaoyu Yao 2019-03-28 21:55:31 -07:00 committed by GitHub
parent d7a2f9456b
commit f41f938b2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/LoadBalancingKMSClientProvider.java
View File

@ -148,6 +148,9 @@ public KMSClientProvider[] getProviders() {
selectDelegationToken(Credentials creds) {
Token<? extends TokenIdentifier> token =
KMSClientProvider.selectDelegationToken(creds, canonicalService);
if (token == null) {
token = KMSClientProvider.selectDelegationToken(creds, dtService);
}
// fallback to querying each sub-provider.
if (token == null) {
for (KMSClientProvider provider : getProviders()) {

35
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/crypto/key/kms/TestLoadBalancingKMSClientProvider.java
View File

@ -916,10 +916,7 @@ public void testTokenServiceCreationWithUriFormat() throws Exception {
}
}
@Test
public void testGetActualUGI() throws Exception {
// enable security
final Configuration conf = new Configuration();
private void testTokenSelectionWithConf(Configuration conf) throws Exception {
conf.set("hadoop.security.authentication", "kerberos");
UserGroupInformation.setConfiguration(conf);
@ -927,6 +924,9 @@ public void testGetActualUGI() throws Exception {
"foo", new String[] {"hadoop"});
String providerUriString = "kms://http@host1;host2;host3:9600/kms/foo";
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
providerUriString);
final URI kmsUri = URI.create(providerUriString);
// create a fake kms dt
final Token token = new Token();
@ -951,7 +951,30 @@ public UserGroupInformation run() throws Exception {
});
// make sure getActualUgi() returns the current user, not login user.
assertEquals(
"getActualUgi() should return the current user, not login user",
ugi, actualUgi);
"testTokenSelectionWithConf() should return the" +
" current user, not login user", ugi, actualUgi);
}
@Test
public void testTokenSelectionWithKMSUriInConf() throws Exception {
final Configuration conf = new Configuration();
conf.set("hadoop.security.authentication", "kerberos");
// test client with hadoop.security.key.provider.path configured.
String providerUriString = "kms://http@host1;host2;host3:9600/kms/foo";
conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH,
providerUriString);
testTokenSelectionWithConf(conf);
}
@Test
public void testGetActualUGI() throws Exception {
final Configuration conf = new Configuration();
conf.set("hadoop.security.authentication", "kerberos");
UserGroupInformation.setConfiguration(conf);
// test client without hadoop.security.key.provider.path configured.
testTokenSelectionWithConf(conf);
}
}