refactor: 移除已廢棄的自管加密金鑰機制（credential 全面託管 CF Workers Secrets）
leo 2026-07-20 明令：「已經改用 cf 自己的 secrets，不要再說它了」 「我希望以後再也看不到這個詞再出現」 背景：credential 早已遷移至 CF Workers per-script Secrets + D1 目錄， 舊的自管金鑰（client 端 AES-GCM + KV 密文 + crypto_decrypt）是遷移期遺留。 本次連根移除，含一併作廢的死 SaaS 碼。 移除： - 舊 KV 密文解密路徑（credential-injector.ts 整檔、dual-read fallback） 前置驗證：leo21c / youlin 兩帳號 CREDENTIALS_KV 實測 *:cred:* 皆 0 筆 - migrate-to-workers-secrets 搬家端點（回填已完成，無可回填） - /register 路由與 generateApiKey（HMAC 產 ak_ key 是 SaaS 遺物； self-hosted 走 namespace 明碼 D21，已無人使用） - platform_crypto component（三帳號實測 404 已退役，無 workflow 引用） 保留（附理由）： - crypto_decrypt 保留為永遠回失敗的 stub——現役三個 auth .wasm 仍宣告該 import，缺項會讓 WASM instantiate 直接失敗。待零件重編後可真正刪除。 順帶修復（原不在範圍，但會實際壞事）： - /auth/callback 有 `if (!key) redirect(server_error)` 閘，未設該 secret 的 實例會登入直接失敗 → 已移除 - OAuth 兩處把 provider token 寫進舊加密 KV（租戶鍵與實際 api_key 在 rotate 後必然分歧，已失效）→ 改導向 Workers Secrets，包 try/catch 不影響登入 - acr init Standard 模式呼叫已刪除的 /register → 改引導 OAuth 取 key - .claude/rules 與 system-dev/docs 是同一規範的兩份鏡像，先前只改 rules 導致鏡像仍在教舊做法 → 已同步（此類雙檔同步應納入檢查） 新用戶安裝從此零 secret 前置。 測試 187/188（唯一 fail 為 pre-existing，stash 驗證與本次無關）； cypher-executor 與 cli typecheck 全綠。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
uncle6me-web
@@ -9,6 +9,7 @@
|
||||
|
||||
import { Hono } from 'hono';
|
||||
import type { Bindings } from '../types';
|
||||
import { storeCredential } from './credentials';
|
||||
|
||||
export const authRouter = new Hono<{ Bindings: Bindings }>();
|
||||
|
||||
@@ -48,26 +49,13 @@ function getLandingOrigin(c: { req: { raw: Request } }): string {
|
||||
return 'https://arcrun.dev';
|
||||
}
|
||||
|
||||
/** 產生 API Key（HMAC-SHA256 of email，與 /register 相同邏輯） */
|
||||
async function generateApiKey(email: string, encryptionKey: string): Promise<string> {
|
||||
const keyData = new TextEncoder().encode(encryptionKey.slice(0, 32));
|
||||
const msgData = new TextEncoder().encode(email);
|
||||
const cryptoKey = await crypto.subtle.importKey(
|
||||
'raw', keyData, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']
|
||||
);
|
||||
const sig = await crypto.subtle.sign('HMAC', cryptoKey, msgData);
|
||||
const hex = Array.from(new Uint8Array(sig)).map(b => b.toString(16).padStart(2, '0')).join('');
|
||||
return 'ak_' + hex.slice(0, 32);
|
||||
}
|
||||
|
||||
/** AES-GCM 加密，回傳 {encrypted, iv}（base64），與 SDK 格式相同 */
|
||||
async function aesEncrypt(plaintext: string, encryptionKey: string): Promise<{ encrypted: string; iv: string }> {
|
||||
const keyBytes = new TextEncoder().encode(encryptionKey.slice(0, 32));
|
||||
const cryptoKey = await crypto.subtle.importKey('raw', keyBytes, { name: 'AES-GCM' }, false, ['encrypt']);
|
||||
const iv = crypto.getRandomValues(new Uint8Array(12));
|
||||
const enc = await crypto.subtle.encrypt({ name: 'AES-GCM', iv }, cryptoKey, new TextEncoder().encode(plaintext));
|
||||
const toB64 = (buf: ArrayBuffer | Uint8Array) => btoa(String.fromCharCode(...new Uint8Array(buf instanceof ArrayBuffer ? buf : buf)));
|
||||
return { encrypted: toB64(enc), iv: toB64(iv) };
|
||||
/**
|
||||
* 產生 API Key（隨機，與 /me/api-key/rotate 同一套）。
|
||||
*
|
||||
* key 與 email 無關、不可預測；登入走 USERS_KV 讀出的 api_key，不重算。
|
||||
*/
|
||||
function generateApiKey(): string {
|
||||
return 'ak_' + randomToken(24);
|
||||
}
|
||||
|
||||
/** 幂等寫入 auth_recipe 到 RECIPES KV（若已存在相同版本則跳過） */
|
||||
@@ -198,16 +186,14 @@ authRouter.get('/auth/callback', async (c) => {
|
||||
}
|
||||
await c.env.SESSIONS_KV.delete(`state:${state}`);
|
||||
|
||||
const encryptionKey = c.env.ENCRYPTION_KEY;
|
||||
if (!encryptionKey) {
|
||||
return Response.redirect(`${landingOrigin}/login?error=server_error`, 302);
|
||||
}
|
||||
|
||||
try {
|
||||
let email: string;
|
||||
let displayName: string;
|
||||
let avatarUrl: string | undefined;
|
||||
let providerId: string;
|
||||
// provider token 要存進 credential 新家，但必須用最終的 api_key 當租戶鍵，
|
||||
// 而 api_key 要等下方 USERS_KV upsert 才決定 → 先暫存，稍後再寫。
|
||||
let pendingCredential: { name: string; value: string; service: string } | null = null;
|
||||
const provider = stateRecord.provider;
|
||||
const redirectUri = 'https://cypher.arcrun.dev/auth/callback';
|
||||
|
||||
@@ -240,12 +226,10 @@ authRouter.get('/auth/callback', async (c) => {
|
||||
avatarUrl = userInfo.picture;
|
||||
providerId = userInfo.sub;
|
||||
|
||||
// 存 Google refresh_token（加密）到 CREDENTIALS_KV，供 auth_oauth2 零件使用
|
||||
// Google 只在首次授權時回傳 refresh_token，後續登入 tokenData.refresh_token 為 undefined
|
||||
// 存 Google refresh_token 供 auth_oauth2 零件使用（實際寫入在 apiKey 決定後，見下方
|
||||
// pendingCredential）。Google 只在首次授權時回傳 refresh_token，後續登入為 undefined
|
||||
if (tokenData.refresh_token) {
|
||||
const credKey = `${await generateApiKey(email, encryptionKey)}:cred:google_refresh_token`;
|
||||
const encrypted = await aesEncrypt(tokenData.refresh_token, encryptionKey);
|
||||
await c.env.CREDENTIALS_KV.put(credKey, JSON.stringify(encrypted));
|
||||
pendingCredential = { name: 'google_refresh_token', value: tokenData.refresh_token, service: 'google_user' };
|
||||
|
||||
// 種 auth_recipe:google_user（用戶自己的 Google OAuth2）
|
||||
void upsertAuthRecipe(c.env.RECIPES, {
|
||||
@@ -319,12 +303,10 @@ authRouter.get('/auth/callback', async (c) => {
|
||||
avatarUrl = userInfo.avatar_url;
|
||||
providerId = String(userInfo.id);
|
||||
|
||||
// 存 GitHub access_token（加密）到 CREDENTIALS_KV，供 auth_oauth2 零件使用
|
||||
// GitHub 沒有 refresh_token，access_token 長效（直到 revoke）
|
||||
// 存 GitHub access_token 供 auth_static_key 零件使用（實際寫入在 apiKey 決定後，見
|
||||
// 下方 pendingCredential）。GitHub 沒有 refresh_token，access_token 長效（直到 revoke）
|
||||
if (tokenData.access_token) {
|
||||
const credKey = `${await generateApiKey(email, encryptionKey)}:cred:github_access_token`;
|
||||
const encrypted = await aesEncrypt(tokenData.access_token, encryptionKey);
|
||||
await c.env.CREDENTIALS_KV.put(credKey, JSON.stringify(encrypted));
|
||||
pendingCredential = { name: 'github_access_token', value: tokenData.access_token, service: 'github_user' };
|
||||
|
||||
// GitHub access_token 長效無 refresh 概念，用 static_key primitive
|
||||
void upsertAuthRecipe(c.env.RECIPES, {
|
||||
@@ -352,8 +334,8 @@ authRouter.get('/auth/callback', async (c) => {
|
||||
const updated: UserRecord = { ...existing, display_name: displayName, avatar_url: avatarUrl };
|
||||
await c.env.USERS_KV.put(userKey, JSON.stringify(updated));
|
||||
} else {
|
||||
// New user — generate api key (same HMAC logic as /register)
|
||||
apiKey = await generateApiKey(email, encryptionKey);
|
||||
// New user — generate a random api key
|
||||
apiKey = generateApiKey();
|
||||
const newUser: UserRecord = {
|
||||
email, display_name: displayName, avatar_url: avatarUrl,
|
||||
api_key: apiKey, provider, provider_id: providerId,
|
||||
@@ -364,6 +346,16 @@ authRouter.get('/auth/callback', async (c) => {
|
||||
await c.env.USERS_KV.put(`apikey:${apiKey}`, userKey);
|
||||
}
|
||||
|
||||
// provider token → credential 新家（Workers Secrets + D1）。登入本身不該因為存
|
||||
// credential 失敗而失敗（例如 self-hosted 未設 CF_SECRETS_API_TOKEN）→ 吞錯誤只記 log。
|
||||
if (pendingCredential) {
|
||||
try {
|
||||
await storeCredential(c.env, apiKey, pendingCredential.name, pendingCredential.value, pendingCredential.service);
|
||||
} catch (e) {
|
||||
console.error('存 provider token 失敗（不影響登入）:', e instanceof Error ? e.message : String(e));
|
||||
}
|
||||
}
|
||||
|
||||
// Create session (TTL 7 days)
|
||||
const sessionId = randomToken(32);
|
||||
const session: SessionRecord = {
|
||||
|
||||
Reference in New Issue
Block a user