magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove undocumented jwt token login

Browse source
This commit is contained in:
Jade Ellis 2025-01-11 16:04:19 +00:00 • committed by June Clementine Strawberry 🍓🦴
parent 9ebb39ca4f
commit afe9e5536b
8 changed files with 4 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/Cargo.toml
View file

@ -50,7 +50,6 @@ http.workspace = true
http-body-util.workspace = true
hyper.workspace = true
ipaddress.workspace = true
jsonwebtoken.workspace = true
log.workspace = true
rand.workspace = true
reqwest.workspace = true

38
src/api/client/session.rs
View file

@ -20,17 +20,10 @@ use ruma::{
},
OwnedUserId, UserId,
};
use serde::Deserialize;
use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
use crate::{utils, utils::hash, Error, Result, Ruma};
#[derive(Debug, Deserialize)]
struct Claims {
sub: String,
//exp: usize,
}
/// # `GET /_matrix/client/v3/login`
///
/// Get the supported login types of this server. One of these should be used as
@ -106,34 +99,11 @@ pub(crate) async fn login_route(
user_id
},
| login::v3::LoginInfo::Token(login::v3::Token { token }) => {
| login::v3::LoginInfo::Token(login::v3::Token { token: _ }) => {
debug!("Got token login type");
if let Some(jwt_decoding_key) = services.globals.jwt_decoding_key() {
let token = jsonwebtoken::decode::<Claims>(
token,
jwt_decoding_key,
&jsonwebtoken::Validation::default(),
)
.map_err(|e| {
warn!("Failed to parse JWT token from user logging in: {e}");
Error::BadRequest(ErrorKind::InvalidUsername, "Token is invalid.")
})?;
let username = token.claims.sub.to_lowercase();
UserId::parse_with_server_name(username, services.globals.server_name()).map_err(
|e| {
err!(Request(InvalidUsername(debug_error!(
?e,
"Failed to parse login username"
))))
},
)?
} else {
return Err!(Request(Unknown(
"Token login is not supported (server has no jwt decoding key)."
)));
}
return Err!(Request(Unknown(
"Token login is not supported."
)));
},
#[allow(deprecated)]
| login::v3::LoginInfo::ApplicationService(login::v3::ApplicationService {