Split up #735: auth.rs refactors
#871
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
…r' into zeke/noa-router-shuffle
bfops
changed the title
auth.rs changesauth.rs refactor
bfops
changed the title
auth.rs refactorauth.rs refactors
bfops
commented
Feb 20, 2024
| #[derive(Clone, Deserialize)] | ||
| pub struct SpacetimeCreds { | ||
| token: String, | ||
| } |
There was a problem hiding this comment.
I am told this is not (de)serialized anywhere besides via the corresponding trait [1]
bfops
commented
Feb 20, 2024
| pub struct SpacetimeAuth { | ||
| pub creds: SpacetimeCreds, | ||
| pub identity: Identity, | ||
| } | ||
|
|
||
| pub struct SpacetimeAuthHeader { | ||
| pub auth: Option<SpacetimeAuth>, | ||
| impl SpacetimeAuth { |
There was a problem hiding this comment.
review note: this block was just moved from below, unchanged, so it's next to the struct definition.
bfops
commented
Feb 20, 2024
| let Some(creds) = SpacetimeCreds::from_request_parts(parts)? else { | ||
| return Ok(Self { auth: None }); | ||
| }; | ||
| let claims = creds.decode_token(state.public_key())?; |
There was a problem hiding this comment.
bfops
commented
Feb 20, 2024
| pub enum AuthorizationRejection { | ||
| Jwt(JwtError), | ||
| Header(headers::Error), | ||
| Required, |
There was a problem hiding this comment.
this used to be AuthorizationRejectionReason below, but was moved up and refactored
bfops
commented
Feb 20, 2024
| Jwt(JwtErrorKind), | ||
| Header(TypedHeaderRejection), | ||
| MalformedTokenQueryString, | ||
| CantDecodeAuthorizationToken, |
There was a problem hiding this comment.
Centril
reviewed
Feb 21, 2024
crates/client-api/src/auth.rs
Outdated
Comment on lines
64
to
70
| Ok(None) => Ok(()), | ||
| Err(e) => Err(e), | ||
| }; | ||
| if let Ok(Query(creds)) = Query::<Self>::try_from_uri(&parts.uri) { | ||
| return Ok(Some(creds)); | ||
| } | ||
| res.map(|()| None) |
There was a problem hiding this comment.
Suggested change
| Ok(None) => Ok(()), | |
| Err(e) => Err(e), | |
| }; | |
| if let Ok(Query(creds)) = Query::<Self>::try_from_uri(&parts.uri) { | |
| return Ok(Some(creds)); | |
| } | |
| res.map(|()| None) | |
| r @ Ok(None) => r, | |
| Err(e) => Err(e), | |
| }; | |
| if let Ok(q @ Query(_)) = Query::<Self>::try_from_uri(&parts.uri) { | |
| return Ok(q); | |
| } | |
| res |
There was a problem hiding this comment.
agreed, thank you for drafting this!
Comment on lines
53
to
+61
| pub fn decode_token(&self, public_key: &DecodingKey) -> Result<SpacetimeIdentityClaims, JwtError> { | ||
| decode_token(public_key, self.token()).map(|x| x.claims) | ||
| } | ||
| pub fn encode_token(private_key: &EncodingKey, identity: Identity) -> Result<Self, JwtError> { | ||
| let token = encode_token(private_key, identity)?; | ||
| let headers::Authorization(basic) = headers::Authorization::basic(TOKEN_USERNAME, &token); | ||
| Ok(Self(basic)) | ||
| Ok(Self { token }) | ||
| } | ||
|
|
||
| fn from_request_parts(parts: &request::Parts) -> Result<Option<Self>, headers::Error> { |
Comment on lines
+85
to
+91
| pub async fn alloc(ctx: &(impl NodeDelegate + ControlStateDelegate + ?Sized)) -> axum::response::Result<Self> { | ||
| let identity = ctx.create_identity().await.map_err(log_and_500)?; | ||
| let creds = SpacetimeCreds::encode_token(ctx.private_key(), identity).map_err(log_and_500)?; | ||
| Ok(Self { creds, identity }) | ||
| } | ||
|
|
||
| pub fn into_headers(self) -> (TypedHeader<SpacetimeIdentity>, TypedHeader<SpacetimeIdentityToken>) { |
coolreader18
approved these changes
May 13, 2024
|
This got left behind - I'm good with these changes and I'll rebase #735 on top of them |
|
(and add docs) |
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.
Description of Changes
Splitting apart PRs, i.e. shamelessly stealing Noa's
auth.rschanges from #735.API and ABI breaking changes
No. This is expected to not change any user-facing behavior.
Expected complexity level and risk
2?