KAFKA-6004: Allow authentication providers to override error message #4015
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@ijuma Can you review please, thanks. |
ijuma
reviewed
Oct 4, 2017
| @@ -381,9 +381,11 @@ private void handleSaslToken(byte[] clientToken) throws IOException { | |||
| // For versions with SASL_AUTHENTICATE header, send a response to SASL_AUTHENTICATE request even if token is empty. | |||
| ByteBuffer responseBuf = responseToken == null ? EMPTY_BUFFER : ByteBuffer.wrap(responseToken); | |||
| sendKafkaResponse(requestContext, new SaslAuthenticateResponse(Errors.NONE, null, responseBuf)); | |||
| } catch (SaslException e) { | |||
| } catch (Exception e) { | |||
There was a problem hiding this comment.
Is it intentional that we catch all exceptions, not just SaslException and AuthenticationException?
| @@ -93,11 +94,11 @@ public PlainSaslServer(JaasContext jaasContext) { | |||
| String expectedPassword = jaasContext.configEntryOption(JAAS_USER_PREFIX + username, | |||
| PlainLoginModule.class.getName()); | |||
| if (!password.equals(expectedPassword)) { | |||
| throw new SaslException("Authentication failed: Invalid username or password"); | |||
| throw new AuthenticationException("Authentication failed: Invalid username or password"); | |||
There was a problem hiding this comment.
Don't we have to update ScramSaslServer as well?
There was a problem hiding this comment.
I left the default message for SCRAM since clients dont exactly provide username/password in the SCRAM message and we dont want to say which check failed. I have updated the message when the authorization id requested is not the username.
rajinisivaram
force-pushed
the
KAFKA-6004-auth-exception
branch
from
8cbbbae
to
853129d
Compare
|
@ijuma Thank you for the review. Have updated the code and added upgrade note. |
|
@ijuma Thank you for the review, will merge when builds pass. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.