Merge upstream main into feat/500-api-key-ip-whitelist

apps/aether-gateway/src/handlers/admin/auth/api_keys/install_routes.rs

@@ -38,7 +38,7 @@ pub(super) async fn build_admin_create_api_key_install_session_response(
         Err(_) => {
             return Ok(build_admin_api_keys_bad_request_response(
                 "请求数据验证失败",
-            ))
+            ));
         }
     };
 

apps/aether-gateway/src/handlers/admin/auth/oauth_config.rs

@@ -28,6 +28,8 @@ pub(crate) struct AdminOAuthProviderUpsertRequest {
     #[serde(default)]
     pub(super) extra_config: Option<serde_json::Value>,
     #[serde(default)]
+    pub(super) icon_url: Option<String>,
+    #[serde(default)]
     pub(super) is_enabled: bool,
     #[serde(default)]
     pub(super) force: bool,
@@ -70,6 +72,7 @@ pub(super) fn build_admin_oauth_provider_payload(
         "frontend_callback_url": provider.frontend_callback_url,
         "attribute_mapping": provider.attribute_mapping,
         "extra_config": provider.extra_config,
+        "icon_url": provider.icon_url,
         "is_enabled": provider.is_enabled,
     })
 }
@@ -364,6 +367,10 @@ pub(super) fn build_admin_oauth_upsert_record(
         frontend_callback_url: frontend_callback_url.to_string(),
         attribute_mapping: payload.attribute_mapping,
         extra_config: payload.extra_config,
+        icon_url: payload.icon_url.and_then(|value| {
+            let value = value.trim().to_string();
+            (!value.is_empty()).then_some(value)
+        }),
         is_enabled: payload.is_enabled,
     })
 }

apps/aether-gateway/src/handlers/admin/auth/oauth_routes.rs

@@ -16,7 +16,7 @@ use axum::{
 use serde_json::json;
 use std::time::Duration;
 
-const ADMIN_OAUTH_TEST_TIMEOUT_SECS: u64 = 5;
+const ADMIN_OAUTH_TEST_TIMEOUT_SECS: u64 = 10;
 const LINUXDO_AUTHORIZATION_URL: &str = "https://connect.linux.do/oauth2/authorize";
 const LINUXDO_TOKEN_URL: &str = "https://connect.linux.do/oauth2/token";
 
@@ -54,10 +54,7 @@ async fn admin_oauth_endpoint_reachable(client: &reqwest::Client, url: &str) ->
         .send()
         .await
     {
-        Ok(response) => {
-            let status = response.status();
-            status != reqwest::StatusCode::NOT_FOUND && status.as_u16() < 500
-        }
+        Ok(response) => response.status().as_u16() < 500,
         Err(_) => false,
     }
 }
@@ -120,10 +117,16 @@ async fn build_admin_oauth_test_payload(
         }));
     };
 
-    let client = reqwest::Client::builder()
+    let proxy_snapshot = state.app().resolve_system_proxy_snapshot().await;
+    let mut client_builder = reqwest::Client::builder()
         .timeout(Duration::from_secs(ADMIN_OAUTH_TEST_TIMEOUT_SECS))
-        .redirect(reqwest::redirect::Policy::limited(3))
-        .build();
+        .redirect(reqwest::redirect::Policy::limited(3));
+    if let Some(proxy_url) = proxy_snapshot.as_ref().and_then(|p| p.url.as_deref()) {
+        if let Ok(proxy) = reqwest::Proxy::all(proxy_url) {
+            client_builder = client_builder.proxy(proxy);
+        }
+    }
+    let client = client_builder.build();
     let Ok(client) = client else {
         return Ok(json!({
             "authorization_url_reachable": false,