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, 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';", + }); + }); }); diff --git a/vitest.config.ts b/vitest.config.ts index b472d5ace..86440a883 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -68,8 +68,10 @@ export default defineConfig({ name: "fast", exclude: [...BASE_EXCLUDE, ...ISOLATED, ...UI_TESTS, ...SCRIPT_TESTS], ...sharedTest, - pool: "vmThreads", - isolate: false, + // 本地单 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: { @@ -101,8 +103,9 @@ 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. maxWorkers: process.env.CI ? "50%" : 1,