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

Merge branch 'no-auth-ignore-token' into 'next'

Browse source 
fix: ignore access tokens where they are not needed

See merge request famedly/conduit!617
This commit is contained in:
Timo Kösters 2024-04-02 18:18:59 +00:00
commit 24e9c99d47
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,8 @@ where
( (
AuthScheme::AccessToken AuthScheme::AccessToken
| AuthScheme::AppserviceToken | AuthScheme::AppserviceToken
| AuthScheme::AccessTokenOptional, | AuthScheme::AccessTokenOptional
| AuthScheme::None,
Token::Appservice(info), Token::Appservice(info),
) => { ) => {
let user_id = query_params let user_id = query_params
@ -144,7 +145,7 @@ where
)); ));
} }
( (
AuthScheme::AccessToken | AuthScheme::AccessTokenOptional, AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::None,
Token::User((user_id, device_id)), Token::User((user_id, device_id)),
) => (Some(user_id), Some(device_id), None, false), ) => (Some(user_id), Some(device_id), None, false),
(AuthScheme::ServerSignatures, Token::None) => { (AuthScheme::ServerSignatures, Token::None) => {
@ -259,13 +260,10 @@ where
| AuthScheme::AccessTokenOptional, | AuthScheme::AccessTokenOptional,
Token::None, Token::None,
) => (None, None, None, false), ) => (None, None, None, false),
( (AuthScheme::ServerSignatures, Token::Appservice(_) | Token::User(_)) => {
AuthScheme::ServerSignatures | AuthScheme::None,
Token::Appservice(_) | Token::User(_),
) => {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Unauthorized, ErrorKind::Unauthorized,
"Access tokens should not be used on this endpoint.", "Only server signatures should be used on this endpoint.",
)); ));
} }
(AuthScheme::AppserviceToken, Token::User(_)) => { (AuthScheme::AppserviceToken, Token::User(_)) => {