(hopefully?) implement AuthScheme::AppserviceToken
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
parent
ad8d1dc68a
commit
690928ec81
1 changed files with 24 additions and 1 deletions
|
@ -84,7 +84,8 @@ where
|
||||||
appservice_registration
|
appservice_registration
|
||||||
{
|
{
|
||||||
match metadata.authentication {
|
match metadata.authentication {
|
||||||
AuthScheme::AccessToken | AuthScheme::AccessTokenOptional => {
|
// TODO: verify if just or'ing `AuthScheme::AppserviceToken` is correct here
|
||||||
|
AuthScheme::AccessToken | AuthScheme::AccessTokenOptional | AuthScheme::AppserviceToken => {
|
||||||
let user_id = query_params.user_id.map_or_else(
|
let user_id = query_params.user_id.map_or_else(
|
||||||
|| {
|
|| {
|
||||||
UserId::parse_with_server_name(
|
UserId::parse_with_server_name(
|
||||||
|
@ -149,6 +150,28 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// TODO: verify if this is correct for Appservices (?)
|
||||||
|
AuthScheme::AppserviceToken => {
|
||||||
|
debug!("non-appservice called an endpoint with AuthScheme::AppserviceToken");
|
||||||
|
let token = match token {
|
||||||
|
Some(token) => token,
|
||||||
|
_ => return Err(Error::BadRequest(ErrorKind::MissingToken, "Missing access token.")),
|
||||||
|
};
|
||||||
|
|
||||||
|
match services().users.find_from_token(token)? {
|
||||||
|
None => {
|
||||||
|
return Err(Error::BadRequest(
|
||||||
|
ErrorKind::UnknownToken {
|
||||||
|
soft_logout: false,
|
||||||
|
},
|
||||||
|
"Unknown access token.",
|
||||||
|
))
|
||||||
|
},
|
||||||
|
Some((user_id, device_id)) => {
|
||||||
|
(Some(user_id), Some(OwnedDeviceId::from(device_id)), None, false)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
AuthScheme::ServerSignatures => {
|
AuthScheme::ServerSignatures => {
|
||||||
let TypedHeader(Authorization(x_matrix)) =
|
let TypedHeader(Authorization(x_matrix)) =
|
||||||
parts.extract::<TypedHeader<Authorization<XMatrix>>>().await.map_err(|e| {
|
parts.extract::<TypedHeader<Authorization<XMatrix>>>().await.map_err(|e| {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue