feat: add Codex auth login and export flow

README.md

@@ -48,6 +48,7 @@
     - 单个账号导出为独立 `.json` 文件
     - 多个 CPA 账号打包为 `.zip`，每个账号一个独立文件
     - Sub2API 格式所有账号合并为单个 JSON
+  - Codex Auth 格式需先在账号管理中手动执行 `Codex Auth 登录` 成功后才能导出
   - 上传目标（直连不走代理）：
     - **CPA**：支持多服务配置，上传时选择目标服务，可按服务开关将账号实际代理写入 auth file 的 `proxy_url`
     - **Sub2API**：支持多服务配置，标准 sub2api-data 格式

src/config/constants.py

@@ -59,6 +59,11 @@ class EmailServiceType(str, Enum):
 OAUTH_REDIRECT_URI = "http://localhost:15555/auth/callback"
 OAUTH_SCOPE = "openid email profile offline_access"
 
+# Codex CLI 专用 OAuth 参数（用于生成 Codex 兼容的 auth.json）
+CODEX_OAUTH_REDIRECT_URI = "http://localhost:1455/auth/callback"
+CODEX_OAUTH_SCOPE = "openid profile email offline_access api.connectors.read api.connectors.invoke"
+CODEX_OAUTH_ORIGINATOR = "codex_cli_rs"
+
 # OpenAI API 端点
 OPENAI_API_ENDPOINTS = {
     "sentinel": "https://sentinel.openai.com/backend-api/sentinel/req",

src/core/codex_auth.py

@@ -0,0 +1,213 @@
+"""
+Codex Auth 登录引擎
+复用仓库里已经验证通过的登录状态流，为已有账号生成 Codex CLI 可用的 auth.json。
+"""
+
+import time
+from dataclasses import dataclass, field
+from typing import Any, Callable, Dict, List, Optional
+
+from .openai.oauth import OAuthManager
+from .register import PhaseContext, RegistrationEngine
+from ..config.constants import (
+    CODEX_OAUTH_ORIGINATOR,
+    CODEX_OAUTH_REDIRECT_URI,
+    CODEX_OAUTH_SCOPE,
+)
+from ..config.settings import get_settings
+from ..services.base import BaseEmailService
+
+
+@dataclass
+class CodexAuthResult:
+    """Codex Auth 登录结果"""
+
+    success: bool
+    email: str = ""
+    workspace_id: str = ""
+    auth_json: Optional[Dict[str, Any]] = None
+    error_message: str = ""
+    logs: List[str] = field(default_factory=list)
+
+
+class CodexAuthEngine(RegistrationEngine):
+    """
+    对已有账号执行 Codex CLI 兼容 OAuth 登录流程。
+
+    这里直接复用 RegistrationEngine 中已经跑通的：
+    登录重入 → 密码校验 → OTP 校验 → consent/workspace → callback
+    这条链路，避免与成功路径产生分叉。
+    """
+
+    def __init__(
+        self,
+        email: str,
+        password: str,
+        email_service: BaseEmailService,
+        proxy_url: Optional[str] = None,
+        callback_logger: Optional[Callable[[str], None]] = None,
+        email_service_id: Optional[str] = None,
+    ):
+        super().__init__(
+            email_service=email_service,
+            proxy_url=proxy_url,
+            callback_logger=callback_logger,
+        )
+        self.email = email
+        self.password = password
+        self.email_service_id = email_service_id
+        self.email_info = {"email": email}
+        if email_service_id:
+            self.email_info["service_id"] = email_service_id
+
+        settings = get_settings()
+        self.oauth_manager = OAuthManager(
+            client_id=settings.openai_client_id,
+            auth_url=settings.openai_auth_url,
+            token_url=settings.openai_token_url,
+            redirect_uri=CODEX_OAUTH_REDIRECT_URI,
+            scope=CODEX_OAUTH_SCOPE,
+            proxy_url=proxy_url,
+            originator=CODEX_OAUTH_ORIGINATOR,
+        )
+
+    def _build_auth_json(self, token_info: Dict[str, Any]) -> Dict[str, Any]:
+        """构造 Codex CLI 兼容的 auth.json 内容。"""
+        now_rfc3339 = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
+        return {
+            "auth_mode": "chatgpt",
+            "OPENAI_API_KEY": None,
+            "tokens": {
+                "id_token": token_info.get("id_token", ""),
+                "access_token": token_info.get("access_token", ""),
+                "refresh_token": token_info.get("refresh_token", ""),
+                "account_id": token_info.get("account_id", ""),
+            },
+            "last_refresh": now_rfc3339,
+        }
+
+    def _resolve_workspace_id(self, consent_url: Optional[str]) -> Optional[str]:
+        """
+        OTP 校验成功后优先请求 consent 页面提取 workspace。
+        若页面未显式暴露 workspace_id，再回退到 Cookie 解析路径。
+        """
+        if not self.session or not self.oauth_start:
+            return None
+
+        auth_target = consent_url or self.oauth_start.auth_url
+        try:
+            self._log(f"请求 consent 页面: {auth_target[:120]}...")
+            started_at = time.time()
+            response = self.session.get(auth_target, timeout=20)
+            self._log_timed_http_result("获取 consent 页面", started_at, response)
+
+            workspace_id = self._extract_workspace_id_from_response(
+                response=response,
+                html=response.text or "",
+                url=str(getattr(response, "url", "") or "").strip(),
+            )
+            if workspace_id:
+                self._log(f"Workspace ID: {workspace_id}")
+                return workspace_id
+        except Exception as e:
+            self._log(f"请求 consent 页面失败: {e}", "warning")
+
+        self._log("consent 页面缺少 workspace_id，回退到 Cookie 解析路径", "warning")
+        return RegistrationEngine._get_workspace_id(self)
+
+    def run(self) -> CodexAuthResult:
+        """执行 Codex Auth 登录并产出 auth.json。"""
+        result = CodexAuthResult(success=False, email=self.email, logs=self.logs)
+
+        try:
+            self._log("=" * 50)
+            self._log(f"开始 Codex Auth 登录: {self.email}")
+            self._log("=" * 50)
+
+            self._log("1. 初始化会话...")
+            if not RegistrationEngine._init_session(self):
+                result.error_message = "初始化会话失败"
+                return result
+
+            self._log("2. 开始 Codex OAuth 流程...")
+            if not RegistrationEngine._start_oauth(self):
+                result.error_message = "OAuth 流程启动失败"
+                return result
+
+            self._log("3. 获取 Device ID...")
+            did = RegistrationEngine._get_device_id(self)
+            if not did:
+                result.error_message = "获取 Device ID 失败"
+                return result
+
+            self._log("4. 重新进入登录流程...")
+            if not self._try_reenter_login_flow():
+                result.error_message = "进入登录流程失败"
+                return result
+
+            self._log("5. 提交密码...")
+            self._otp_sent_at = time.time()
+            if not self._submit_login_password_step():
+                result.error_message = "密码验证失败"
+                return result
+
+            self._log("6. 等待验证码...")
+            otp_started_at = time.time()
+            code, otp_phase = self._phase_otp_secondary(
+                PhaseContext(otp_sent_at=self._otp_sent_at),
+                started_at=otp_started_at,
+            )
+            if not code:
+                result.error_message = otp_phase.error_message or "获取验证码失败"
+                return result
+
+            self._log("7. 验证验证码...")
+            otp_valid, consent_url = self._validate_verification_code_and_get_continue_url(code)
+            if not otp_valid:
+                result.error_message = "验证码校验失败"
+                return result
+
+            self._log("8. 获取 Workspace ID...")
+            workspace_id = self._resolve_workspace_id(consent_url)
+            if not workspace_id:
+                result.error_message = "获取 Workspace ID 失败"
+                return result
+            result.workspace_id = workspace_id
+
+            self._log("9. 选择 Workspace...")
+            continue_url = RegistrationEngine._select_workspace(self, workspace_id)
+            if not continue_url:
+                result.error_message = "选择 Workspace 失败"
+                return result
+
+            self._log("10. 跟随重定向...")
+            callback_url = RegistrationEngine._follow_redirects(self, continue_url)
+            if not callback_url:
+                result.error_message = "获取回调 URL 失败"
+                return result
+
+            self._log("11. 处理 OAuth 回调...")
+            token_info = RegistrationEngine._handle_oauth_callback(self, callback_url)
+            if not token_info:
+                result.error_message = "OAuth 回调处理失败"
+                return result
+
+            result.auth_json = self._build_auth_json(token_info)
+            result.success = True
+
+            self._log("=" * 50)
+            self._log(f"Codex Auth 登录成功: {self.email}")
+            self._log(f"Account ID: {token_info.get('account_id', '')}")
+            self._log(f"Workspace ID: {workspace_id}")
+            self._log("=" * 50)
+            return result
+
+        except Exception as e:
+            self._log(f"Codex Auth 登录异常: {e}", "error")
+            result.error_message = str(e)
+            return result
+        finally:
+            try:
+                self.http_client.close()
+            except Exception:
+                pass

src/core/openai/oauth.py

@@ -190,7 +190,8 @@ def generate_oauth_url(
     *,
     redirect_uri: str = OAUTH_REDIRECT_URI,
     scope: str = OAUTH_SCOPE,
-    client_id: str = OAUTH_CLIENT_ID
+    client_id: str = OAUTH_CLIENT_ID,
+    originator: Optional[str] = None
 ) -> OAuthStart:
     """
     生成 OAuth 授权 URL
@@ -199,6 +200,7 @@ def generate_oauth_url(
         redirect_uri: 回调地址
         scope: 权限范围
         client_id: OpenAI Client ID
+        originator: 来源标识（如 codex_cli_rs）
 
     Returns:
         OAuthStart 对象，包含授权 URL 和必要参数
@@ -219,6 +221,8 @@ def generate_oauth_url(
         "id_token_add_organizations": "true",
         "codex_cli_simplified_flow": "true",
     }
+    if originator:
+        params["originator"] = originator
     auth_url = f"{OAUTH_AUTH_URL}?{urllib.parse.urlencode(params)}"
     return OAuthStart(
         auth_url=auth_url,
@@ -321,21 +325,24 @@ def __init__(
         token_url: str = OAUTH_TOKEN_URL,
         redirect_uri: str = OAUTH_REDIRECT_URI,
         scope: str = OAUTH_SCOPE,
-        proxy_url: Optional[str] = None
+        proxy_url: Optional[str] = None,
+        originator: Optional[str] = None
     ):
         self.client_id = client_id
         self.auth_url = auth_url
         self.token_url = token_url
         self.redirect_uri = redirect_uri
         self.scope = scope
         self.proxy_url = proxy_url
+        self.originator = originator
 
     def start_oauth(self) -> OAuthStart:
         """开始 OAuth 流程"""
         return generate_oauth_url(
             redirect_uri=self.redirect_uri,
             scope=self.scope,
-            client_id=self.client_id
+            client_id=self.client_id,
+            originator=self.originator
         )
 
     def handle_callback(