Merge pull request #64 from toddyoe/main

支持自定义WAF的Cookie列表名称

Author: millylee

README.md

@@ -199,7 +199,8 @@
     "sign_in_path": "/api/checkin",
     "user_info_path": "/api/profile",
     "api_user_key": "New-Api-User",
-    "bypass_method": "waf_cookies"
+    "bypass_method": "waf_cookies",
+    "waf_cookie_names": ["acw_tc", "cdn_sec_tc", "acw_sc__v2"]
   }
 }
 ```
@@ -226,6 +227,7 @@
 - `bypass_method` (可选)：WAF 绕过方法
   - `"waf_cookies"`：使用 Playwright 打开浏览器获取 WAF cookies 后再执行签到
   - 不设置或 `null`：直接使用用户 cookies 执行签到（适合无 WAF 保护的网站）
+- `waf_cookie_names` (可选)：绕过 WAF 所需 cookie 的名称列表，`bypass_method` 为 `waf_cookies` 时必须设置
 
 **配置示例**（完整）：
 ```json

checkin.py

@@ -65,7 +65,7 @@ def parse_cookies(cookies_data):
 	return {}
 
 
-async def get_waf_cookies_with_playwright(account_name: str, login_url: str):
+async def get_waf_cookies_with_playwright(account_name: str, login_url: str, required_cookies: list[str]):
 	"""使用 Playwright 获取 WAF cookies（隐私模式）"""
 	print(f'[PROCESSING] {account_name}: Starting browser to get WAF cookies...')
 
@@ -105,12 +105,11 @@ async def get_waf_cookies_with_playwright(account_name: str, login_url: str):
 				for cookie in cookies:
 					cookie_name = cookie.get('name')
 					cookie_value = cookie.get('value')
-					if cookie_name in ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2'] and cookie_value is not None:
+					if cookie_name in required_cookies and cookie_value is not None:
 						waf_cookies[cookie_name] = cookie_value
 
 				print(f'[INFO] {account_name}: Got {len(waf_cookies)} WAF cookies')
 
-				required_cookies = ['acw_tc', 'cdn_sec_tc', 'acw_sc__v2']
 				missing_cookies = [c for c in required_cookies if c not in waf_cookies]
 
 				if missing_cookies:
@@ -158,7 +157,7 @@ async def prepare_cookies(account_name: str, provider_config, user_cookies: dict
 
 	if provider_config.needs_waf_cookies():
 		login_url = f'{provider_config.domain}{provider_config.login_path}'
-		waf_cookies = await get_waf_cookies_with_playwright(account_name, login_url)
+		waf_cookies = await get_waf_cookies_with_playwright(account_name, login_url, provider_config.waf_cookie_names)
 		if not waf_cookies:
 			print(f'[FAILED] {account_name}: Unable to get WAF cookies')
 			return None

utils/config.py

@@ -6,7 +6,7 @@
 import json
 import os
 from dataclasses import dataclass
-from typing import Dict, Literal
+from typing import Dict, List, Literal
 
 
 @dataclass
@@ -20,6 +20,23 @@ class ProviderConfig:
 	user_info_path: str = '/api/user/self'
 	api_user_key: str = 'new-api-user'
 	bypass_method: Literal['waf_cookies'] | None = None
+	waf_cookie_names: List[str] | None = None
+
+	def __post_init__(self):
+		required_waf_cookies = set()
+		if self.waf_cookie_names and isinstance(self.waf_cookie_names, List):
+			for item in self.waf_cookie_names:
+				name = "" if not item or not isinstance(item, str) else item.strip()
+				if not name:
+					print(f'[WARNING] Found invalid WAF cookie name: {item}')
+					continue
+
+				required_waf_cookies.add(name)
+		
+		if not required_waf_cookies:
+			self.bypass_method = None
+
+		self.waf_cookie_names = list(required_waf_cookies)
 
 	@classmethod
 	def from_dict(cls, name: str, data: dict) -> 'ProviderConfig':
@@ -37,6 +54,7 @@ def from_dict(cls, name: str, data: dict) -> 'ProviderConfig':
 			user_info_path=data.get('user_info_path', '/api/user/self'),
 			api_user_key=data.get('api_user_key', 'new-api-user'),
 			bypass_method=data.get('bypass_method'),
+			waf_cookie_names = data.get('waf_cookie_names'),
 		)
 
 	def needs_waf_cookies(self) -> bool:
@@ -66,6 +84,7 @@ def load_from_env(cls) -> 'AppConfig':
 				user_info_path='/api/user/self',
 				api_user_key='new-api-user',
 				bypass_method='waf_cookies',
+				waf_cookie_names=['acw_tc', 'cdn_sec_tc', 'acw_sc__v2'],
 			),
 			'agentrouter': ProviderConfig(
 				name='agentrouter',
@@ -74,7 +93,8 @@ def load_from_env(cls) -> 'AppConfig':
 				sign_in_path=None,  # 无需签到接口，查询用户信息时自动完成签到
 				user_info_path='/api/user/self',
 				api_user_key='new-api-user',
-				bypass_method=None,
+				bypass_method='waf_cookies',
+				waf_cookie_names=['acw_tc'],
 			),
 		}