Skip to content

KAFKA-10556: NPE if sasl.mechanism is unrecognized #9356

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
rajinisivaram merged 4 commits into from
Oct 1, 2020
Merged

KAFKA-10556: NPE if sasl.mechanism is unrecognized #9356

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74b37a2
KAFKA-10556: NPE if sasl.mechanism is unrecognized
rondagostino Sep 30, 2020
0523c0c
Adjust test now that channel is never created
rondagostino Sep 30, 2020
7a94ebb
Fix SaslServerAuthenticator as well
rondagostino Sep 30, 2020
85bde66
Better error message in SaslServerAuthenticator
rondagostino Sep 30, 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
6 changes: 5 additions & 1 deletion ...src/main/java/org/apache/kafka/common/security/authenticator/SaslClientAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ SaslClient createSaslClient() {
String[] mechs = {mechanism};
log.debug("Creating SaslClient: client={};service={};serviceHostname={};mechs={}",
clientPrincipalName, servicePrincipal, host, Arrays.toString(mechs));
return Sasl.createSaslClient(mechs, clientPrincipalName, servicePrincipal, host, configs, callbackHandler);
SaslClient retvalSaslClient = Sasl.createSaslClient(mechs, clientPrincipalName, servicePrincipal, host, configs, callbackHandler);
Comment thread
rondagostino marked this conversation as resolved.
if (retvalSaslClient == null) {
throw new SaslAuthenticationException("Failed to create SaslClient with mechanism " + mechanism);
}
return retvalSaslClient;
});
} catch (PrivilegedActionException e) {
throw new SaslAuthenticationException("Failed to create SaslClient with mechanism " + mechanism, e.getCause());
Expand Down
15 changes: 12 additions & 3 deletions ...s/src/test/java/org/apache/kafka/common/security/authenticator/SaslAuthenticatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,9 +1236,18 @@ public void testInvalidMechanism() throws Exception {
saslClientConfigs.put(SaslConfigs.SASL_MECHANISM, "INVALID");

server = createEchoServer(securityProtocol);
createAndCheckClientConnectionFailure(securityProtocol, node);
server.verifyAuthenticationMetrics(0, 1);
server.verifyReauthenticationMetrics(0, 0);
try {
createAndCheckClientConnectionFailure(securityProtocol, node);
fail("Did not generate exception prior to creating channel");
} catch (IOException expected) {
server.verifyAuthenticationMetrics(0, 0);
server.verifyReauthenticationMetrics(0, 0);
Throwable underlyingCause = expected.getCause().getCause().getCause();
assertEquals(SaslAuthenticationException.class, underlyingCause.getClass());
assertEquals("Failed to create SaslClient with mechanism INVALID", underlyingCause.getMessage());
} finally {
closeClientConnectionIfNecessary();
}
}

/**
Expand Down