Handle malformed license signatures #37137
Merged
Conversation
This file contains hidden or 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
This commit adds a more user friendly error message when a license signature is malformed/truncated in a way that it cannot be meaningfully parsed
jkakavas
added
>enhancement
v7.0.0
:Security/License
Collaborator
|
Pinging @elastic/es-security |
tvernum
reviewed
Jan 6, 2019
| byte[] signatureBytes = Base64.getDecoder().decode(builder.signature); | ||
| ByteBuffer byteBuffer = ByteBuffer.wrap(signatureBytes); | ||
| version = byteBuffer.getInt(); | ||
| } catch (BufferUnderflowException | IllegalArgumentException e) { |
Contributor
There was a problem hiding this comment.
Is it intentional that you don't just catch Exception? I don't think there's any exception that could be thrown here that we wouldn't want to wrap with a better message.
Contributor
Author
There was a problem hiding this comment.
Yes, I did it on purpose. decode() throws an IllegalArgumentException and getInt() throws a BufferUnderflowException() . I think that wrap() can't throw an IndexOutOfBoundsException when called with a byte array param. Am I missing any ?
Member
There was a problem hiding this comment.
I think it is safe to catch Exception here. Any exception that we get here would pretty much indicate a malformed signature right?
Contributor
Author
There was a problem hiding this comment.
Yeap, I'll adjust this
tvernum
approved these changes
Jan 9, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This commit adds a more user friendly error message when a license
signature is malformed/truncated in a way that it cannot be
meaningfully parsed
Resolves #35340