Fix possible ArrayIndexOutOfBoundsException in XorCsrfTokenRequestAtt… #14976
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
…ributeHandler and XorCsrfTokenUtils
spring-projects-issues
added
the
status: waiting-for-triage
roysav13
reviewed
May 4, 2024
| static byte[] xorCsrf(byte[] randomBytes, byte[] csrfBytes) { | ||
| if (csrfBytes.length < randomBytes.length) { | ||
| return null; | ||
| } | ||
| int len = Math.min(randomBytes.length, csrfBytes.length); |
There was a problem hiding this comment.
Hi,
Isn't the value of randomBytes.length will always be smaller or equals to the value of csrfBytes.length?
If so you can remove the usage of the min fucntion and just call the value
roysav13
reviewed
May 4, 2024
| } | ||
|
|
||
| private static byte[] xorCsrf(byte[] randomBytes, byte[] csrfBytes) { | ||
| static byte[] xorCsrf(byte[] randomBytes, byte[] csrfBytes) { | ||
| if (csrfBytes.length < randomBytes.length) { |
There was a problem hiding this comment.
don't you want to assert that these values equals?
if the randomBytes will be larger there is no downside but if the csrfBytes is longer then there might be a condition where some bytes of the csrf token is not xored
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.
To fix gh-#13310, I make a hotfix to ensure that System.arraycopy() won't cause a ArrayIndexOutOfBoundsException.