Recognise macaroons as access tokens from Synapse #3797
Merged
+42
−2
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
Deploying matrix-authentication-service-docs with
|
| Latest commit: |
42ee1ad
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://a1036bc3.matrix-authentication-service-docs.pages.dev |
| Branch Preview URL: | https://rei-supp-macaroons-from-syna.matrix-authentication-service-docs.pages.dev |
sandhose
requested changes
Jan 16, 2025
crates/data-model/src/tokens.rs
Outdated
| @@ -294,7 +294,8 @@ impl TokenType { | |||
| pub fn check(token: &str) -> Result<TokenType, TokenFormatError> { | |||
| // these are legacy tokens imported from Synapse | |||
| // we don't do any validation on them and continue as is | |||
| if token.starts_with("syt_") { | |||
| // Tokens starting `MDAx` are macaroons from even older versions of Synapse. | |||
There was a problem hiding this comment.
If I'm being pedantic for a second, macaroons are a list of hex length plus (key space value), then HMAC'd and base64'd.
The first K/V is location/servername, which means:
- it will start with
000flocationfor HS with a single character - it be
001Nlocation(with N varying) for HS with 2 to 17 characters - etc.
So the prefix MDAx works because it's the base64 serialisation of 001. The MDA prefix would work for server names up to 145 characters.
If we want to be extra sure, we would:
- base64url decode the string
- check on the result that byte 5 to 13 are exactly
6c 6f 63 61 74 69 6f 6e(location)
There was a problem hiding this comment.
fair for digging in to the format! I wasn't able to find (and still haven't found) the spec for Macaroons.
I probably should have looked at some code at least
reivilibre
force-pushed
the
rei/supp_macaroons_from_synapse
branch
from
5dfa9b9 to
62a9bd1
Compare
reivilibre
force-pushed
the
rei/supp_macaroons_from_synapse
branch
from
62a9bd1 to
42ee1ad
Compare
sandhose
approved these changes
Jan 16, 2025
sandhose
added
A-Migration
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.
A short and sweet one!
Closes #2150
p.s. I have verified on matrix.org that all tokens start with either
MDAxorsyt_.