Fix cargo clippy issues
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@ -151,7 +151,7 @@ impl Handler<LocalLoginRequest> for UsersActor {
|
|||||||
fn handle(&mut self, msg: LocalLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
|
fn handle(&mut self, msg: LocalLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
|
||||||
match self.manager.find_by_username_or_email(&msg.login) {
|
match self.manager.find_by_username_or_email(&msg.login) {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to find user! {}", e);
|
log::error!("Failed to find user! {e}");
|
||||||
MessageResult(LoginResult::Error)
|
MessageResult(LoginResult::Error)
|
||||||
}
|
}
|
||||||
Ok(None) => MessageResult(LoginResult::AccountNotFound),
|
Ok(None) => MessageResult(LoginResult::AccountNotFound),
|
||||||
@ -184,7 +184,7 @@ impl Handler<ProviderLoginRequest> for UsersActor {
|
|||||||
fn handle(&mut self, msg: ProviderLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
|
fn handle(&mut self, msg: ProviderLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
|
||||||
match self.manager.find_by_email(&msg.email) {
|
match self.manager.find_by_email(&msg.email) {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to find user! {}", e);
|
log::error!("Failed to find user! {e}");
|
||||||
MessageResult(LoginResult::Error)
|
MessageResult(LoginResult::Error)
|
||||||
}
|
}
|
||||||
Ok(None) => MessageResult(LoginResult::AccountNotFound),
|
Ok(None) => MessageResult(LoginResult::AccountNotFound),
|
||||||
@ -210,7 +210,7 @@ impl Handler<CreateAccount> for UsersActor {
|
|||||||
match self.manager.create_user_account(msg.0) {
|
match self.manager.create_user_account(msg.0) {
|
||||||
Ok(id) => Some(id),
|
Ok(id) => Some(id),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to create user account! {}", e);
|
log::error!("Failed to create user account! {e}");
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -227,7 +227,7 @@ impl Handler<ChangePasswordRequest> for UsersActor {
|
|||||||
{
|
{
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to change user password! {:?}", e);
|
log::error!("Failed to change user password! {e:?}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -241,7 +241,7 @@ impl Handler<Add2FAFactor> for UsersActor {
|
|||||||
match self.manager.add_2fa_factor(&msg.0, msg.1) {
|
match self.manager.add_2fa_factor(&msg.0, msg.1) {
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to add 2FA factor! {}", e);
|
log::error!("Failed to add 2FA factor! {e}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -255,7 +255,7 @@ impl Handler<Remove2FAFactor> for UsersActor {
|
|||||||
match self.manager.remove_2fa_factor(&msg.0, msg.1) {
|
match self.manager.remove_2fa_factor(&msg.0, msg.1) {
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to remove 2FA factor! {}", e);
|
log::error!("Failed to remove 2FA factor! {e}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -272,7 +272,7 @@ impl Handler<AddSuccessful2FALogin> for UsersActor {
|
|||||||
{
|
{
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to save successful 2FA authentication! {}", e);
|
log::error!("Failed to save successful 2FA authentication! {e}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -309,10 +309,7 @@ impl Handler<SetAuthorizedAuthenticationSources> for UsersActor {
|
|||||||
{
|
{
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!(
|
log::error!("Failed to set authorized authentication sources for user! {e}");
|
||||||
"Failed to set authorized authentication sources for user! {}",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -325,7 +322,7 @@ impl Handler<SetGrantedClients> for UsersActor {
|
|||||||
match self.manager.set_granted_2fa_clients(&msg.0, msg.1) {
|
match self.manager.set_granted_2fa_clients(&msg.0, msg.1) {
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to set granted 2FA clients! {}", e);
|
log::error!("Failed to set granted 2FA clients! {e}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -339,7 +336,7 @@ impl Handler<GetUserRequest> for UsersActor {
|
|||||||
MessageResult(GetUserResult(match self.manager.find_by_user_id(&msg.0) {
|
MessageResult(GetUserResult(match self.manager.find_by_user_id(&msg.0) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to find user by id! {}", e);
|
log::error!("Failed to find user by id! {e}");
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
@ -353,7 +350,7 @@ impl Handler<VerifyUserPasswordRequest> for UsersActor {
|
|||||||
self.manager
|
self.manager
|
||||||
.verify_user_password(&msg.0, &msg.1)
|
.verify_user_password(&msg.0, &msg.1)
|
||||||
.unwrap_or_else(|e| {
|
.unwrap_or_else(|e| {
|
||||||
log::error!("Failed to verify user password! {}", e);
|
log::error!("Failed to verify user password! {e}");
|
||||||
false
|
false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -367,7 +364,7 @@ impl Handler<FindUserByUsername> for UsersActor {
|
|||||||
self.manager
|
self.manager
|
||||||
.find_by_username_or_email(&msg.0)
|
.find_by_username_or_email(&msg.0)
|
||||||
.unwrap_or_else(|e| {
|
.unwrap_or_else(|e| {
|
||||||
log::error!("Failed to find user by username or email! {}", e);
|
log::error!("Failed to find user by username or email! {e}");
|
||||||
None
|
None
|
||||||
}),
|
}),
|
||||||
))
|
))
|
||||||
@ -381,7 +378,7 @@ impl Handler<GetAllUsers> for UsersActor {
|
|||||||
match self.manager.get_entire_users_list() {
|
match self.manager.get_entire_users_list() {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to get entire users list! {}", e);
|
log::error!("Failed to get entire users list! {e}");
|
||||||
vec![]
|
vec![]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -395,7 +392,7 @@ impl Handler<UpdateUserSettings> for UsersActor {
|
|||||||
match self.manager.set_general_user_settings(msg.0) {
|
match self.manager.set_general_user_settings(msg.0) {
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to update general user information! {:?}", e);
|
log::error!("Failed to update general user information! {e:?}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -409,7 +406,7 @@ impl Handler<DeleteUserRequest> for UsersActor {
|
|||||||
match self.manager.delete_account(&msg.0) {
|
match self.manager.delete_account(&msg.0) {
|
||||||
Ok(_) => true,
|
Ok(_) => true,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to delete user account! {}", e);
|
log::error!("Failed to delete user account! {e}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,7 @@ pub async fn auth_webauthn(
|
|||||||
HttpResponse::Ok().body("You are authenticated!")
|
HttpResponse::Ok().body("You are authenticated!")
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to authenticate user using webauthn! {:?}", e);
|
log::error!("Failed to authenticate user using webauthn! {e:?}");
|
||||||
logger.log(Action::LoginWebauthnAttempt {
|
logger.log(Action::LoginWebauthnAttempt {
|
||||||
success: false,
|
success: false,
|
||||||
user_id,
|
user_id,
|
||||||
|
@ -190,12 +190,7 @@ pub async fn login_route(
|
|||||||
}
|
}
|
||||||
|
|
||||||
c => {
|
c => {
|
||||||
log::warn!(
|
log::warn!("Failed login for ip {remote_ip:?} / username {login}: {c:?}");
|
||||||
"Failed login for ip {:?} / username {}: {:?}",
|
|
||||||
remote_ip,
|
|
||||||
login,
|
|
||||||
c
|
|
||||||
);
|
|
||||||
logger.log(Action::FailedLoginWithBadCredentials(&login));
|
logger.log(Action::FailedLoginWithBadCredentials(&login));
|
||||||
danger = Some("Login failed.".to_string());
|
danger = Some("Login failed.".to_string());
|
||||||
|
|
||||||
@ -474,7 +469,7 @@ pub async fn login_with_webauthn(
|
|||||||
let challenge = match manager.start_authentication(&user.uid, &pub_keys) {
|
let challenge = match manager.start_authentication(&user.uid, &pub_keys) {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to generate webauthn challenge! {:?}", e);
|
log::error!("Failed to generate webauthn challenge! {e:?}");
|
||||||
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
||||||
"Failed to generate webauthn challenge",
|
"Failed to generate webauthn challenge",
|
||||||
));
|
));
|
||||||
@ -484,7 +479,7 @@ pub async fn login_with_webauthn(
|
|||||||
let challenge_json = match serde_json::to_string(&challenge.login_challenge) {
|
let challenge_json = match serde_json::to_string(&challenge.login_challenge) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to serialize challenge! {:?}", e);
|
log::error!("Failed to serialize challenge! {e:?}");
|
||||||
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
|
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -111,12 +111,7 @@ pub struct AuthorizeQuery {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn error_redirect(query: &AuthorizeQuery, error: &str, description: &str) -> HttpResponse {
|
fn error_redirect(query: &AuthorizeQuery, error: &str, description: &str) -> HttpResponse {
|
||||||
log::warn!(
|
log::warn!("Failed to process sign in request ({error} => {description}): {query:?}");
|
||||||
"Failed to process sign in request ({} => {}): {:?}",
|
|
||||||
error,
|
|
||||||
description,
|
|
||||||
query
|
|
||||||
);
|
|
||||||
HttpResponse::Found()
|
HttpResponse::Found()
|
||||||
.append_header((
|
.append_header((
|
||||||
"Location",
|
"Location",
|
||||||
@ -243,7 +238,7 @@ pub async fn authorize(
|
|||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
log::trace!("New OpenID session: {:#?}", session);
|
log::trace!("New OpenID session: {session:#?}");
|
||||||
logger.log(Action::NewOpenIDSession { client: &client });
|
logger.log(Action::NewOpenIDSession { client: &client });
|
||||||
|
|
||||||
Ok(HttpResponse::Found()
|
Ok(HttpResponse::Found()
|
||||||
@ -319,12 +314,7 @@ struct ErrorResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn error_response<D: Debug>(query: &D, error: &str, description: &str) -> HttpResponse {
|
pub fn error_response<D: Debug>(query: &D, error: &str, description: &str) -> HttpResponse {
|
||||||
log::warn!(
|
log::warn!("request failed: {error} - {description} => '{query:#?}'");
|
||||||
"request failed: {} - {} => '{:#?}'",
|
|
||||||
error,
|
|
||||||
description,
|
|
||||||
query
|
|
||||||
);
|
|
||||||
HttpResponse::BadRequest().json(ErrorResponse {
|
HttpResponse::BadRequest().json(ErrorResponse {
|
||||||
error: error.to_string(),
|
error: error.to_string(),
|
||||||
error_description: description.to_string(),
|
error_description: description.to_string(),
|
||||||
@ -389,7 +379,7 @@ pub async fn token(
|
|||||||
let decode = String::from_utf8_lossy(&match BASE64_STANDARD.decode(token) {
|
let decode = String::from_utf8_lossy(&match BASE64_STANDARD.decode(token) {
|
||||||
Ok(d) => d,
|
Ok(d) => d,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to decode authorization header: {:?}", e);
|
log::error!("Failed to decode authorization header: {e:?}");
|
||||||
return Ok(error_response(
|
return Ok(error_response(
|
||||||
&query,
|
&query,
|
||||||
"invalid_request",
|
"invalid_request",
|
||||||
|
@ -96,14 +96,14 @@ pub async fn start_login(
|
|||||||
let config = match ProviderConfigurationHelper::get_configuration(&provider).await {
|
let config = match ProviderConfigurationHelper::get_configuration(&provider).await {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to load provider configuration! {}", e);
|
log::error!("Failed to load provider configuration! {e}");
|
||||||
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
||||||
"Failed to load provider configuration!",
|
"Failed to load provider configuration!",
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
log::debug!("Provider configuration: {:?}", config);
|
log::debug!("Provider configuration: {config:?}");
|
||||||
|
|
||||||
let url = config.auth_url(&provider, &state);
|
let url = config.auth_url(&provider, &state);
|
||||||
log::debug!("Redirect user on {url} for authentication",);
|
log::debug!("Redirect user on {url} for authentication",);
|
||||||
@ -210,7 +210,7 @@ pub async fn finish_login(
|
|||||||
let provider_config = match ProviderConfigurationHelper::get_configuration(&provider).await {
|
let provider_config = match ProviderConfigurationHelper::get_configuration(&provider).await {
|
||||||
Ok(c) => c,
|
Ok(c) => c,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to load provider configuration! {}", e);
|
log::error!("Failed to load provider configuration! {e}");
|
||||||
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
return HttpResponse::InternalServerError().body(build_fatal_error_page(
|
||||||
"Failed to load provider configuration!",
|
"Failed to load provider configuration!",
|
||||||
));
|
));
|
||||||
@ -222,7 +222,7 @@ pub async fn finish_login(
|
|||||||
let token = match token {
|
let token = match token {
|
||||||
Ok(t) => t,
|
Ok(t) => t,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to retrieve login token! {:?}", e);
|
log::error!("Failed to retrieve login token! {e:?}");
|
||||||
|
|
||||||
bruteforce
|
bruteforce
|
||||||
.send(bruteforce_actor::RecordFailedAttempt {
|
.send(bruteforce_actor::RecordFailedAttempt {
|
||||||
@ -247,7 +247,7 @@ pub async fn finish_login(
|
|||||||
let user_info = match provider_config.get_userinfo(&token).await {
|
let user_info = match provider_config.get_userinfo(&token).await {
|
||||||
Ok(info) => info,
|
Ok(info) => info,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to retrieve user information! {:?}", e);
|
log::error!("Failed to retrieve user information! {e:?}");
|
||||||
|
|
||||||
logger.log(Action::ProviderFailedGetUserInfo {
|
logger.log(Action::ProviderFailedGetUserInfo {
|
||||||
provider: &provider,
|
provider: &provider,
|
||||||
|
@ -94,7 +94,7 @@ pub async fn save_webauthn_factor(
|
|||||||
let key = match manager.finish_registration(&user, &form.0.opaque_state, form.0.credential) {
|
let key = match manager.finish_registration(&user, &form.0.opaque_state, form.0.credential) {
|
||||||
Ok(k) => k,
|
Ok(k) => k,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to register security key! {:?}", e);
|
log::error!("Failed to register security key! {e:?}");
|
||||||
return HttpResponse::InternalServerError().body("Failed to register key!");
|
return HttpResponse::InternalServerError().body("Failed to register key!");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -68,7 +68,7 @@ pub async fn add_totp_factor_route(_critical: CriticalRoute, user: CurrentUser)
|
|||||||
let qr_code = match qr_code {
|
let qr_code = match qr_code {
|
||||||
Ok(q) => q,
|
Ok(q) => q,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to generate QrCode! {:?}", e);
|
log::error!("Failed to generate QrCode! {e:?}");
|
||||||
return HttpResponse::InternalServerError().body("Failed to generate QrCode!");
|
return HttpResponse::InternalServerError().body("Failed to generate QrCode!");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -95,7 +95,7 @@ pub async fn add_webauthn_factor_route(
|
|||||||
let registration_request = match manager.start_register(&user) {
|
let registration_request = match manager.start_register(&user) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to request new key! {:?}", e);
|
log::error!("Failed to request new key! {e:?}");
|
||||||
return HttpResponse::InternalServerError()
|
return HttpResponse::InternalServerError()
|
||||||
.body("Failed to generate request for registration!");
|
.body("Failed to generate request for registration!");
|
||||||
}
|
}
|
||||||
@ -104,7 +104,7 @@ pub async fn add_webauthn_factor_route(
|
|||||||
let challenge_json = match serde_json::to_string(®istration_request.creation_challenge) {
|
let challenge_json = match serde_json::to_string(®istration_request.creation_challenge) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to serialize challenge! {:?}", e);
|
log::error!("Failed to serialize challenge! {e:?}");
|
||||||
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
|
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -156,8 +156,7 @@ impl Action<'_> {
|
|||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
Action::ProviderFailedGetToken { state, code } => format!(
|
Action::ProviderFailedGetToken { state, code } => format!(
|
||||||
"could not complete login from provider because the id_token could not be retrieved! (state={:?} code = {code})",
|
"could not complete login from provider because the id_token could not be retrieved! (state={state:?} code = {code})"
|
||||||
state
|
|
||||||
),
|
),
|
||||||
Action::ProviderFailedGetUserInfo { provider } => format!(
|
Action::ProviderFailedGetUserInfo { provider } => format!(
|
||||||
"could not get user information from userinfo endpoint of provider {}!",
|
"could not get user information from userinfo endpoint of provider {}!",
|
||||||
|
@ -22,7 +22,7 @@ impl CodeChallenge {
|
|||||||
encoded.eq(&self.code_challenge)
|
encoded.eq(&self.code_challenge)
|
||||||
}
|
}
|
||||||
s => {
|
s => {
|
||||||
log::error!("Unknown code challenge method: {}", s);
|
log::error!("Unknown code challenge method: {s}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -40,8 +40,8 @@ mod test {
|
|||||||
code_challenge: "text1".to_string(),
|
code_challenge: "text1".to_string(),
|
||||||
};
|
};
|
||||||
|
|
||||||
assert_eq!(true, chal.verify_code("text1"));
|
assert!(chal.verify_code("text1"));
|
||||||
assert_eq!(false, chal.verify_code("text2"));
|
assert!(!chal.verify_code("text2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -51,8 +51,8 @@ mod test {
|
|||||||
code_challenge: "uSOvC48D8TMh6RgW-36XppMlMgys-6KAE_wEIev9W2g".to_string(),
|
code_challenge: "uSOvC48D8TMh6RgW-36XppMlMgys-6KAE_wEIev9W2g".to_string(),
|
||||||
};
|
};
|
||||||
|
|
||||||
assert_eq!(true, chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA=="));
|
assert!(chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA=="));
|
||||||
assert_eq!(false, chal.verify_code("text1"));
|
assert!(!chal.verify_code("text1"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -62,10 +62,7 @@ mod test {
|
|||||||
code_challenge: "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM".to_string(),
|
code_challenge: "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM".to_string(),
|
||||||
};
|
};
|
||||||
|
|
||||||
assert_eq!(
|
assert!(chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"));
|
||||||
true,
|
assert!(!chal.verify_code("text1"));
|
||||||
chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk")
|
|
||||||
);
|
|
||||||
assert_eq!(false, chal.verify_code("text1"));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,7 @@ impl SessionIdentity<'_> {
|
|||||||
.map(|f| match f {
|
.map(|f| match f {
|
||||||
Ok(d) => Some(d),
|
Ok(d) => Some(d),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("Failed to deserialize session data! {:?}", e);
|
log::warn!("Failed to deserialize session data! {e:?}");
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -65,7 +65,7 @@ impl SessionIdentity<'_> {
|
|||||||
|
|
||||||
log::debug!("Will set user session data.");
|
log::debug!("Will set user session data.");
|
||||||
if let Err(e) = Identity::login(&req.extensions(), s) {
|
if let Err(e) = Identity::login(&req.extensions(), s) {
|
||||||
log::error!("Failed to set session data! {}", e);
|
log::error!("Failed to set session data! {e}");
|
||||||
}
|
}
|
||||||
log::debug!("Did set user session data.");
|
log::debug!("Did set user session data.");
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ impl EntityManager<User> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
if let Err(e) = self.replace_entries(|u| u.uid.eq(id), &update(user)) {
|
if let Err(e) = self.replace_entries(|u| u.uid.eq(id), &update(user)) {
|
||||||
log::error!("Failed to update user information! {:?}", e);
|
log::error!("Failed to update user information! {e:?}");
|
||||||
return Err(e);
|
return Err(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,7 +34,7 @@ fn verify_password<P: AsRef<[u8]>>(pwd: P, hash: &str) -> bool {
|
|||||||
match bcrypt::verify(pwd, hash) {
|
match bcrypt::verify(pwd, hash) {
|
||||||
Ok(r) => r,
|
Ok(r) => r,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::warn!("Failed to verify password! {:?}", e);
|
log::warn!("Failed to verify password! {e:?}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -108,15 +108,11 @@ impl WebAuthManager {
|
|||||||
) -> Res<WebauthnPubKey> {
|
) -> Res<WebauthnPubKey> {
|
||||||
let state: RegisterKeyOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
|
let state: RegisterKeyOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
|
||||||
if state.user_id != user.uid {
|
if state.user_id != user.uid {
|
||||||
return Err(Box::new(std::io::Error::other(
|
return Err(Box::new(std::io::Error::other("Invalid user for pubkey!")));
|
||||||
"Invalid user for pubkey!",
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if state.expire < time() {
|
if state.expire < time() {
|
||||||
return Err(Box::new(std::io::Error::other(
|
return Err(Box::new(std::io::Error::other("Challenge has expired!")));
|
||||||
"Challenge has expired!",
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let res = self.core.finish_passkey_registration(
|
let res = self.core.finish_passkey_registration(
|
||||||
@ -154,15 +150,11 @@ impl WebAuthManager {
|
|||||||
) -> Res {
|
) -> Res {
|
||||||
let state: AuthStateOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
|
let state: AuthStateOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
|
||||||
if &state.user_id != user_id {
|
if &state.user_id != user_id {
|
||||||
return Err(Box::new(std::io::Error::other(
|
return Err(Box::new(std::io::Error::other("Invalid user for pubkey!")));
|
||||||
"Invalid user for pubkey!",
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if state.expire < time() {
|
if state.expire < time() {
|
||||||
return Err(Box::new(std::io::Error::other(
|
return Err(Box::new(std::io::Error::other("Challenge has expired!")));
|
||||||
"Challenge has expired!",
|
|
||||||
)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.core.finish_passkey_authentication(
|
self.core.finish_passkey_authentication(
|
||||||
|
@ -51,7 +51,7 @@ async fn main() -> std::io::Result<()> {
|
|||||||
|
|
||||||
// Create initial user if required
|
// Create initial user if required
|
||||||
if users.is_empty() {
|
if users.is_empty() {
|
||||||
log::info!("Create default {} user", DEFAULT_ADMIN_USERNAME);
|
log::info!("Create default {DEFAULT_ADMIN_USERNAME} user");
|
||||||
let default_admin = User {
|
let default_admin = User {
|
||||||
username: DEFAULT_ADMIN_USERNAME.to_string(),
|
username: DEFAULT_ADMIN_USERNAME.to_string(),
|
||||||
authorized_clients: None,
|
authorized_clients: None,
|
||||||
|
@ -97,10 +97,7 @@ where
|
|||||||
.unwrap_or("bad")
|
.unwrap_or("bad")
|
||||||
.eq(&AppConfig::get().website_origin)
|
.eq(&AppConfig::get().website_origin)
|
||||||
{
|
{
|
||||||
log::warn!(
|
log::warn!("Blocked POST request from invalid origin! Origin given {o:?}");
|
||||||
"Blocked POST request from invalid origin! Origin given {:?}",
|
|
||||||
o
|
|
||||||
);
|
|
||||||
return Ok(req.into_response(
|
return Ok(req.into_response(
|
||||||
HttpResponse::Unauthorized()
|
HttpResponse::Unauthorized()
|
||||||
.body("POST request from invalid origin!")
|
.body("POST request from invalid origin!")
|
||||||
@ -133,8 +130,8 @@ where
|
|||||||
_ => ConnStatus::SignedOut,
|
_ => ConnStatus::SignedOut,
|
||||||
};
|
};
|
||||||
|
|
||||||
log::trace!("Connection data: {:#?}", session_data);
|
log::trace!("Connection data: {session_data:#?}");
|
||||||
log::debug!("Connection status: {:?}", session);
|
log::debug!("Connection status: {session:?}");
|
||||||
|
|
||||||
// Redirect user to login page
|
// Redirect user to login page
|
||||||
if !session.is_auth()
|
if !session.is_auth()
|
||||||
|
@ -47,7 +47,7 @@ mod test {
|
|||||||
unsafe {
|
unsafe {
|
||||||
env::set_var(VAR_ONE, "good");
|
env::set_var(VAR_ONE, "good");
|
||||||
}
|
}
|
||||||
let src = format!("This is ${{{}}}", VAR_ONE);
|
let src = format!("This is ${{{VAR_ONE}}}");
|
||||||
assert_eq!("This is good", apply_env_vars(&src));
|
assert_eq!("This is good", apply_env_vars(&src));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -55,7 +55,7 @@ mod test {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_invalid_var_syntax() {
|
fn test_invalid_var_syntax() {
|
||||||
let src = format!("This is ${{{}}}", VAR_INVALID);
|
let src = format!("This is ${{{VAR_INVALID}}}");
|
||||||
assert_eq!(src, apply_env_vars(&src));
|
assert_eq!(src, apply_env_vars(&src));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user