pierre/BasicOIDC
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cargo clippy issues
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT
2025-07-09 15:05:30 +02:00
parent e3e4e8280c
commit 8a14521d6e
15 changed files with 54 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/login_api.rs
View File

@@ -47,7 +47,7 @@ pub async fn auth_webauthn(
HttpResponse::Ok().body("You are authenticated!")
}
Err(e) => {
log::error!("Failed to authenticate user using webauthn! {:?}", e);
log::error!("Failed to authenticate user using webauthn! {e:?}");
logger.log(Action::LoginWebauthnAttempt {
success: false,
user_id,

11
src/controllers/login_controller.rs
View File

@@ -190,12 +190,7 @@ pub async fn login_route(
}
c => {
log::warn!(
"Failed login for ip {:?} / username {}: {:?}",
remote_ip,
login,
c
);
log::warn!("Failed login for ip {remote_ip:?} / username {login}: {c:?}");
logger.log(Action::FailedLoginWithBadCredentials(&login));
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) {
Ok(c) => c,
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(
"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) {
Ok(r) => r,
Err(e) => {
log::error!("Failed to serialize challenge! {:?}", e);
log::error!("Failed to serialize challenge! {e:?}");
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
}
};

18
src/controllers/openid_controller.rs
View File

@@ -111,12 +111,7 @@ pub struct AuthorizeQuery {
}
fn error_redirect(query: &AuthorizeQuery, error: &str, description: &str) -> HttpResponse {
log::warn!(
"Failed to process sign in request ({} => {}): {:?}",
error,
description,
query
);
log::warn!("Failed to process sign in request ({error} => {description}): {query:?}");
HttpResponse::Found()
.append_header((
"Location",
@@ -243,7 +238,7 @@ pub async fn authorize(
.await
.unwrap();
log::trace!("New OpenID session: {:#?}", session);
log::trace!("New OpenID session: {session:#?}");
logger.log(Action::NewOpenIDSession { client: &client });
Ok(HttpResponse::Found()
@@ -319,12 +314,7 @@ struct ErrorResponse {
}
pub fn error_response<D: Debug>(query: &D, error: &str, description: &str) -> HttpResponse {
log::warn!(
"request failed: {} - {} => '{:#?}'",
error,
description,
query
);
log::warn!("request failed: {error} - {description} => '{query:#?}'");
HttpResponse::BadRequest().json(ErrorResponse {
error: error.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) {
Ok(d) => d,
Err(e) => {
log::error!("Failed to decode authorization header: {:?}", e);
log::error!("Failed to decode authorization header: {e:?}");
return Ok(error_response(
&query,
"invalid_request",

10
src/controllers/providers_controller.rs
View File

@@ -96,14 +96,14 @@ pub async fn start_login(
let config = match ProviderConfigurationHelper::get_configuration(&provider).await {
Ok(c) => c,
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(
"Failed to load provider configuration!",
));
}
};
log::debug!("Provider configuration: {:?}", config);
log::debug!("Provider configuration: {config:?}");
let url = config.auth_url(&provider, &state);
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 {
Ok(c) => c,
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(
"Failed to load provider configuration!",
));
@@ -222,7 +222,7 @@ pub async fn finish_login(
let token = match token {
Ok(t) => t,
Err(e) => {
log::error!("Failed to retrieve login token! {:?}", e);
log::error!("Failed to retrieve login token! {e:?}");
bruteforce
.send(bruteforce_actor::RecordFailedAttempt {
@@ -247,7 +247,7 @@ pub async fn finish_login(
let user_info = match provider_config.get_userinfo(&token).await {
Ok(info) => info,
Err(e) => {
log::error!("Failed to retrieve user information! {:?}", e);
log::error!("Failed to retrieve user information! {e:?}");
logger.log(Action::ProviderFailedGetUserInfo {
provider: &provider,

2
src/controllers/two_factor_api.rs
View File

@@ -94,7 +94,7 @@ pub async fn save_webauthn_factor(
let key = match manager.finish_registration(&user, &form.0.opaque_state, form.0.credential) {
Ok(k) => k,
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!");
}
};

6
src/controllers/two_factors_controller.rs
View File

@@ -68,7 +68,7 @@ pub async fn add_totp_factor_route(_critical: CriticalRoute, user: CurrentUser)
let qr_code = match qr_code {
Ok(q) => q,
Err(e) => {
log::error!("Failed to generate QrCode! {:?}", e);
log::error!("Failed to generate QrCode! {e:?}");
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) {
Ok(r) => r,
Err(e) => {
log::error!("Failed to request new key! {:?}", e);
log::error!("Failed to request new key! {e:?}");
return HttpResponse::InternalServerError()
.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(&registration_request.creation_challenge) {
Ok(r) => r,
Err(e) => {
log::error!("Failed to serialize challenge! {:?}", e);
log::error!("Failed to serialize challenge! {e:?}");
return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
}
};