dsh-plugin-image-workbench 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (172) hide show
  1. package/LICENSE +21 -21
  2. package/README.en.md +5 -3
  3. package/README.md +7 -3
  4. package/client.js +241 -241
  5. package/cordis.patch.yml +14 -14
  6. package/host.js +51 -0
  7. package/install.mjs +333 -387
  8. package/package.json +3 -2
  9. package/scripts/fetch-style-images.mjs +104 -0
  10. package/scripts/vendor-snapshot.py +154 -154
  11. package/server/access.py +26 -26
  12. package/server/app.py +1329 -1329
  13. package/server/catalog.py +147 -147
  14. package/server/composer.py +391 -391
  15. package/server/drafts.py +158 -158
  16. package/server/history.py +575 -575
  17. package/server/imaging.py +172 -172
  18. package/server/pool.py +1335 -1335
  19. package/server/pool_admin.py +921 -921
  20. package/server/pool_service.py +1073 -1073
  21. package/server/requirements.txt +6 -6
  22. package/server/smoke_check.py +402 -402
  23. package/server/static/access.html +202 -202
  24. package/vendor/chatgpt2api/source/.env.example +82 -82
  25. package/vendor/chatgpt2api/source/.python-version +1 -1
  26. package/vendor/chatgpt2api/source/LICENSE +21 -21
  27. package/vendor/chatgpt2api/source/README.md +391 -391
  28. package/vendor/chatgpt2api/source/VERSION +1 -1
  29. package/vendor/chatgpt2api/source/api/__init__.py +2 -2
  30. package/vendor/chatgpt2api/source/api/accounts.py +537 -537
  31. package/vendor/chatgpt2api/source/api/ai.py +217 -217
  32. package/vendor/chatgpt2api/source/api/app.py +62 -62
  33. package/vendor/chatgpt2api/source/api/errors.py +46 -46
  34. package/vendor/chatgpt2api/source/api/image_inputs.py +309 -309
  35. package/vendor/chatgpt2api/source/api/image_tasks.py +120 -120
  36. package/vendor/chatgpt2api/source/api/support.py +134 -134
  37. package/vendor/chatgpt2api/source/api/system.py +365 -365
  38. package/vendor/chatgpt2api/source/assets/kunrouai.svg +50 -50
  39. package/vendor/chatgpt2api/source/config.default.json +108 -108
  40. package/vendor/chatgpt2api/source/main.py +9 -9
  41. package/vendor/chatgpt2api/source/pyproject.toml +27 -27
  42. package/vendor/chatgpt2api/source/scripts/init_proxy_config.py +186 -186
  43. package/vendor/chatgpt2api/source/scripts/migrate_storage.py +163 -163
  44. package/vendor/chatgpt2api/source/scripts/privoxy-warp.conf +13 -13
  45. package/vendor/chatgpt2api/source/scripts/test_outlook_token_mailbox.py +385 -385
  46. package/vendor/chatgpt2api/source/scripts/test_storage.py +129 -129
  47. package/vendor/chatgpt2api/source/scripts/verify_oauth_refresh.py +92 -92
  48. package/vendor/chatgpt2api/source/services/account_service.py +1757 -1757
  49. package/vendor/chatgpt2api/source/services/auth_service.py +253 -253
  50. package/vendor/chatgpt2api/source/services/backup_service.py +671 -671
  51. package/vendor/chatgpt2api/source/services/config.py +667 -667
  52. package/vendor/chatgpt2api/source/services/content_filter.py +242 -242
  53. package/vendor/chatgpt2api/source/services/cpa_service.py +315 -315
  54. package/vendor/chatgpt2api/source/services/editable_file_task_service.py +260 -260
  55. package/vendor/chatgpt2api/source/services/image_service.py +376 -376
  56. package/vendor/chatgpt2api/source/services/image_storage_service.py +405 -405
  57. package/vendor/chatgpt2api/source/services/image_tags_service.py +76 -76
  58. package/vendor/chatgpt2api/source/services/image_task_service.py +550 -550
  59. package/vendor/chatgpt2api/source/services/log_service.py +337 -337
  60. package/vendor/chatgpt2api/source/services/model_service.py +182 -182
  61. package/vendor/chatgpt2api/source/services/oauth_login_service.py +267 -267
  62. package/vendor/chatgpt2api/source/services/openai_backend_api.py +2763 -2763
  63. package/vendor/chatgpt2api/source/services/openai_oauth.py +32 -32
  64. package/vendor/chatgpt2api/source/services/protocol/__init__.py +2 -2
  65. package/vendor/chatgpt2api/source/services/protocol/anthropic_v1_messages.py +307 -307
  66. package/vendor/chatgpt2api/source/services/protocol/chat_completion_cache.py +238 -238
  67. package/vendor/chatgpt2api/source/services/protocol/conversation.py +1644 -1644
  68. package/vendor/chatgpt2api/source/services/protocol/error_response.py +124 -124
  69. package/vendor/chatgpt2api/source/services/protocol/openai_search.py +19 -19
  70. package/vendor/chatgpt2api/source/services/protocol/openai_v1_chat_complete.py +316 -316
  71. package/vendor/chatgpt2api/source/services/protocol/openai_v1_image_edit.py +86 -86
  72. package/vendor/chatgpt2api/source/services/protocol/openai_v1_image_generations.py +42 -42
  73. package/vendor/chatgpt2api/source/services/protocol/openai_v1_models.py +53 -53
  74. package/vendor/chatgpt2api/source/services/protocol/openai_v1_response.py +453 -453
  75. package/vendor/chatgpt2api/source/services/protocol/web_search_tool.py +160 -160
  76. package/vendor/chatgpt2api/source/services/proxy_service.py +648 -648
  77. package/vendor/chatgpt2api/source/services/storage/__init__.py +5 -5
  78. package/vendor/chatgpt2api/source/services/storage/base.py +38 -38
  79. package/vendor/chatgpt2api/source/services/storage/database_storage.py +194 -194
  80. package/vendor/chatgpt2api/source/services/storage/factory.py +104 -104
  81. package/vendor/chatgpt2api/source/services/storage/git_storage.py +183 -183
  82. package/vendor/chatgpt2api/source/services/storage/json_storage.py +95 -95
  83. package/vendor/chatgpt2api/source/services/sub2api_service.py +531 -531
  84. package/vendor/chatgpt2api/source/utils/helper.py +469 -469
  85. package/vendor/chatgpt2api/source/utils/image_tokens.py +346 -346
  86. package/vendor/chatgpt2api/source/utils/log.py +110 -110
  87. package/vendor/chatgpt2api/source/utils/pkce.py +19 -19
  88. package/vendor/chatgpt2api/source/utils/pow.py +207 -207
  89. package/vendor/chatgpt2api/source/utils/sentinel.py +159 -159
  90. package/vendor/chatgpt2api/source/utils/turnstile.py +184 -184
  91. package/vendor/chatgpt2api/source/uv.lock +904 -904
  92. package/vendor/chatgpt2api/source/web/bun.lock +1501 -1501
  93. package/vendor/chatgpt2api/source/web/components.json +24 -24
  94. package/vendor/chatgpt2api/source/web/eslint.config.mjs +17 -17
  95. package/vendor/chatgpt2api/source/web/next.config.ts +40 -40
  96. package/vendor/chatgpt2api/source/web/package.json +58 -58
  97. package/vendor/chatgpt2api/source/web/postcss.config.mjs +5 -5
  98. package/vendor/chatgpt2api/source/web/src/app/accounts/components/account-import-dialog.tsx +925 -925
  99. package/vendor/chatgpt2api/source/web/src/app/accounts/page.tsx +1307 -1307
  100. package/vendor/chatgpt2api/source/web/src/app/debug/components/chat-panel.tsx +224 -224
  101. package/vendor/chatgpt2api/source/web/src/app/debug/components/editable-file-panel.tsx +444 -444
  102. package/vendor/chatgpt2api/source/web/src/app/debug/components/ppt-panel.tsx +9 -9
  103. package/vendor/chatgpt2api/source/web/src/app/debug/components/psd-panel.tsx +9 -9
  104. package/vendor/chatgpt2api/source/web/src/app/debug/components/search-panel.tsx +172 -172
  105. package/vendor/chatgpt2api/source/web/src/app/debug/components/skill-panel.tsx +169 -169
  106. package/vendor/chatgpt2api/source/web/src/app/debug/components/types.ts +39 -39
  107. package/vendor/chatgpt2api/source/web/src/app/debug/page.tsx +59 -59
  108. package/vendor/chatgpt2api/source/web/src/app/globals.css +230 -230
  109. package/vendor/chatgpt2api/source/web/src/app/image/components/image-composer.tsx +542 -542
  110. package/vendor/chatgpt2api/source/web/src/app/image/components/image-results.tsx +554 -554
  111. package/vendor/chatgpt2api/source/web/src/app/image/components/image-sidebar.tsx +176 -176
  112. package/vendor/chatgpt2api/source/web/src/app/image/page.tsx +1799 -1799
  113. package/vendor/chatgpt2api/source/web/src/app/image-manager/page.tsx +732 -732
  114. package/vendor/chatgpt2api/source/web/src/app/layout.tsx +50 -50
  115. package/vendor/chatgpt2api/source/web/src/app/login/page.tsx +101 -101
  116. package/vendor/chatgpt2api/source/web/src/app/logs/page.tsx +356 -356
  117. package/vendor/chatgpt2api/source/web/src/app/page.tsx +30 -30
  118. package/vendor/chatgpt2api/source/web/src/app/settings/components/api-docs-card.tsx +341 -341
  119. package/vendor/chatgpt2api/source/web/src/app/settings/components/backup-settings-card.tsx +447 -447
  120. package/vendor/chatgpt2api/source/web/src/app/settings/components/base-url-card.tsx +71 -71
  121. package/vendor/chatgpt2api/source/web/src/app/settings/components/config-card.tsx +491 -491
  122. package/vendor/chatgpt2api/source/web/src/app/settings/components/cpa-pool-dialog.tsx +108 -108
  123. package/vendor/chatgpt2api/source/web/src/app/settings/components/cpa-pools-card.tsx +169 -169
  124. package/vendor/chatgpt2api/source/web/src/app/settings/components/import-browser-dialog.tsx +185 -185
  125. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-runtime-card.tsx +379 -379
  126. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-settings-card.tsx +127 -127
  127. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-settings.tsx +200 -200
  128. package/vendor/chatgpt2api/source/web/src/app/settings/components/settings-header.tsx +12 -12
  129. package/vendor/chatgpt2api/source/web/src/app/settings/components/sub2api-connections.tsx +886 -886
  130. package/vendor/chatgpt2api/source/web/src/app/settings/components/third-party-apps-card.tsx +81 -81
  131. package/vendor/chatgpt2api/source/web/src/app/settings/components/user-keys-card.tsx +422 -422
  132. package/vendor/chatgpt2api/source/web/src/app/settings/page.tsx +135 -135
  133. package/vendor/chatgpt2api/source/web/src/app/settings/store.ts +1069 -1069
  134. package/vendor/chatgpt2api/source/web/src/components/date-range-filter.tsx +49 -49
  135. package/vendor/chatgpt2api/source/web/src/components/header-actions.tsx +24 -24
  136. package/vendor/chatgpt2api/source/web/src/components/image-lightbox.tsx +434 -434
  137. package/vendor/chatgpt2api/source/web/src/components/image-thumbnail.tsx +46 -46
  138. package/vendor/chatgpt2api/source/web/src/components/theme-script.tsx +18 -18
  139. package/vendor/chatgpt2api/source/web/src/components/theme-toggle.tsx +14 -14
  140. package/vendor/chatgpt2api/source/web/src/components/top-nav.tsx +263 -263
  141. package/vendor/chatgpt2api/source/web/src/components/ui/animated-theme-toggler.tsx +256 -256
  142. package/vendor/chatgpt2api/source/web/src/components/ui/badge.tsx +41 -41
  143. package/vendor/chatgpt2api/source/web/src/components/ui/button.tsx +59 -59
  144. package/vendor/chatgpt2api/source/web/src/components/ui/calendar.tsx +46 -46
  145. package/vendor/chatgpt2api/source/web/src/components/ui/card.tsx +61 -61
  146. package/vendor/chatgpt2api/source/web/src/components/ui/checkbox.tsx +27 -27
  147. package/vendor/chatgpt2api/source/web/src/components/ui/dia-text-reveal.tsx +267 -267
  148. package/vendor/chatgpt2api/source/web/src/components/ui/dialog.tsx +132 -132
  149. package/vendor/chatgpt2api/source/web/src/components/ui/field.tsx +13 -13
  150. package/vendor/chatgpt2api/source/web/src/components/ui/input.tsx +19 -19
  151. package/vendor/chatgpt2api/source/web/src/components/ui/label.tsx +24 -24
  152. package/vendor/chatgpt2api/source/web/src/components/ui/morphing-text.tsx +149 -149
  153. package/vendor/chatgpt2api/source/web/src/components/ui/popover.tsx +38 -38
  154. package/vendor/chatgpt2api/source/web/src/components/ui/select.tsx +175 -175
  155. package/vendor/chatgpt2api/source/web/src/components/ui/sheet.tsx +143 -143
  156. package/vendor/chatgpt2api/source/web/src/components/ui/table.tsx +29 -29
  157. package/vendor/chatgpt2api/source/web/src/components/ui/tabs.tsx +91 -91
  158. package/vendor/chatgpt2api/source/web/src/components/ui/text-3d-flip.tsx +269 -269
  159. package/vendor/chatgpt2api/source/web/src/components/ui/textarea.tsx +18 -18
  160. package/vendor/chatgpt2api/source/web/src/components/version-release-dialog.tsx +127 -127
  161. package/vendor/chatgpt2api/source/web/src/constants/common-env.ts +6 -6
  162. package/vendor/chatgpt2api/source/web/src/hooks/use-version-check.ts +85 -85
  163. package/vendor/chatgpt2api/source/web/src/lib/api.ts +926 -926
  164. package/vendor/chatgpt2api/source/web/src/lib/auth-session.ts +26 -26
  165. package/vendor/chatgpt2api/source/web/src/lib/release.ts +25 -25
  166. package/vendor/chatgpt2api/source/web/src/lib/request.ts +93 -93
  167. package/vendor/chatgpt2api/source/web/src/lib/use-auth-guard.ts +89 -89
  168. package/vendor/chatgpt2api/source/web/src/lib/utils.ts +6 -6
  169. package/vendor/chatgpt2api/source/web/src/store/auth.ts +112 -112
  170. package/vendor/chatgpt2api/source/web/src/store/editable-file-history.ts +33 -33
  171. package/vendor/chatgpt2api/source/web/src/store/image-conversations.ts +318 -318
  172. package/vendor/chatgpt2api/source/web/tsconfig.json +42 -42
