mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +03:00
Rebased onto the current release/v3.8.51 tip as part of a combined provider-retirement/provenance merge batch (Designer Web, Felo Web, Runtime, GPL-derived removal, Qwen Web already landed). Large conflict set (this is the biggest PR in the batch — the common ChatGPT Web provider touches chat, images, count-tokens, session leases, and combos). Conflicts resolved: - `open-sse/config/providers/registry/chatgpt-web/*`, `open-sse/executors/chatgpt-web*`, `open-sse/handlers/imageGeneration/providers/chatgptWeb.ts`, and their tests: kept deleted, matching the PR's stated scope. - `open-sse/config/providers/registry/minimax/web/index.ts`, `open-sse/handlers/imageGeneration/providers/geminiWeb.ts`, `open-sse/executors/gemini-web.ts`'s stale image-mode branch: base-drift collisions against already-merged sibling retirements (#11691, #11708) — kept deleted / dropped the dead code, since this PR's own branch forked before those merged. - `src/shared/constants/reservedProviderPrefixes.ts`, `open-sse/executors/index.ts`, `executorProxy.ts`, `virtualFactory.ts`, `autoStrategy.ts`, `src/lib/db/providers.ts`, `src/sse/handlers/chat.ts`: combined the Designer + Runtime (Felo/Qwen) + common-ChatGPT-Web retirement guard calls at each shared chokepoint — compute-once-then-OR pattern, consistent with prior combinations in this batch. - `src/sse/services/model.ts` / `src/sse/handlers/chatHelpers.ts`: adopted this PR's new `getModelInfoOrRetirementResponse()` central wrapper (a real improvement over ad-hoc try/catch), and extended it to also catch the Designer + Runtime retirement errors it didn't originally cover, so the consolidation doesn't regress the other two mechanisms. - `src/app/api/v1/images/edits/route.ts`: this PR moved the retirement check earlier (before `enforceApiKeyPolicy`) but left the old later call+catch block in place from base drift — removed the now-redundant duplicate `resolveImageRouteModel()` call and merged the Designer catch into the earlier one. - `open-sse/config/imageRegistry.ts`, `tests/snapshots/executors/executor-map.json` (`keyCount` recomputed to 133), `tests/snapshots/provider/translate-path.json`: same "both sides inserted a different retired provider at the same slot" pattern — resolved by dropping both. - `tests/unit/chatcore-executor-proxy.test.ts`, `provider-node-reserved-prefix.test.ts`, `combo-auto-candidate-expansion.test.ts`, `messages-count-tokens-route.test.ts`, `virtual-auto-combo.test.ts`: split into independent per-mechanism test blocks (established pattern); `virtual-auto-combo.test.ts`'s old "includes cookie web-session providers" positive-inclusion test (which used chatgpt-web as its example) was retired along with the provider and replaced by this PR's negative-exclusion test for the same slot. - `docs/architecture/ARCHITECTURE.md`, `CODEBASE_DOCUMENTATION.md` (+ 4 i18n mirrors), `README.md`, `FREE-TIERS-GUIDE.md`, `docs/diagrams/free-tier-budget.svg`, `docs/screenshots/free-tier-budget-card.svg`, `docs/reference/PROVIDER_REFERENCE.md`: recomputed every stale count from the real merged state — 104 executors (`countFiles` gate logic), 351 providers (regenerated via `gen:provider-reference`), 152/351 `hasFree` entries, 445/438/7 free-tier catalog rows, 13 ToS-avoid providers, budget-card regenerated via its real generator script. One doc conflict (`oauth/` module list) needed picking HEAD's side specifically — theirs still listed the already-removed `raycast` module instead of the real `openference`. - `config/quality/test-masking-allowlist.json`: additive merge of the PR's 17 `_deletedWithReplacement` entries alongside the batch's existing ones (one real duplicate-key mistake in my first pass, caught and fixed via a `object_pairs_hook` duplicate-key check before finalizing). Also fixed two real, unrelated-to-my-merge issues surfaced by the focused suite: - `tests/unit/resolve-web-provider-host.test.ts`: the PR's own test had a typo — it asserted `perplexity-web`'s resolved host as `"perplexity.ai"`, but the provider's registered `website` is `"https://www.perplexity.ai"` and the resolver returns the URL's `host` verbatim (no www-stripping), so the correct value is `"www.perplexity.ai"` (consistent with the same test's own `url` assertion). - `tests/unit/hard-session-lease-bypass-inventory.test.ts`: this golden call-site inventory was already stale on the pristine post-#11713 tip (confirmed via a throwaway probe worktree) — `src/lib/db/providers.ts`'s 3 connection-fallback sites and a third `src/app/api/providers/route.ts` site were never added to the golden list by the earlier-merged #11698/#11720 PRs. Updated it to the real current inventory (dated inline comments explain each delta and which PR introduced it), plus this PR's own legitimate deltas (image-edits duplicate-call removal, `ChatGptWebExecutor.execute()` site removed). Focused suite green (433/433 across executor-proxy, reserved-prefix, hard-session-lease-bypass-inventory, resolve-web-provider-host, retirement/runtime-block/source-retirement/management-retirement/image-handler-retirement, migration-168, combo-auto-candidate-expansion, virtual-auto-combo, executor-map-golden and siblings), plus `typecheck:core`, `check-file-size`, and `check-changelog-integrity` clean. Thanks for the thorough provenance-hold retirement work — appreciated.
108 lines
4.6 KiB
TypeScript
108 lines
4.6 KiB
TypeScript
// Regression test for #7058 — zai-web (and every other entry-bearing web-cookie
|
|
// provider) never honored a configured HTTP/SOCKS proxy during connection-test /
|
|
// cookie validation.
|
|
//
|
|
// Root cause: validateWebCookieProvider() probed `${baseUrl}/models` via
|
|
// directHttpsRequest(), which hardcodes `bypassProxyPatch: true` — forcing
|
|
// safeOutboundFetch to use the pre-patch native fetch and skip proxy-context/
|
|
// env-var resolution entirely. That bypass was introduced in #3226 as a narrow,
|
|
// documented exception for a single NVIDIA NIM workaround
|
|
// (see tests/unit/proxy-bypass-scope-guard-3226.test.ts) but validateWebCookieProvider
|
|
// adopted it as its default transport from inception (#4023), silently extending the
|
|
// bypass to every web-cookie provider with a registry entry (zai-web among them).
|
|
//
|
|
// This test proves the cookie-validation probe reaches a local forward proxy
|
|
// (via a real CONNECT tunnel — the same mechanism undici uses for both HTTP and
|
|
// HTTPS targets) when one is configured via HTTP_PROXY, exactly like the
|
|
// specialty web-cookie validators (grok-web, perplexity-web, etc.) already do via
|
|
// validationRead/validationWrite.
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import http from "node:http";
|
|
import net from "node:net";
|
|
|
|
const { validateWebCookieProvider } = await import("../../src/lib/providers/validation.ts");
|
|
const { REGISTRY } = await import("../../open-sse/config/providerRegistry.ts");
|
|
const { clearDispatcherCache } = await import("../../open-sse/utils/proxyDispatcher.ts");
|
|
|
|
const zaiWebEntry = REGISTRY["zai-web"] as { baseUrl?: string } | undefined;
|
|
const ORIGINAL_BASE_URL = zaiWebEntry?.baseUrl;
|
|
const ORIGINAL_HTTP_PROXY = process.env.HTTP_PROXY;
|
|
|
|
test.after(() => {
|
|
if (zaiWebEntry && ORIGINAL_BASE_URL !== undefined) {
|
|
zaiWebEntry.baseUrl = ORIGINAL_BASE_URL;
|
|
}
|
|
if (ORIGINAL_HTTP_PROXY === undefined) {
|
|
delete process.env.HTTP_PROXY;
|
|
} else {
|
|
process.env.HTTP_PROXY = ORIGINAL_HTTP_PROXY;
|
|
}
|
|
clearDispatcherCache();
|
|
});
|
|
|
|
test("zai-web cookie validation routes through the configured HTTP_PROXY (#7058)", async () => {
|
|
assert.ok(
|
|
zaiWebEntry,
|
|
"zai-web must have a providerRegistry entry for this test to be meaningful"
|
|
);
|
|
|
|
// Stand-in for chat.z.ai's /models probe target.
|
|
let targetPath = "";
|
|
let targetAuthorization = "";
|
|
const target = http.createServer((req, res) => {
|
|
targetPath = req.url ?? "";
|
|
targetAuthorization = req.headers.authorization ?? "";
|
|
res.writeHead(200, { "content-type": "application/json" });
|
|
res.end("{}");
|
|
});
|
|
await new Promise<void>((resolve) => target.listen(0, () => resolve()));
|
|
const targetPort = (target.address() as net.AddressInfo).port;
|
|
|
|
// Minimal forward proxy that only speaks CONNECT (like a real corporate proxy) and
|
|
// always tunnels to the local target above, regardless of the requested host — this
|
|
// lets the "upstream" host be a non-resolvable placeholder without any real DNS
|
|
// dependency, while still proving the request actually reached the proxy.
|
|
let sawConnect = false;
|
|
const proxy = http.createServer((_req, res) => {
|
|
res.writeHead(501);
|
|
res.end("CONNECT only");
|
|
});
|
|
proxy.on("connect", (_req, socket) => {
|
|
sawConnect = true;
|
|
const upstream = net.connect(targetPort, "127.0.0.1", () => {
|
|
socket.write("HTTP/1.1 200 Connection Established\r\n\r\n");
|
|
upstream.pipe(socket);
|
|
socket.pipe(upstream);
|
|
});
|
|
upstream.on("error", () => socket.destroy());
|
|
socket.on("error", () => upstream.destroy());
|
|
});
|
|
await new Promise<void>((resolve) => proxy.listen(0, () => resolve()));
|
|
const proxyPort = (proxy.address() as net.AddressInfo).port;
|
|
|
|
// A non-local-looking hostname: isLocalAddress()/resolveProxyForRequest() force a
|
|
// direct connection for any 127.*/localhost/LAN target, which would defeat this test.
|
|
zaiWebEntry!.baseUrl = "http://zai-web-validation-probe-7058.invalid";
|
|
process.env.HTTP_PROXY = `http://127.0.0.1:${proxyPort}`;
|
|
clearDispatcherCache();
|
|
|
|
try {
|
|
const result = await validateWebCookieProvider({ provider: "zai-web", apiKey: "token=fake" });
|
|
|
|
assert.equal(
|
|
sawConnect,
|
|
true,
|
|
"BUG #7058: zai-web cookie validation never reached the configured HTTP_PROXY " +
|
|
"(bypassProxyPatch:true unconditionally uses the native, unpatched fetch)"
|
|
);
|
|
assert.equal(result.valid, true, `expected a valid session, got ${JSON.stringify(result)}`);
|
|
assert.equal(targetPath, "/api/models");
|
|
assert.equal(targetAuthorization, "Bearer fake");
|
|
} finally {
|
|
target.close();
|
|
proxy.close();
|
|
clearDispatcherCache();
|
|
}
|
|
});
|