From f6066ad71c2901823605ef48b4bd0ae0fde1b830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Thu, 12 Nov 2026 16:44:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20Firefox?= =?UTF-8?q?=20=E4=B8=8A=20GM=5FxmlhttpRequest=20=E8=AF=B7=E6=B1=82=20http?= =?UTF-8?q?=20=E5=9C=B0=E5=9D=80=E7=9B=B4=E6=8E=A5=20onerror=20(#1846)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firefox MV3 未声明 extension_pages CSP 时默认使用 "script-src 'self'; upgrade-insecure-requests;",后台页发出的 http:// 请求 被强制升级为 https:// 而失败。显式声明 "script-src 'self';",脚本策略与默认一致, 只去掉 upgrade-insecure-requests,与 Chrome MV3 行为对齐。 --- scripts/build-config.js | 4 ++++ scripts/build-config.test.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/scripts/build-config.js b/scripts/build-config.js index f7b4dddda..d63b9a9e0 100644 --- a/scripts/build-config.js +++ b/scripts/build-config.js @@ -112,5 +112,9 @@ export function createFirefoxManifest(manifest, agentEnabled, firefoxId) { ) ); delete result.message_serialization; + // 不声明时 Firefox MV3 扩展页面默认 CSP 为 "script-src 'self'; upgrade-insecure-requests;", + // 后台页发出的 GM_xmlhttpRequest 等 http:// 请求会被强制升级为 https:// 而失败(#1846)。 + // 显式声明后脚本策略与默认一致,只去掉 upgrade-insecure-requests,与 Chrome MV3 行为对齐。 + result.content_security_policy = { ...result.content_security_policy, extension_pages: "script-src 'self';" }; return result; } diff --git a/scripts/build-config.test.js b/scripts/build-config.test.js index 21be5771a..1b08e708d 100644 --- a/scripts/build-config.test.js +++ b/scripts/build-config.test.js @@ -141,4 +141,20 @@ describe("构建配置 - 浏览器专用 manifest", () => { expect(source.optional_permissions).toEqual(["background", "userScripts"]); expect(source.background).toHaveProperty("service_worker"); }); + + it("Firefox 产物显式声明扩展页面 CSP,不带默认的 upgrade-insecure-requests(#1846)", () => { + const source = { + permissions: [], + optional_permissions: [], + background: { scripts: ["src/service_worker.js"] }, + sandbox: { pages: ["src/sandbox.html"] }, + }; + + const result = createFirefoxManifest(source, true, "{firefox-id}"); + + expect(result.content_security_policy).toEqual({ + sandbox: FIREFOX_SANDBOX_CSP, + extension_pages: "script-src 'self';", + }); + }); }); From 782ad2bab387550fb08f5e651c45e165c57b266d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Thu, 12 Nov 2026 16:44:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=92=20=E7=99=BE=E5=BA=A6=E7=BD=91?= =?UTF-8?q?=E7=9B=98=E9=A2=84=E5=88=9B=E5=BB=BA=E8=AF=B7=E6=B1=82=E6=94=B9?= =?UTF-8?q?=E7=94=A8=20https=EF=BC=8C=E9=81=BF=E5=85=8D=20access=5Ftoken?= =?UTF-8?q?=20=E6=98=8E=E6=96=87=E4=BC=A0=E8=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 同主机其余接口均为 https,仅 precreate 写成了 http://。Firefox 去掉 upgrade-insecure-requests 后该请求不再被自动升级,需改为 https。 --- packages/filesystem/baidu/baidu.test.ts | 9 +++++++++ packages/filesystem/baidu/rw.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/filesystem/baidu/baidu.test.ts b/packages/filesystem/baidu/baidu.test.ts index 5e33606d4..8d28aaddd 100644 --- a/packages/filesystem/baidu/baidu.test.ts +++ b/packages/filesystem/baidu/baidu.test.ts @@ -164,6 +164,15 @@ describe("BaiduFileSystem", () => { }); }); + it("写入时预创建请求应走 https,避免 access_token 明文传输", async () => { + const fs = new BaiduFileSystem("/apps", "token"); + const request = vi.spyOn(fs, "request").mockResolvedValue({ errno: 2, errmsg: "access denied" }); + const writer = await fs.create("dir/file.user.js"); + + await expect(writer.write("code")).rejects.toMatchObject({ provider: "baidu" }); + expect(request.mock.calls[0][0]).toMatch(/^https:\/\/pan\.baidu\.com\/rest\/2\.0\/xpan\/file\?method=precreate&/); + }); + it("读取文件元数据缺失时应抛出 typed not found 错误", async () => { const fs = new BaiduFileSystem("/apps", "token"); vi.spyOn(fs, "request").mockResolvedValue({ errno: -9, errmsg: "file not found" }); diff --git a/packages/filesystem/baidu/rw.ts b/packages/filesystem/baidu/rw.ts index 6b3284982..16692f65a 100644 --- a/packages/filesystem/baidu/rw.ts +++ b/packages/filesystem/baidu/rw.ts @@ -76,7 +76,7 @@ export class BaiduFileWriter implements FileWriter { const myHeaders = new Headers(); myHeaders.append("Content-Type", "application/x-www-form-urlencoded"); let data = await this.fs.request( - `http://pan.baidu.com/rest/2.0/xpan/file?method=precreate&access_token=${this.fs.accessToken}`, + `https://pan.baidu.com/rest/2.0/xpan/file?method=precreate&access_token=${this.fs.accessToken}`, { method: "POST", headers: myHeaders, From 00dfce6b1ac2e4722d6cc1c8ee67bbc1e6b9f227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Thu, 12 Nov 2026 17:35:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=A7=20=E4=BF=AE=E5=A4=8D=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=20Vitest=20=E5=8D=95=20worker=20=E4=B8=8B=20vm=20?= =?UTF-8?q?=E6=B1=A0=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6=E4=BA=92=E7=9B=B8?= =?UTF-8?q?=E6=B1=A1=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vitest 4 对 vmThreads/vmForks 强制 isolate=false,并在 isolate=false && maxWorkers===1 时把整个项目的文件合并成一个任务、跑在同一个 VM 上下文里(setup 只执行一次)。 #1767 把本地 maxWorkers 改为 1 后,fast/ui 项目的模块缓存、vi.mock 与 chrome mock 在文件之间共享,本地全量每次挂几十到上百个文件;CI 多 worker 下每个文件独立上下文,不暴露。 本地 vm 池项目改为 2 个 worker 以保留按文件隔离,CI 配额不变;新增配置契约测试防止回退。 --- tests/vitest-config.test.ts | 33 +++++++++++++++++++++++++++++++++ vitest.config.ts | 7 +++++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 tests/vitest-config.test.ts diff --git a/tests/vitest-config.test.ts b/tests/vitest-config.test.ts new file mode 100644 index 000000000..893c73c9f --- /dev/null +++ b/tests/vitest-config.test.ts @@ -0,0 +1,33 @@ +// @vitest-environment node +import { describe, it, expect, vi, afterAll } from "vitest"; + +// 配置在导入时按 process.env.CI 求值;须在导入前清空,才能断言本地(非 CI)分支。 +vi.hoisted(() => { + vi.stubEnv("CI", ""); +}); + +import config from "../vitest.config.ts"; + +// Vitest 4 对 vmThreads/vmForks 强制 isolate=false,且在 isolate=false && maxWorkers===1 时 +// 把整个项目的文件合并成一个任务、跑在同一个 VM 上下文里:setup 只执行一次, +// 模块缓存、vi.mock 与 chrome mock 在文件之间共享,测试互相污染。 +describe("vitest 配置 - vm 池按文件隔离", () => { + afterAll(() => { + vi.unstubAllEnvs(); + }); + + it("本地(非 CI)运行时 vm 池项目的 maxWorkers 不能为 1", () => { + const vmProjects = (config.test?.projects ?? []) + .flatMap((project) => (typeof project === "object" && "test" in project && project.test ? [project.test] : [])) + .filter((test) => test.pool === "vmThreads" || test.pool === "vmForks") + .map((test) => ({ + name: typeof test.name === "object" ? test.name.label : test.name, + maxWorkers: test.maxWorkers, + })); + + expect(vmProjects.map((project) => project.name)).toEqual(["fast", "ui"]); + for (const project of vmProjects) { + expect(project.maxWorkers, project.name).not.toBe(1); + } + }); +}); diff --git a/vitest.config.ts b/vitest.config.ts index b472d5ace..2c0f0ca59 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -70,7 +70,9 @@ export default defineConfig({ ...sharedTest, pool: "vmThreads", isolate: false, - maxWorkers: process.env.CI ? "75%" : 1, + // vm 池本地至少 2 个 worker:Vitest 对 vm 池强制 isolate=false,maxWorkers 为 1 时会把整个项目 + // 合并进同一个 VM 上下文(setup 只跑一次),模块缓存、vi.mock、chrome mock 在文件间互相泄漏。 + maxWorkers: process.env.CI ? "75%" : 2, testTimeout: 340, sequence: { groupOrder: 0, @@ -105,7 +107,8 @@ export default defineConfig({ isolate: false, // UI renders and V8 coverage are CPU-bound; leave headroom for the fast/scripts projects // so the fixed 850ms per-test budget measures the test rather than worker starvation. - maxWorkers: process.env.CI ? "50%" : 1, + // 本地至少 2 个 worker,原因同 fast 项目 + maxWorkers: process.env.CI ? "50%" : 2, testTimeout: 850, sequence: { groupOrder: process.env.CI ? 1 : 2, From f7ae86389b9b74867c2c01714df92504e2c4aedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Thu, 12 Nov 2026 17:39:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=94=A7=20=E7=A7=BB=E9=99=A4=20vitest?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E5=A5=91=E7=BA=A6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=EF=BC=8C=E7=BA=A6=E6=9D=9F=E7=94=B1=E9=85=8D=E7=BD=AE=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/vitest-config.test.ts | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 tests/vitest-config.test.ts diff --git a/tests/vitest-config.test.ts b/tests/vitest-config.test.ts deleted file mode 100644 index 893c73c9f..000000000 --- a/tests/vitest-config.test.ts +++ /dev/null @@ -1,33 +0,0 @@ -// @vitest-environment node -import { describe, it, expect, vi, afterAll } from "vitest"; - -// 配置在导入时按 process.env.CI 求值;须在导入前清空,才能断言本地(非 CI)分支。 -vi.hoisted(() => { - vi.stubEnv("CI", ""); -}); - -import config from "../vitest.config.ts"; - -// Vitest 4 对 vmThreads/vmForks 强制 isolate=false,且在 isolate=false && maxWorkers===1 时 -// 把整个项目的文件合并成一个任务、跑在同一个 VM 上下文里:setup 只执行一次, -// 模块缓存、vi.mock 与 chrome mock 在文件之间共享,测试互相污染。 -describe("vitest 配置 - vm 池按文件隔离", () => { - afterAll(() => { - vi.unstubAllEnvs(); - }); - - it("本地(非 CI)运行时 vm 池项目的 maxWorkers 不能为 1", () => { - const vmProjects = (config.test?.projects ?? []) - .flatMap((project) => (typeof project === "object" && "test" in project && project.test ? [project.test] : [])) - .filter((test) => test.pool === "vmThreads" || test.pool === "vmForks") - .map((test) => ({ - name: typeof test.name === "object" ? test.name.label : test.name, - maxWorkers: test.maxWorkers, - })); - - expect(vmProjects.map((project) => project.name)).toEqual(["fast", "ui"]); - for (const project of vmProjects) { - expect(project.maxWorkers, project.name).not.toBe(1); - } - }); -}); From a4f273dc8b6997713cc6b98446f6531cb04dfac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Fri, 13 Nov 2026 10:03:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=A7=20=E6=9C=AC=E5=9C=B0=20Vitest?= =?UTF-8?q?=20=E4=BF=9D=E6=8C=81=E5=8D=95=20worker=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E7=94=A8=20threads=20+=20isolate=20=E6=81=A2=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=9A=94=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit vm 池在 maxWorkers 为 1 时必然把整个项目合进同一个 VM 上下文,因此本地不再调高 worker 数, 而是按 process.env.CI 区分:本地 fast/ui 用 threads + isolate:true(1 个 worker),CI 仍用 vmThreads 与原配额。 --- vitest.config.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vitest.config.ts b/vitest.config.ts index 2c0f0ca59..86440a883 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -68,11 +68,11 @@ export default defineConfig({ name: "fast", exclude: [...BASE_EXCLUDE, ...ISOLATED, ...UI_TESTS, ...SCRIPT_TESTS], ...sharedTest, - pool: "vmThreads", - isolate: false, - // vm 池本地至少 2 个 worker:Vitest 对 vm 池强制 isolate=false,maxWorkers 为 1 时会把整个项目 - // 合并进同一个 VM 上下文(setup 只跑一次),模块缓存、vi.mock、chrome mock 在文件间互相泄漏。 - maxWorkers: process.env.CI ? "75%" : 2, + // 本地单 worker 时改用 threads + isolate:Vitest 对 vm 池强制 isolate=false,且在 maxWorkers 为 1 时 + // 把整个项目合并进同一个 VM 上下文(setup 只跑一次),模块缓存、vi.mock、chrome mock 在文件间互相泄漏。 + pool: process.env.CI ? "vmThreads" : "threads", + isolate: !process.env.CI, + maxWorkers: process.env.CI ? "75%" : 1, testTimeout: 340, sequence: { groupOrder: 0, @@ -103,12 +103,12 @@ export default defineConfig({ include: UI_TESTS, exclude: BASE_EXCLUDE, ...sharedTest, - pool: "vmThreads", - isolate: false, + // 本地 pool/isolate 取值原因同 fast 项目 + pool: process.env.CI ? "vmThreads" : "threads", + isolate: !process.env.CI, // UI renders and V8 coverage are CPU-bound; leave headroom for the fast/scripts projects // so the fixed 850ms per-test budget measures the test rather than worker starvation. - // 本地至少 2 个 worker,原因同 fast 项目 - maxWorkers: process.env.CI ? "50%" : 2, + maxWorkers: process.env.CI ? "50%" : 1, testTimeout: 850, sequence: { groupOrder: process.env.CI ? 1 : 2,