backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-19 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change rustfmt configuration

Browse source 
This change is fully automated, except the `rustfmt.toml` changes and
a few clippy directives to allow specific functions with too many lines
because they are longer now.
This commit is contained in:
Charles Hall 2024-05-16 01:19:04 -07:00
parent 40d6ce230d
commit 0afc1d2f50
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
123 changed files with 7881 additions and 4687 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/service/uiaa.rs
View file

@ -1,7 +1,6 @@
mod data;
pub(crate) use data::Data;
use ruma::{
api::client::{
error::ErrorKind,
@ -11,7 +10,9 @@ use ruma::{
};
use tracing::error;
use crate::{api::client_server::SESSION_ID_LENGTH, services, utils, Error, Result};
use crate::{
api::client_server::SESSION_ID_LENGTH, services, utils, Error, Result,
};
pub(crate) struct Service {
pub(crate) db: &'static dyn Data,
@ -29,7 +30,8 @@ impl Service {
self.db.set_uiaa_request(
user_id,
device_id,
// TODO: better session error handling (why is it optional in ruma?)
// TODO: better session error handling (why is it optional in
// ruma?)
uiaainfo.session.as_ref().expect("session should be set"),
json_body,
)?;
@ -64,7 +66,8 @@ impl Service {
password,
..
}) => {
let UserIdentifier::UserIdOrLocalpart(username) = identifier else {
let UserIdentifier::UserIdOrLocalpart(username) = identifier
else {
return Err(Error::BadRequest(
ErrorKind::Unrecognized,
"Identifier type not recognized.",
@ -75,18 +78,26 @@ impl Service {
username.clone(),
services().globals.server_name(),
)
.map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "User ID is invalid."))?;
.map_err(|_| {
Error::BadRequest(
ErrorKind::InvalidParam,
"User ID is invalid.",
)
})?;
// Check if password is correct
if let Some(hash) = services().users.password_hash(&user_id)? {
let hash_matches =
argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);
argon2::verify_encoded(&hash, password.as_bytes())
.unwrap_or(false);
if !hash_matches {
uiaainfo.auth_error = Some(ruma::api::client::error::StandardErrorBody {
kind: ErrorKind::Forbidden,
message: "Invalid username or password.".to_owned(),
});
uiaainfo.auth_error =
Some(ruma::api::client::error::StandardErrorBody {
kind: ErrorKind::Forbidden,
message: "Invalid username or password."
.to_owned(),
});
return Ok((false, uiaainfo));
}
}
@ -95,13 +106,16 @@ impl Service {
uiaainfo.completed.push(AuthType::Password);
}
AuthData::RegistrationToken(t) => {
if Some(t.token.trim()) == services().globals.config.registration_token.as_deref() {
if Some(t.token.trim())
== services().globals.config.registration_token.as_deref()
{
uiaainfo.completed.push(AuthType::RegistrationToken);
} else {
uiaainfo.auth_error = Some(ruma::api::client::error::StandardErrorBody {
kind: ErrorKind::Forbidden,
message: "Invalid registration token.".to_owned(),
});
uiaainfo.auth_error =
Some(ruma::api::client::error::StandardErrorBody {
kind: ErrorKind::Forbidden,
message: "Invalid registration token.".to_owned(),
});
return Ok((false, uiaainfo));
}
}