Fixes #7283: make BasicCredentials constructor safe #7284
Merged
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
hamnis
approved these changes
Sep 20, 2023
nylonee
approved these changes
Sep 20, 2023
armanbilge
reviewed
Sep 20, 2023
danicheg
reviewed
Sep 21, 2023
| case ix => apply(userPass.substring(0, ix), userPass.substring(ix + 1), charset) | ||
| @deprecated("Use fromString instead", "0.23.24") | ||
| def apply(token: String): BasicCredentials = | ||
| fromString(token).get |
There was a problem hiding this comment.
If I'm not wrong, previously there was an IllegalArgumentException, and now it will be NoSuchElementException. Although the difference is subtle, shouldn't we preserve the behaviour?
grouzen
commented
Sep 21, 2023
| userPass.indexOf(':') match { | ||
| case -1 => apply(userPass, "", charset) | ||
| case ix => apply(userPass.substring(0, ix), userPass.substring(ix + 1), charset) | ||
| private def fromString0(token: String): Try[BasicCredentials] = |
There was a problem hiding this comment.
Do you have any suggestions for a better name?
There was a problem hiding this comment.
Personally I use Impl but it's just a private method, I don't really care :)
Suggested change
| private def fromString0(token: String): Try[BasicCredentials] = | |
| private def fromStringImpl(token: String): Try[BasicCredentials] = |
armanbilge
approved these changes
Sep 21, 2023
| userPass.indexOf(':') match { | ||
| case -1 => apply(userPass, "", charset) | ||
| case ix => apply(userPass.substring(0, ix), userPass.substring(ix + 1), charset) | ||
| private def fromString0(token: String): Try[BasicCredentials] = |
There was a problem hiding this comment.
Personally I use Impl but it's just a private method, I don't really care :)
Suggested change
| private def fromString0(token: String): Try[BasicCredentials] = | |
| private def fromStringImpl(token: String): Try[BasicCredentials] = |
danicheg
approved these changes
Sep 23, 2023
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.
This PR provides a fix for #7283 by replacing the existing
BasicCredentials.applyconstructor withBasicCredentials.fromStringand using it inBasicCredentials.unapplyto make pattern matching safe too.