Relax constraints on bearer token format #3111
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
divergentdave
approved these changes
May 8, 2024
branlwyd
approved these changes
May 8, 2024
tgeoghegan
requested changes
May 9, 2024
core/src/http.rs
Outdated
Comment on lines
114
to
118
| let (bearer, token) = authorization | ||
| .split_once(char::is_whitespace) | ||
| .ok_or_else(|| anyhow!("invalid bearer token"))?; | ||
|
|
||
| if bearer.to_lowercase() != "bearer" { |
There was a problem hiding this comment.
nit:
Suggested change
| let (bearer, token) = authorization | |
| .split_once(char::is_whitespace) | |
| .ok_or_else(|| anyhow!("invalid bearer token"))?; | |
| if bearer.to_lowercase() != "bearer" { | |
| let (auth_scheme, token) = authorization | |
| .split_once(char::is_whitespace) | |
| .ok_or_else(|| anyhow!("invalid scheme in authorization header"))?; | |
| if auth_scheme.to_lowercase() != "bearer" { |
To line up with the credentials = auth-scheme [ 1*SP ( token68 / #auth-param ) ] in the Backaus-whatever notation.
core/src/http.rs
Outdated
Comment on lines
144
to
151
| Ok(Some(_)) | ||
| ); | ||
| assert_matches!( | ||
| extract_bearer_token( | ||
| &TestConn::build("get", "/", "body") | ||
| .with_request_header("authorization", "BeArEr gVfRUu9krhxrUgFsEo-P5w"), | ||
| ), | ||
| Ok(Some(_)) |
There was a problem hiding this comment.
I think it'd be nice to check the contents of the AuthenticationToken to make sure nothing bad happens when we call String::trim_start.
tgeoghegan
approved these changes
May 9, 2024
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.
Closes #3107. The
bearerpart is now case insensitive. Add some basic tests.I also allow whitespace between
bearerand the token. The1*SPpart of the grammar, IIUC, indices one or more whitespace: