serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 04:53:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'token-auth-fixes' into 'next'

Browse source 
Token auth fixes

Closes #430

See merge request famedly/conduit!633
This commit is contained in:
Timo Kösters 2024-04-15 19:46:48 +00:00
commit d22bf5182b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,10 +108,7 @@ where
)) ))
} }
( (
AuthScheme::AccessToken AuthScheme::AccessToken | AuthScheme::AccessTokenOptional,
| AuthScheme::AppserviceToken
| AuthScheme::AccessTokenOptional
| AuthScheme::None,
Token::Appservice(info), Token::Appservice(info),
) => { ) => {
let user_id = query_params let user_id = query_params
@ -138,6 +135,9 @@ 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( return Err(Error::BadRequest(
ErrorKind::MissingToken, ErrorKind::MissingToken,