fix(review-feedback-933): address latest review comments

Author: ZhuLinsen

docs/CHANGELOG.md

@@ -72,6 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - [修复] 飞书群机器人通知现在支持 `FEISHU_WEBHOOK_SECRET` / `FEISHU_WEBHOOK_KEYWORD`，并在 Web 设置与文档中明确区分 Webhook 推送和 `FEISHU_APP_ID` / `FEISHU_APP_SECRET` 应用模式，降低误配导致的推送失败。
 - [修复] `LLM_CHANNELS` 现在会在常见 provider 渠道缺少 `LLM_{NAME}_API_KEY(S)` 时，安全回退读取匹配的 legacy Secrets（如 `DEEPSEEK_API_KEY`、`AIHUBMIX_KEY`、`OPENAI_API_KEY`、`GEMINI_API_KEY`、`ANTHROPIC_API_KEY`），让 GitHub Actions 可继续使用默认 `.env` 的非敏感渠道结构。
 - [修复] `LLM_CHANNELS` 现在会在常见 provider 渠道缺少 `LLM_{NAME}_API_KEY(S)` 时，安全回退读取匹配的 legacy Secrets（如 `DEEPSEEK_API_KEY`、`AIHUBMIX_KEY`、`OPENAI_API_KEY`、`GEMINI_API_KEY`、`ANTHROPIC_API_KEY`），让 GitHub Actions 可继续使用默认 `.env` 的非敏感渠道结构。当渠道配置了自定义 `base_url` 时，仅通过严格域名校验匹配 legacy 密钥，防止凭据泄露到非官方端点。
+- [修复] `LLM_CHANNELS` 现在会在常见 provider 渠道缺少 `LLM_{NAME}_API_KEY(S)` 时，安全回退读取匹配的 legacy Secrets（如 `DEEPSEEK_API_KEY`、`AIHUBMIX_KEY`、`OPENAI_API_KEY`、`GEMINI_API_KEY`、`ANTHROPIC_API_KEY`），让 GitHub Actions 可继续使用默认 `.env` 的非敏感渠道结构。当渠道配置了自定义 `base_url` 时，仅当 URL 使用 HTTPS 协议且通过严格域名校验时才匹配 legacy 密钥，防止凭据通过明文 HTTP 或非官方端点泄露。
 - [文档] 更新中英文 LLM 配置指南与 FAQ，补充 GitHub Actions 下渠道模式复用 legacy Secrets 的用法，并明确自定义渠道仍建议使用 `LITELLM_CONFIG` + `LITELLM_CONFIG_YAML`。
 
 ## [3.11.0] - 2026-03-27

src/config.py

@@ -99,33 +99,38 @@ def resolve_channel_legacy_api_keys(channel_name: str, base_url: Optional[str])
     """
     normalized_name = canonicalize_llm_channel_protocol(channel_name)
     raw_name = (channel_name or "").strip().lower()
-    host = (urlparse(base_url or "").hostname or "").lower()
+    parsed_url = urlparse(base_url or "")
+    host = (parsed_url.hostname or "").lower()
+    scheme = (parsed_url.scheme or "").lower()
     # Name-based fallback is only safe when no custom base_url is configured,
     # because requests will go to the provider's default endpoint.  When a
     # base_url IS present, only trust the strict host check to prevent legacy
     # secrets from leaking to attacker-controlled endpoints.
     has_custom_url = bool(base_url and base_url.strip())
+    # Reject non-HTTPS custom URLs for host-based fallback to prevent
+    # credential exposure over plaintext HTTP connections.
+    host_fallback_ok = has_custom_url and scheme == "https"
 
-    if _is_provider_host(host, "aihubmix.com") or (not has_custom_url and raw_name == "aihubmix"):
+    if (host_fallback_ok and _is_provider_host(host, "aihubmix.com")) or (not has_custom_url and raw_name == "aihubmix"):
         aihubmix_key = os.getenv('AIHUBMIX_KEY', '').strip()
         if aihubmix_key:
             return [aihubmix_key], 'AIHUBMIX_KEY'
         return read_env_key_list('OPENAI_API_KEYS', 'OPENAI_API_KEY')
 
-    if _is_provider_host(host, "deepseek.com") or (not has_custom_url and normalized_name == "deepseek"):
+    if (host_fallback_ok and _is_provider_host(host, "deepseek.com")) or (not has_custom_url and normalized_name == "deepseek"):
         return read_env_key_list('DEEPSEEK_API_KEYS', 'DEEPSEEK_API_KEY')
 
     if (
-        _is_provider_host(host, "generativelanguage.googleapis.com")
-        or _is_provider_host(host, "aiplatform.googleapis.com")
+        (host_fallback_ok and _is_provider_host(host, "generativelanguage.googleapis.com"))
+        or (host_fallback_ok and _is_provider_host(host, "aiplatform.googleapis.com"))
         or (not has_custom_url and normalized_name in {"gemini", "vertex_ai"})
     ):
         return read_env_key_list('GEMINI_API_KEYS', 'GEMINI_API_KEY')
 
-    if _is_provider_host(host, "anthropic.com") or (not has_custom_url and normalized_name == "anthropic"):
+    if (host_fallback_ok and _is_provider_host(host, "anthropic.com")) or (not has_custom_url and normalized_name == "anthropic"):
         return read_env_key_list('ANTHROPIC_API_KEYS', 'ANTHROPIC_API_KEY')
 
-    if _is_provider_host(host, "openai.com") or (not has_custom_url and normalized_name == "openai"):
+    if (host_fallback_ok and _is_provider_host(host, "openai.com")) or (not has_custom_url and normalized_name == "openai"):
         return read_env_key_list('OPENAI_API_KEYS', 'OPENAI_API_KEY')
 
     return [], None

tests/test_llm_channel_config.py

@@ -282,6 +282,23 @@ def test_provider_named_channel_with_spoofed_base_url_blocks_legacy_key(self, _m
         self.assertEqual(config.llm_channels, [])
         self.assertEqual(config.llm_models_source, "legacy_env")
 
+    @patch("src.config.setup_env")
+    @patch.object(Config, "_parse_litellm_yaml", return_value=[])
+    def test_http_base_url_blocks_legacy_key_fallback(self, _mock_parse_yaml, _mock_setup_env) -> None:
+        """Plaintext HTTP base URLs must not trigger host-based legacy key fallback."""
+        env = {
+            "LLM_CHANNELS": "openai",
+            "LLM_OPENAI_BASE_URL": "http://api.openai.com/v1",
+            "LLM_OPENAI_MODELS": "gpt-4o-mini",
+            "OPENAI_API_KEY": "sk-openai-secret",
+        }
+
+        with patch.dict(os.environ, env, clear=True):
+            config = Config._load_from_env()
+
+        self.assertEqual(config.llm_channels, [])
+        self.assertEqual(config.llm_models_source, "legacy_env")
+
     @patch("src.config.setup_env")
     @patch.object(Config, "_parse_litellm_yaml", return_value=[])
     def test_custom_openai_compatible_channel_does_not_fall_back_to_legacy_keys(self, _mock_parse_yaml, _mock_setup_env) -> None: