From ed73e2b782dd473da15d654d7a9fd5a44bc3668b Mon Sep 17 00:00:00 2001 From: weisd Date: Sat, 25 Oct 2025 16:11:18 +0800 Subject: [PATCH] fix:add favicon.ico route (#713) --- crates/obs/src/telemetry.rs | 2 +- rustfs/src/admin/console.rs | 3 ++- rustfs/src/admin/router.rs | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/obs/src/telemetry.rs b/crates/obs/src/telemetry.rs index d5a089b1..9b0f7a36 100644 --- a/crates/obs/src/telemetry.rs +++ b/crates/obs/src/telemetry.rs @@ -237,7 +237,7 @@ pub(crate) fn init_telemetry(config: &OtelConfig) -> OtelGuard { match metrics_exporter_opentelemetry::Recorder::builder("order-service").install_global() { Ok(_) => {} Err(e) => { - eprintln!("Failed to set global metrics recorder: {:?}", e); + eprintln!("Failed to set global metrics recorder: {e:?}"); } } diff --git a/rustfs/src/admin/console.rs b/rustfs/src/admin/console.rs index 4e5c59da..517f110f 100644 --- a/rustfs/src/admin/console.rs +++ b/rustfs/src/admin/console.rs @@ -387,7 +387,7 @@ fn get_console_config_from_env() -> (bool, u32, u64, String) { } pub fn is_console_path(path: &str) -> bool { - path.starts_with(CONSOLE_PREFIX) + path == "/favicon.ico" || path.starts_with(CONSOLE_PREFIX) } /// Setup comprehensive middleware stack with tower-http features @@ -398,6 +398,7 @@ fn setup_console_middleware_stack( auth_timeout: u64, ) -> Router { let mut app = Router::new() + .route("/favicon.ico", get(static_handler)) .route(&format!("{CONSOLE_PREFIX}/license"), get(license_handler)) .route(&format!("{CONSOLE_PREFIX}/config.json"), get(config_handler)) .route(&format!("{CONSOLE_PREFIX}/health"), get(health_check)) diff --git a/rustfs/src/admin/router.rs b/rustfs/src/admin/router.rs index 1fa07826..c02fb0e3 100644 --- a/rustfs/src/admin/router.rs +++ b/rustfs/src/admin/router.rs @@ -31,7 +31,6 @@ use tower::Service; use tracing::error; use crate::admin::ADMIN_PREFIX; -use crate::admin::console::CONSOLE_PREFIX; use crate::admin::console::is_console_path; use crate::admin::console::make_console_server; use crate::admin::rpc::RPC_PREFIX; @@ -99,7 +98,7 @@ where } } - uri.path().starts_with(ADMIN_PREFIX) || uri.path().starts_with(RPC_PREFIX) || uri.path().starts_with(CONSOLE_PREFIX) + uri.path().starts_with(ADMIN_PREFIX) || uri.path().starts_with(RPC_PREFIX) || is_console_path(uri.path()) } // check_access before call