TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync upstream token/appservice auth code

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
Matthias Ahouansou 2024-04-15 18:48:59 -04:00 • committed by June
parent c76445e9c1
commit 59be0b3ddc
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/ruma_wrapper/axum.rs
View file

@ -125,7 +125,6 @@ where
let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok(); let mut json_body = serde_json::from_slice::<CanonicalJsonValue>(&body).ok();
let (sender_user, sender_device, sender_servername, from_appservice) = match (metadata.authentication, token) { let (sender_user, sender_device, sender_servername, from_appservice) = match (metadata.authentication, token) {
(AuthScheme::None, Token::Invalid) => (None, None, None, false),
(_, Token::Invalid) => { (_, Token::Invalid) => {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::UnknownToken { ErrorKind::UnknownToken {
@ -134,13 +133,7 @@ where
"Unknown access token.", "Unknown access token.",
)) ))
}, },
( (AuthScheme::AccessToken | AuthScheme::AccessTokenOptional, Token::Appservice(info)) => {
AuthScheme::AccessToken
| AuthScheme::AppserviceToken
| AuthScheme::AccessTokenOptional
| AuthScheme::None,
Token::Appservice(info),
) => {
let user_id = query_params let user_id = query_params
.user_id .user_id
.map_or_else( .map_or_else(
@ -160,6 +153,7 @@ where
// TODO: Check if appservice is allowed to be that user // TODO: Check if appservice is allowed to be that user
(Some(user_id), None, None, true) (Some(user_id), None, None, true)
}, },
(AuthScheme::None | AuthScheme::AppserviceToken, Token::Appservice(_)) => (None, None, None, true),
(AuthScheme::AccessToken, Token::None) => { (AuthScheme::AccessToken, Token::None) => {
return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token.")); return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token."));
}, },