@@ -1,267 +1,267 @@
1
- """手动 OAuth 桥服务
2
-
3
- 让用户用自己浏览器走一遍 OpenAI 的标准 OAuth + PKCE 授权码流程:
4
- 1. 后端生成 code_verifier / code_challenge / state,构造 authorize URL。
5
- 2. 用户在浏览器登录,浏览器最终被 OpenAI 重定向到 platform.openai.com 的
6
- callback 地址;用户从地址栏或 devtools 抓出 code,回填到前端。
7
- 3. 后端拿之前存好的 code_verifier + 回填的 code 调用 /api/accounts/oauth/token
8
- 得到 {access_token, refresh_token, id_token}。
9
-
10
- 得到的 refresh_token 跟 account_service 自动刷新机制用的 client_id 是同一个
11
- (app_2SKx67EdpoN0G6j64rFvigXD),所以落盘后能直接进入 keepalive 周期。
12
- """
13
- from __future__ import annotations
14
-
15
- import secrets
16
- import threading
17
- import time
18
- import uuid
19
- from typing import Any
20
- from urllib.parse import parse_qs, urlencode, urlparse
21
-
22
- from curl_cffi import requests
23
-
24
- from services.openai_oauth import (
25
- auth_base,
26
- common_headers,
27
- platform_auth0_client,
28
- platform_base,
29
- platform_oauth_audience,
30
- platform_oauth_client_id,
31
- platform_oauth_redirect_uri,
32
- sec_ch_ua,
33
- user_agent,
34
- )
35
- from services.proxy_service import proxy_settings
36
-
37
-
38
- class OAuthLoginError(Exception):
39
- """OAuth 桥流程中的可预期错误,会被 API 层翻译成 400。"""
40
-
41
-
42
- class OAuthLoginService:
43
- """维护 PKCE 临时会话,并完成 code → token 的兑换。"""
44
-
45
- _SESSION_TTL_SECONDS = 10 * 60 # 用户点开浏览器 + 拿 code 给的时间上限
46
- _MAX_SESSIONS = 64 # 防止异常累积;超过容量时清理最老的
47
-
48
- def __init__(self) -> None:
49
- self._lock = threading.Lock()
50
- self._sessions: dict[str, dict[str, Any]] = {}
51
-
52
- @staticmethod
53
- def _generate_pkce() -> tuple[str, str]:
54
- """生成 PKCE code_verifier 与对应的 code_challenge(S256)。"""
55
- from utils.pkce import generate_pkce
56
- return generate_pkce()
57
-
58
- def _purge_expired_locked(self) -> None:
59
- """清理过期或溢出容量的会话,必须在持锁状态下调用。"""
60
- now = time.time()
61
- expired = [sid for sid, item in self._sessions.items() if now - item["created_at"] > self._SESSION_TTL_SECONDS]
62
- for sid in expired:
63
- self._sessions.pop(sid, None)
64
- if len(self._sessions) > self._MAX_SESSIONS:
65
- ordered = sorted(self._sessions.items(), key=lambda kv: kv[1]["created_at"])
66
- for sid, _ in ordered[: len(self._sessions) - self._MAX_SESSIONS]:
67
- self._sessions.pop(sid, None)
68
-
69
- def start(self, email_hint: str = "") -> dict[str, str]:
70
- """登记一个新的 PKCE 会话,返回 session_id 与可让用户打开的 authorize_url。
71
-
72
- state 形如 "<session_id>.<nonce>",让 callback URL 自带 session_id,
73
- finish 时即便前端 React 状态被覆盖也能从 URL 恢复正确的 verifier。
74
- """
75
- verifier, challenge = self._generate_pkce()
76
- nonce = secrets.token_urlsafe(32)
77
- device_id = str(uuid.uuid4())
78
- session_id = uuid.uuid4().hex
79
- state = f"{session_id}.{secrets.token_urlsafe(16)}"
80
-
81
- params = {
82
- "issuer": auth_base,
83
- "client_id": platform_oauth_client_id,
84
- "audience": platform_oauth_audience,
85
- "redirect_uri": platform_oauth_redirect_uri,
86
- "device_id": device_id,
87
- "screen_hint": "login_or_signup",
88
- "max_age": "0",
89
- "scope": "openid profile email offline_access",
90
- "response_type": "code",
91
- "response_mode": "query",
92
- "state": state,
93
- "nonce": nonce,
94
- "code_challenge": challenge,
95
- "code_challenge_method": "S256",
96
- "auth0Client": platform_auth0_client,
97
- }
98
- email_hint = str(email_hint or "").strip()
99
- if email_hint:
100
- params["login_hint"] = email_hint
101
-
102
- authorize_url = f"{auth_base}/api/accounts/authorize?{urlencode(params)}"
103
-
104
- with self._lock:
105
- self._purge_expired_locked()
106
- self._sessions[session_id] = {
107
- "code_verifier": verifier,
108
- "state": state,
109
- "created_at": time.time(),
110
- "redirect_uri": platform_oauth_redirect_uri,
111
- }
112
-
113
- return {
114
- "session_id": session_id,
115
- "authorize_url": authorize_url,
116
- "expires_in": str(self._SESSION_TTL_SECONDS),
117
- "redirect_uri_prefix": platform_oauth_redirect_uri,
118
- }
119
-
120
- @staticmethod
121
- def _extract_code_from_callback(value: str) -> tuple[str, str]:
122
- """从 callback URL 或 raw code 中提取 (code, state)。
123
-
124
- 既允许用户粘贴整段 platform.openai.com/auth/callback?code=...&state=... 的 URL,
125
- 也允许只粘 code 本身。
126
- """
127
- raw = str(value or "").strip()
128
- if not raw:
129
- return "", ""
130
- if raw.startswith("http://") or raw.startswith("https://"):
131
- try:
132
- parsed = parse_qs(urlparse(raw).query)
133
- except Exception as exc:
134
- raise OAuthLoginError(f"无法解析 callback URL: {exc}") from exc
135
- code = str((parsed.get("code") or [""])[0]).strip()
136
- state = str((parsed.get("state") or [""])[0]).strip()
137
- if not code:
138
- err = str((parsed.get("error_description") or parsed.get("error") or [""])[0]).strip()
139
- raise OAuthLoginError(err or "callback URL 中没有 code 参数")
140
- return code, state
141
- # 用户可能直接粘了 code 字符串
142
- return raw, ""
143
-
144
- def finish(self, session_id: str, callback: str) -> dict[str, str]:
145
- """用 session_id 配对的 code_verifier 把 callback 里的 code 换成 token 三件套。
146
-
147
- - 优先用 callback URL 自带 state 里的 session_id(更可靠),
148
- 找不到才用前端传来的 session_id;
149
- - 失败时不立刻销毁 session(OAuth code 错配换 token 失败通常不会消耗 code),
150
- 只有成功兑换才 pop,便于用户用同一 verifier 重试。
151
- """
152
- body_sid = str(session_id or "").strip()
153
- code, state = self._extract_code_from_callback(callback)
154
- if not code:
155
- raise OAuthLoginError("缺少 code 或 callback URL")
156
-
157
- # state 里嵌的 session_id 优先级最高
158
- state_sid = state.split(".", 1)[0] if state else ""
159
- candidate_sids = [sid for sid in (state_sid, body_sid) if sid]
160
- if not candidate_sids:
161
- raise OAuthLoginError("既未提供 session_id,callback URL 中也未携带 state")
162
-
163
- with self._lock:
164
- self._purge_expired_locked()
165
- session = None
166
- picked_sid = ""
167
- for sid in candidate_sids:
168
- cur = self._sessions.get(sid)
169
- if cur is not None:
170
- session = cur
171
- picked_sid = sid
172
- break
173
- if session is None:
174
- raise OAuthLoginError(
175
- "OAuth 会话已过期或不存在,请回到导入对话框点\"重新生成\"再走一次"
176
- )
177
-
178
- if state and session.get("state") and state != session["state"]:
179
- raise OAuthLoginError(
180
- "state 不匹配。常见原因:你点过两次\"打开授权页面\",但浏览器里登录的还是前一次的窗口。请点\"重新生成\"重来。"
181
- )
182
-
183
- tokens = self._exchange_code(
184
- code,
185
- session["code_verifier"],
186
- session.get("redirect_uri") or platform_oauth_redirect_uri,
187
- )
188
- # 仅在成功兑换之后才消耗 session
189
- with self._lock:
190
- self._sessions.pop(picked_sid, None)
191
- return tokens
192
-
193
- @staticmethod
194
- def _exchange_code(code: str, code_verifier: str, redirect_uri: str) -> dict[str, str]:
195
- """调用 /api/accounts/oauth/token 用 code+verifier 换 token 三件套。"""
196
- kwargs = proxy_settings.build_session_kwargs(impersonate="chrome", verify=False)
197
- session = requests.Session(**kwargs)
198
- try:
199
- response = session.post(
200
- f"{auth_base}/api/accounts/oauth/token",
201
- headers={
202
- **common_headers,
203
- "referer": f"{platform_base}/",
204
- "origin": platform_base,
205
- "auth0-client": platform_auth0_client,
206
- "sec-ch-ua": sec_ch_ua,
207
- "user-agent": user_agent,
208
- },
209
- json={
210
- "client_id": platform_oauth_client_id,
211
- "code_verifier": code_verifier,
212
- "grant_type": "authorization_code",
213
- "code": code,
214
- "redirect_uri": redirect_uri,
215
- },
216
- timeout=60,
217
- )
218
- except Exception as exc:
219
- raise OAuthLoginError(f"换 token 网络异常: {exc}") from exc
220
- finally:
221
- session.close()
222
-
223
- try:
224
- data = response.json() if response.text else {}
225
- except Exception:
226
- data = {}
227
-
228
- if response.status_code != 200 or not isinstance(data, dict) or not data.get("access_token"):
229
- detail = ""
230
- if isinstance(data, dict):
231
- detail = str(data.get("error_description") or data.get("error") or data.get("message") or "")
232
- if not detail:
233
- try:
234
- detail = str(response.text or "")[:300]
235
- except Exception:
236
- detail = ""
237
- # 打到 docker logs 方便排错——OAuth 换 token 的失败原因往往只有这里能看到
238
- print(
239
- f"[oauth-login] /api/accounts/oauth/token rejected: "
240
- f"status={response.status_code} detail={detail!r} "
241
- f"raw_body={(getattr(response, 'text', '') or '')[:500]!r}",
242
- flush=True,
243
- )
244
- raise OAuthLoginError(
245
- f"OpenAI 拒绝换 token (HTTP {response.status_code}){': ' + detail if detail else ''}"
246
- )
247
-
248
- access_token = str(data.get("access_token") or "").strip()
249
- refresh_token = str(data.get("refresh_token") or "").strip()
250
- id_token = str(data.get("id_token") or "").strip()
251
-
252
- if not access_token:
253
- raise OAuthLoginError("OpenAI 返回的 access_token 为空")
254
- if not refresh_token:
255
- # scope 含 offline_access 时正常会下发 refresh_token;这里给出明确提示
256
- raise OAuthLoginError(
257
- "OpenAI 没有返回 refresh_token(可能 scope 未包含 offline_access 或 code 已使用过)"
258
- )
259
-
260
- return {
261
- "access_token": access_token,
262
- "refresh_token": refresh_token,
263
- "id_token": id_token,
264
- }
265
-
266
-
267
- oauth_login_service = OAuthLoginService()
1
+ """手动 OAuth 桥服务
2
+
3
+ 让用户用自己浏览器走一遍 OpenAI 的标准 OAuth + PKCE 授权码流程:
4
+ 1. 后端生成 code_verifier / code_challenge / state,构造 authorize URL。
5
+ 2. 用户在浏览器登录,浏览器最终被 OpenAI 重定向到 platform.openai.com 的
6
+ callback 地址;用户从地址栏或 devtools 抓出 code,回填到前端。
7
+ 3. 后端拿之前存好的 code_verifier + 回填的 code 调用 /api/accounts/oauth/token
8
+ 得到 {access_token, refresh_token, id_token}。
9
+
10
+ 得到的 refresh_token 跟 account_service 自动刷新机制用的 client_id 是同一个
11
+ (app_2SKx67EdpoN0G6j64rFvigXD),所以落盘后能直接进入 keepalive 周期。
12
+ """
13
+ from __future__ import annotations
14
+
15
+ import secrets
16
+ import threading
17
+ import time
18
+ import uuid
19
+ from typing import Any
20
+ from urllib.parse import parse_qs, urlencode, urlparse
21
+
22
+ from curl_cffi import requests
23
+
24
+ from services.openai_oauth import (
25
+ auth_base,
26
+ common_headers,
27
+ platform_auth0_client,
28
+ platform_base,
29
+ platform_oauth_audience,
30
+ platform_oauth_client_id,
31
+ platform_oauth_redirect_uri,
32
+ sec_ch_ua,
33
+ user_agent,
34
+ )
35
+ from services.proxy_service import proxy_settings
36
+
37
+
38
+ class OAuthLoginError(Exception):
39
+ """OAuth 桥流程中的可预期错误,会被 API 层翻译成 400。"""
40
+
41
+
42
+ class OAuthLoginService:
43
+ """维护 PKCE 临时会话,并完成 code → token 的兑换。"""
44
+
45
+ _SESSION_TTL_SECONDS = 10 * 60 # 用户点开浏览器 + 拿 code 给的时间上限
46
+ _MAX_SESSIONS = 64 # 防止异常累积;超过容量时清理最老的
47
+
48
+ def __init__(self) -> None:
49
+ self._lock = threading.Lock()
50
+ self._sessions: dict[str, dict[str, Any]] = {}
51
+
52
+ @staticmethod
53
+ def _generate_pkce() -> tuple[str, str]:
54
+ """生成 PKCE code_verifier 与对应的 code_challenge(S256)。"""
55
+ from utils.pkce import generate_pkce
56
+ return generate_pkce()
57
+
58
+ def _purge_expired_locked(self) -> None:
59
+ """清理过期或溢出容量的会话,必须在持锁状态下调用。"""
60
+ now = time.time()
61
+ expired = [sid for sid, item in self._sessions.items() if now - item["created_at"] > self._SESSION_TTL_SECONDS]
62
+ for sid in expired:
63
+ self._sessions.pop(sid, None)
64
+ if len(self._sessions) > self._MAX_SESSIONS:
65
+ ordered = sorted(self._sessions.items(), key=lambda kv: kv[1]["created_at"])
66
+ for sid, _ in ordered[: len(self._sessions) - self._MAX_SESSIONS]:
67
+ self._sessions.pop(sid, None)
68
+
69
+ def start(self, email_hint: str = "") -> dict[str, str]:
70
+ """登记一个新的 PKCE 会话,返回 session_id 与可让用户打开的 authorize_url。
71
+
72
+ state 形如 "<session_id>.<nonce>",让 callback URL 自带 session_id,
73
+ finish 时即便前端 React 状态被覆盖也能从 URL 恢复正确的 verifier。
74
+ """
75
+ verifier, challenge = self._generate_pkce()
76
+ nonce = secrets.token_urlsafe(32)
77
+ device_id = str(uuid.uuid4())
78
+ session_id = uuid.uuid4().hex
79
+ state = f"{session_id}.{secrets.token_urlsafe(16)}"
80
+
81
+ params = {
82
+ "issuer": auth_base,
83
+ "client_id": platform_oauth_client_id,
84
+ "audience": platform_oauth_audience,
85
+ "redirect_uri": platform_oauth_redirect_uri,
86
+ "device_id": device_id,
87
+ "screen_hint": "login_or_signup",
88
+ "max_age": "0",
89
+ "scope": "openid profile email offline_access",
90
+ "response_type": "code",
91
+ "response_mode": "query",
92
+ "state": state,
93
+ "nonce": nonce,
94
+ "code_challenge": challenge,
95
+ "code_challenge_method": "S256",
96
+ "auth0Client": platform_auth0_client,
97
+ }
98
+ email_hint = str(email_hint or "").strip()
99
+ if email_hint:
100
+ params["login_hint"] = email_hint
101
+
102
+ authorize_url = f"{auth_base}/api/accounts/authorize?{urlencode(params)}"
103
+
104
+ with self._lock:
105
+ self._purge_expired_locked()
106
+ self._sessions[session_id] = {
107
+ "code_verifier": verifier,
108
+ "state": state,
109
+ "created_at": time.time(),
110
+ "redirect_uri": platform_oauth_redirect_uri,
111
+ }
112
+
113
+ return {
114
+ "session_id": session_id,
115
+ "authorize_url": authorize_url,
116
+ "expires_in": str(self._SESSION_TTL_SECONDS),
117
+ "redirect_uri_prefix": platform_oauth_redirect_uri,
118
+ }
119
+
120
+ @staticmethod
121
+ def _extract_code_from_callback(value: str) -> tuple[str, str]:
122
+ """从 callback URL 或 raw code 中提取 (code, state)。
123
+
124
+ 既允许用户粘贴整段 platform.openai.com/auth/callback?code=...&state=... 的 URL,
125
+ 也允许只粘 code 本身。
126
+ """
127
+ raw = str(value or "").strip()
128
+ if not raw:
129
+ return "", ""
130
+ if raw.startswith("http://") or raw.startswith("https://"):
131
+ try:
132
+ parsed = parse_qs(urlparse(raw).query)
133
+ except Exception as exc:
134
+ raise OAuthLoginError(f"无法解析 callback URL: {exc}") from exc
135
+ code = str((parsed.get("code") or [""])[0]).strip()
136
+ state = str((parsed.get("state") or [""])[0]).strip()
137
+ if not code:
138
+ err = str((parsed.get("error_description") or parsed.get("error") or [""])[0]).strip()
139
+ raise OAuthLoginError(err or "callback URL 中没有 code 参数")
140
+ return code, state
141
+ # 用户可能直接粘了 code 字符串
142
+ return raw, ""
143
+
144
+ def finish(self, session_id: str, callback: str) -> dict[str, str]:
145
+ """用 session_id 配对的 code_verifier 把 callback 里的 code 换成 token 三件套。
146
+
147
+ - 优先用 callback URL 自带 state 里的 session_id(更可靠),
148
+ 找不到才用前端传来的 session_id;
149
+ - 失败时不立刻销毁 session(OAuth code 错配换 token 失败通常不会消耗 code),
150
+ 只有成功兑换才 pop,便于用户用同一 verifier 重试。
151
+ """
152
+ body_sid = str(session_id or "").strip()
153
+ code, state = self._extract_code_from_callback(callback)
154
+ if not code:
155
+ raise OAuthLoginError("缺少 code 或 callback URL")
156
+
157
+ # state 里嵌的 session_id 优先级最高
158
+ state_sid = state.split(".", 1)[0] if state else ""
159
+ candidate_sids = [sid for sid in (state_sid, body_sid) if sid]
160
+ if not candidate_sids:
161
+ raise OAuthLoginError("既未提供 session_id,callback URL 中也未携带 state")
162
+
163
+ with self._lock:
164
+ self._purge_expired_locked()
165
+ session = None
166
+ picked_sid = ""
167
+ for sid in candidate_sids:
168
+ cur = self._sessions.get(sid)
169
+ if cur is not None:
170
+ session = cur
171
+ picked_sid = sid
172
+ break
173
+ if session is None:
174
+ raise OAuthLoginError(
175
+ "OAuth 会话已过期或不存在,请回到导入对话框点\"重新生成\"再走一次"
176
+ )
177
+
178
+ if state and session.get("state") and state != session["state"]:
179
+ raise OAuthLoginError(
180
+ "state 不匹配。常见原因:你点过两次\"打开授权页面\",但浏览器里登录的还是前一次的窗口。请点\"重新生成\"重来。"
181
+ )
182
+
183
+ tokens = self._exchange_code(
184
+ code,
185
+ session["code_verifier"],
186
+ session.get("redirect_uri") or platform_oauth_redirect_uri,
187
+ )
188
+ # 仅在成功兑换之后才消耗 session
189
+ with self._lock:
190
+ self._sessions.pop(picked_sid, None)
191
+ return tokens
192
+
193
+ @staticmethod
194
+ def _exchange_code(code: str, code_verifier: str, redirect_uri: str) -> dict[str, str]:
195
+ """调用 /api/accounts/oauth/token 用 code+verifier 换 token 三件套。"""
196
+ kwargs = proxy_settings.build_session_kwargs(impersonate="chrome", verify=False)
197
+ session = requests.Session(**kwargs)
198
+ try:
199
+ response = session.post(
200
+ f"{auth_base}/api/accounts/oauth/token",
201
+ headers={
202
+ **common_headers,
203
+ "referer": f"{platform_base}/",
204
+ "origin": platform_base,
205
+ "auth0-client": platform_auth0_client,
206
+ "sec-ch-ua": sec_ch_ua,
207
+ "user-agent": user_agent,
208
+ },
209
+ json={
210
+ "client_id": platform_oauth_client_id,
211
+ "code_verifier": code_verifier,
212
+ "grant_type": "authorization_code",
213
+ "code": code,
214
+ "redirect_uri": redirect_uri,
215
+ },
216
+ timeout=60,
217
+ )
218
+ except Exception as exc:
219
+ raise OAuthLoginError(f"换 token 网络异常: {exc}") from exc
220
+ finally:
221
+ session.close()
222
+
223
+ try:
224
+ data = response.json() if response.text else {}
225
+ except Exception:
226
+ data = {}
227
+
228
+ if response.status_code != 200 or not isinstance(data, dict) or not data.get("access_token"):
229
+ detail = ""
230
+ if isinstance(data, dict):
231
+ detail = str(data.get("error_description") or data.get("error") or data.get("message") or "")
232
+ if not detail:
233
+ try:
234
+ detail = str(response.text or "")[:300]
235
+ except Exception:
236
+ detail = ""
237
+ # 打到 docker logs 方便排错——OAuth 换 token 的失败原因往往只有这里能看到
238
+ print(
239
+ f"[oauth-login] /api/accounts/oauth/token rejected: "
240
+ f"status={response.status_code} detail={detail!r} "
241
+ f"raw_body={(getattr(response, 'text', '') or '')[:500]!r}",
242
+ flush=True,
243
+ )
244
+ raise OAuthLoginError(
245
+ f"OpenAI 拒绝换 token (HTTP {response.status_code}){': ' + detail if detail else ''}"
246
+ )
247
+
248
+ access_token = str(data.get("access_token") or "").strip()
249
+ refresh_token = str(data.get("refresh_token") or "").strip()
250
+ id_token = str(data.get("id_token") or "").strip()
251
+
252
+ if not access_token:
253
+ raise OAuthLoginError("OpenAI 返回的 access_token 为空")
254
+ if not refresh_token:
255
+ # scope 含 offline_access 时正常会下发 refresh_token;这里给出明确提示
256
+ raise OAuthLoginError(
257
+ "OpenAI 没有返回 refresh_token(可能 scope 未包含 offline_access 或 code 已使用过)"
258
+ )
259
+
260
+ return {
261
+ "access_token": access_token,
262
+ "refresh_token": refresh_token,
263
+ "id_token": id_token,
264
+ }
265
+
266
+
267
+ oauth_login_service = OAuthLoginService()