From 40fd87aeae705c9039c24d1d223ba08bc03e33a2 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Thu, 5 Mar 2026 14:01:41 +0100 Subject: [PATCH] ci: apply rustfmt + fix clippy warning --- backend/src/api/plugins.rs | 11 +++++++---- backend/src/api/roles.rs | 2 +- backend/src/api/settings.rs | 3 ++- backend/src/api/users.rs | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/src/api/plugins.rs b/backend/src/api/plugins.rs index c17c62c..75e8e1b 100644 --- a/backend/src/api/plugins.rs +++ b/backend/src/api/plugins.rs @@ -488,9 +488,9 @@ async fn enforce_registry_allowlist( return true; } - if pattern.starts_with("*.") { - let suffix = &pattern[1..]; - host.ends_with(suffix) || host.eq_ignore_ascii_case(&pattern[2..]) + if let Some(stripped) = pattern.strip_prefix("*.") { + let suffix = format!(".{stripped}"); + host.ends_with(&suffix) || host.eq_ignore_ascii_case(stripped) } else { host.eq_ignore_ascii_case(pattern) } @@ -529,7 +529,10 @@ async fn enforce_registry_allowlist( v4.is_loopback() || v4.is_private() || v4.is_link_local() || v4.is_unspecified() } IpAddr::V6(v6) => { - v6.is_loopback() || v6.is_unique_local() || v6.is_unicast_link_local() || v6.is_unspecified() + v6.is_loopback() + || v6.is_unique_local() + || v6.is_unicast_link_local() + || v6.is_unspecified() } }; diff --git a/backend/src/api/roles.rs b/backend/src/api/roles.rs index 182cd06..8a2800a 100644 --- a/backend/src/api/roles.rs +++ b/backend/src/api/roles.rs @@ -13,8 +13,8 @@ use serde::{Deserialize, Serialize}; use sqlx::PgPool; use uuid::Uuid; -use crate::auth::AuthUser; use crate::api::permissions::{perms, require_permission}; +use crate::auth::AuthUser; // ============================================================================ // Types diff --git a/backend/src/api/settings.rs b/backend/src/api/settings.rs index 635631a..33ea3bd 100644 --- a/backend/src/api/settings.rs +++ b/backend/src/api/settings.rs @@ -277,7 +277,8 @@ async fn complete_setup( if req.instance_type != "single_community" && req.platform_mode == "single_community" { return Err(( StatusCode::BAD_REQUEST, - "Platform mode 'single_community' requires instance type 'single_community'".to_string(), + "Platform mode 'single_community' requires instance type 'single_community'" + .to_string(), )); } if req.platform_mode == "single_community" { diff --git a/backend/src/api/users.rs b/backend/src/api/users.rs index 2a76d04..bb7f9b5 100644 --- a/backend/src/api/users.rs +++ b/backend/src/api/users.rs @@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize}; use sqlx::PgPool; use uuid::Uuid; -use crate::auth::AuthUser; use crate::api::permissions::{perms, require_permission}; +use crate::auth::AuthUser; use crate::models::user::UserResponse; pub fn router(pool: PgPool) -> Router {