Skip to content

HBASE-23347 Allow custom authentication methods for RPCs; addendum #1060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petersomogyi merged 3 commits into from
Jan 21, 2020
Merged

HBASE-23347 Allow custom authentication methods for RPCs; addendum #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77f8cb8
HBASE-23347 Allow custom authentication methods for RPCs; addendum
petersomogyi Jan 17, 2020
b9d8684
Remove MetaBrowser change
petersomogyi Jan 17, 2020
c02d73d
Add constructors for ConflictingProviderX classes
petersomogyi Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...ain/java/org/apache/hadoop/hbase/security/provider/SaslClientAuthenticationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hbase.security.provider;

import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -111,13 +112,14 @@ static AuthenticationProviderSelector instantiateSelector(Configuration conf,
Class<? extends AuthenticationProviderSelector> clz = conf.getClass(
SELECTOR_KEY, BuiltInProviderSelector.class, AuthenticationProviderSelector.class);
try {
AuthenticationProviderSelector selector = clz.newInstance();
AuthenticationProviderSelector selector = clz.getConstructor().newInstance();
selector.configure(conf, providers);
if (LOG.isTraceEnabled()) {
LOG.trace("Loaded ProviderSelector {}", selector.getClass());
}
return selector;
} catch (InstantiationException | IllegalAccessException e) {
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException |
InvocationTargetException e) {
throw new RuntimeException("Failed to instantiate " + clz +
" as the ProviderSelector defined by " + SELECTOR_KEY, e);
}
Expand Down Expand Up @@ -148,8 +150,9 @@ static void addExplicitProviders(Configuration conf,
// Instantiate it
SaslClientAuthenticationProvider provider;
try {
provider = (SaslClientAuthenticationProvider) clz.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
provider = (SaslClientAuthenticationProvider) clz.getConstructor().newInstance();

@petersomogyi petersomogyi Jan 18, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This modification causes TestSaslClientAuthenticationProviders#testDifferentConflictingImplementationsFail test failure. I'll look into it later.

} catch (InstantiationException | IllegalAccessException | NoSuchMethodException
| InvocationTargetException e) {
LOG.warn("Failed to instantiate SaslClientAuthenticationProvider {}", clz, e);
continue;
}
Expand Down
8 changes: 8 additions & 0 deletions ...java/org/apache/hadoop/hbase/security/provider/TestSaslClientAuthenticationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public void testDifferentConflictingImplementationsFail() {
static class ConflictingProvider1 implements SaslClientAuthenticationProvider {
static final SaslAuthMethod METHOD1 = new SaslAuthMethod(
"FOO", (byte)12, "DIGEST-MD5", AuthenticationMethod.SIMPLE);

public ConflictingProvider1() {
}

@Override public SaslAuthMethod getSaslAuthMethod() {
return METHOD1;
}
Expand All @@ -118,6 +122,10 @@ static class ConflictingProvider1 implements SaslClientAuthenticationProvider {
static class ConflictingProvider2 implements SaslClientAuthenticationProvider {
static final SaslAuthMethod METHOD2 = new SaslAuthMethod(
"BAR", (byte)12, "DIGEST-MD5", AuthenticationMethod.SIMPLE);

public ConflictingProvider2() {
}

@Override public SaslAuthMethod getSaslAuthMethod() {
return METHOD2;
}
Expand Down
6 changes: 4 additions & 2 deletions ...ain/java/org/apache/hadoop/hbase/security/provider/SaslServerAuthenticationProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.security.provider;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Optional;
import java.util.ServiceLoader;
Expand Down Expand Up @@ -120,9 +121,10 @@ static void addExtraProviders(Configuration conf,

try {
SaslServerAuthenticationProvider provider =
(SaslServerAuthenticationProvider) clz.newInstance();
(SaslServerAuthenticationProvider) clz.getConstructor().newInstance();
addProviderIfNotExists(provider, providers);
} catch (InstantiationException | IllegalAccessException e) {
} catch (InstantiationException | IllegalAccessException | NoSuchMethodException
| InvocationTargetException e) {
LOG.warn("Failed to instantiate {}", clz, e);
}
}
Expand Down