- 上一版默认 scope 名是猜的(account.read / email_routing.write),全部被拒。 正确词表是点号分隔的 <group>.<verb>,且: - 账号是 account-settings.read(选择器里叫 Account Settings Read),不是 account.read - Workers 脚本是 workers-scripts.write,不是 workers_scripts.write - Email Routing 在选择器里是四个独立权限,改 catch-all 对应 email-routing-rule.write - account:read 这种冒号写法是 wrangler 的第一方简写,第三方 client 一律被拒 - client 注册的 scope 是上限不是默认:没勾的权限即使账号有也不生效 - preflight 扩展 scope 探测:授权端点在同意页之前就校验并点名拒绝的 scope, 逐轮「请求剩余候选 -> 剔除被点名项」即可收敛出 App 已授权集合(未认证请求, 不登录/不产生授权),结果按 allowed/denied 返回并在设置页用绿/橙标签展示 - 缺少账号级读权限时不再失败:discover() 先试 /accounts,403 则改为列 token 可见的 /zones, 用 zone 自带的 account_id 反推账户(展示名用第一个域名) - 默认 scope 收敛为接入必需的三项(zone.read / workers-scripts.write / email-routing-rule.write),account-settings.read 改为可选:勾了才显示真实账号名 - 实测:线上 preflight 已 ok=true(Cloudflare 跳登录页),无需再改 App 即可「添加账号」
167 lines
7.1 KiB
TypeScript
167 lines
7.1 KiB
TypeScript
/**
|
|
* Cloudflare API 抓包桩(仅测试用):
|
|
* 拦截 globalThis.fetch,对 dash.cloudflare.com / api.cloudflare.com 返回固定响应,
|
|
* 并记录真实发出的 HTTP 调用。生产代码里没有任何模拟实现——接入链路跑的始终是
|
|
* RealCFApi,测试只是在传输层把它要访问的 Cloudflare 换成本地桩。
|
|
*/
|
|
|
|
/** # 成员变量: 记录到的 Cloudflare API 调用 **/
|
|
export interface CfCall {
|
|
/** 请求方法 **/
|
|
method: string;
|
|
/** 完整 URL **/
|
|
url: string;
|
|
/** 路径(去掉 base) **/
|
|
path: string;
|
|
/** Authorization 头(OAuth Bearer token) **/
|
|
authorization: string | null;
|
|
/** 请求体文本(URL 编码或 JSON);multipart 上传记 null **/
|
|
body: string | null;
|
|
}
|
|
|
|
/** # 成员变量: 桩的返回数据配置 **/
|
|
export interface CfMockOptions {
|
|
/** /accounts 返回的账户列表 **/
|
|
accounts?: { id: string; name: string }[];
|
|
/** /zones 返回的域名列表 **/
|
|
zones?: { id: string; name: string; account_id: string; status: string }[];
|
|
/** OAuth token 端点签发的 access token **/
|
|
accessToken?: string;
|
|
/** token 端点 HTTP 状态(测失败分支用) **/
|
|
tokenStatus?: number;
|
|
/** 授权端点(dash.cloudflare.com/oauth2/auth)的固定 Location 跳转目标;不传则按 scopesAllowed 判定 **/
|
|
authorizeRedirect?: string;
|
|
/** 授权端点允许的 scope 集合;其余一律 invalid_scope 并点名第一个被拒的(不传 = 全拒) **/
|
|
scopesAllowed?: string[];
|
|
/** 授权端点固定错误(走 Cloudflare 自己的 /oauth/error 页,不弹回回调地址) **/
|
|
authorizeError?: string;
|
|
/** /accounts 返回 403(模拟只授权了 zone 读、没有账号级读权限) */
|
|
failAccounts?: boolean;
|
|
}
|
|
|
|
/** # 成员变量: Cloudflare API 桩句柄 **/
|
|
export interface CfMock {
|
|
/** 已记录的调用 **/
|
|
calls: CfCall[];
|
|
/** 恢复原始 fetch **/
|
|
restore(): void;
|
|
/** 是否发生过指定 method + 路径子串的调用 **/
|
|
hit(method: string, pathPart: string): boolean;
|
|
/** 取出第一条匹配调用的 body **/
|
|
bodyOf(method: string, pathPart: string): string | null;
|
|
}
|
|
|
|
const TOKEN_URL = "https://dash.cloudflare.com/oauth2/token";
|
|
const CF_AUTHORIZE_URL = "https://dash.cloudflare.com/oauth2/auth";
|
|
const REDIRECT_URI = "http://localhost/api/oauth/cloudflare/callback";
|
|
const API_BASE = "https://api.cloudflare.com/client/v4";
|
|
|
|
/** # 函数
|
|
* 安装 Cloudflare API 桩:接管 globalThis.fetch,返回记录与恢复句柄
|
|
* 参数: opts.accounts/zones 决定发现到的资源,tokenStatus 可模拟 token 兑换失败
|
|
*/
|
|
export function installCloudflareMock(opts: CfMockOptions = {}): CfMock {
|
|
const accounts = opts.accounts ?? [{ id: "cf-acct-real-1", name: "Real Cloudflare Account" }];
|
|
const zones = opts.zones ?? [
|
|
{ id: "zone-example", name: "example.com", account_id: accounts[0]?.id ?? "", status: "active" },
|
|
{ id: "zone-demo", name: "demo.com", account_id: accounts[0]?.id ?? "", status: "active" },
|
|
];
|
|
const accessToken = opts.accessToken ?? "cf-oauth-access-token-xyz";
|
|
const calls: CfCall[] = [];
|
|
const original = globalThis.fetch;
|
|
|
|
globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
|
|
const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
|
const method = (init?.method ?? (input instanceof Request ? input.method : "GET")).toUpperCase();
|
|
const headers = new Headers(
|
|
init?.headers ?? (input instanceof Request ? input.headers : undefined),
|
|
);
|
|
const rawBody = init?.body;
|
|
const body =
|
|
typeof rawBody === "string"
|
|
? rawBody
|
|
: rawBody instanceof URLSearchParams
|
|
? rawBody.toString()
|
|
: null;
|
|
|
|
calls.push({
|
|
method,
|
|
url,
|
|
path: url.startsWith(API_BASE) ? url.slice(API_BASE.length) : url,
|
|
authorization: headers.get("authorization"),
|
|
// multipart 上传(Email Worker 脚本)读不出文本,只记方法与路径
|
|
body: rawBody instanceof FormData ? null : body,
|
|
});
|
|
|
|
const json = (result: unknown, status = 200) =>
|
|
new Response(JSON.stringify({ success: true, errors: [], messages: [], result }), {
|
|
status,
|
|
headers: { "Content-Type": "application/json" },
|
|
});
|
|
|
|
if (url.startsWith(CF_AUTHORIZE_URL)) {
|
|
if (opts.authorizeError) {
|
|
return new Response(null, {
|
|
status: 302,
|
|
headers: { Location: `https://dash.cloudflare.com/oauth/error?error=${opts.authorizeError}&state=wmh_preflight` },
|
|
});
|
|
}
|
|
if (opts.authorizeRedirect) {
|
|
return new Response(null, { status: 302, headers: { Location: opts.authorizeRedirect } });
|
|
}
|
|
// 默认行为:只有 scopesAllowed 里的 scope 才放行,否则点名第一个被拒的
|
|
const allowed = opts.scopesAllowed ?? [];
|
|
const asked = (new URL(url).searchParams.get("scope") ?? "").split(" ").filter(Boolean);
|
|
const rejected = asked.find((sc) => !allowed.includes(sc));
|
|
if (rejected) {
|
|
const desc = `The requested scope is invalid, unknown, or malformed. The OAuth 2.0 Client is not allowed to request scope '${rejected}'.`;
|
|
return new Response(null, {
|
|
status: 302,
|
|
headers: {
|
|
Location: `${REDIRECT_URI}?error=invalid_scope&error_description=${encodeURIComponent(desc)}&state=wmh_preflight`,
|
|
},
|
|
});
|
|
}
|
|
return new Response(null, { status: 302, headers: { Location: "https://dash.cloudflare.com/login" } });
|
|
}
|
|
if (url === TOKEN_URL) {
|
|
if ((opts.tokenStatus ?? 200) !== 200) {
|
|
return new Response(JSON.stringify({ error: "invalid_grant" }), { status: opts.tokenStatus });
|
|
}
|
|
// OAuth token 端点是裸 JSON(不是 Cloudflare API 的 {success,result} 信封)
|
|
return new Response(JSON.stringify({ access_token: accessToken, expires_in: 3600, token_type: "bearer" }), {
|
|
status: 200,
|
|
headers: { "Content-Type": "application/json" },
|
|
});
|
|
}
|
|
if (url.startsWith(`${API_BASE}/accounts`)) {
|
|
// 只拦账户列表本身;workers/scripts 上传同为 /accounts 前缀,不应受影响
|
|
if (opts.failAccounts && url === `${API_BASE}/accounts`) {
|
|
return new Response(
|
|
JSON.stringify({ success: false, errors: [{ code: 9109, message: "Invalid access token" }], result: null }),
|
|
{ status: 403, headers: { "Content-Type": "application/json" } },
|
|
);
|
|
}
|
|
return json(accounts);
|
|
}
|
|
if (url.startsWith(`${API_BASE}/zones`)) {
|
|
if (url.includes("/email/routing/rules/catch_all")) return json({ id: "catch-all-rule" });
|
|
if (url.includes("/email/routing")) return json({ enabled: true });
|
|
return json(zones);
|
|
}
|
|
if (url.includes("/workers/scripts/")) return json({ id: url.split("/").pop() });
|
|
return json(null, 404);
|
|
}) as typeof globalThis.fetch;
|
|
|
|
return {
|
|
calls,
|
|
restore: () => {
|
|
globalThis.fetch = original;
|
|
},
|
|
hit: (method, pathPart) =>
|
|
calls.some((c) => c.method === method.toUpperCase() && c.path.includes(pathPart)),
|
|
bodyOf: (method, pathPart) =>
|
|
calls.find((c) => c.method === method.toUpperCase() && c.path.includes(pathPart))?.body ?? null,
|
|
};
|
|
}
|