mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-15 11:22:15 +03:00
65e81158ab
Landed with the design call resolved per the owner's pick — **option 1**: the synced store is now endpoint-agnostic (persistDiscoveredModels and managedModelImport no longer drop non-chat models at write time), and chat selectability moved to read time (auto-pool expansion in autoStrategy applies filterChatSelectableModels; the models-route projection already had its chatOnly filter). Your discovery test now passes end-to-end (3/3): /api/show capabilities persist per connection and image/embedding requests route through the advertising host. Reconciliation notes: conflicted areas merged onto the current tip (adobe discovery import, requestedModel preflight signature, resolvedProvider fast-path coexists with the synced-route override — explicit resolution wins); carried base-red drains (#10055 memoization, #11071 test variants) dropped as already-landed; the managed-model-import exclusion test was propagated to the new contract (image/video models persist; the read filter still hides them from chat pickers — pinned by a new assertion). Full battery: 205/206 focused (the one red is a confirmed periodic-timer timing flake on the loaded devbox — 20/20 isolated), autoCombo vitest 30/30, combo suites 46/46, gates + typecheck clean. Thank you @yourspraveen — the capability probe + routing design was right; it just needed the store contract opened up. Fixes #11087.
55 lines
2.0 KiB
TypeScript
55 lines
2.0 KiB
TypeScript
/**
|
|
* GHSA-7x63-xvp5-w2jc — the kiro / amazon-q device-code action interpolates a
|
|
* caller-supplied `region` into the AWS OIDC endpoint URLs that requestDeviceCode()
|
|
* fetches. An attacker-shaped region (userinfo / fragment) re-points the outbound
|
|
* host (SSRF → cloud metadata). The route must reject a non-canonical region with
|
|
* a 400 before any outbound fetch.
|
|
*/
|
|
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import type { NextRequest } from "next/server";
|
|
|
|
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omni-oauth-region-ssrf-"));
|
|
process.env.DATA_DIR = TEST_DATA_DIR;
|
|
|
|
const core = await import("../../src/lib/db/core.ts");
|
|
const route = await import("../../src/app/api/oauth/[provider]/[action]/route.ts");
|
|
|
|
test.after(() => {
|
|
core.resetDbInstance();
|
|
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
|
|
});
|
|
|
|
async function deviceCode(provider: string, region: string) {
|
|
const url =
|
|
`http://localhost/api/oauth/${provider}/device-code` +
|
|
`?startUrl=${encodeURIComponent("https://d-1234567890.awsapps.com/start")}` +
|
|
`®ion=${encodeURIComponent(region)}`;
|
|
return route.GET(new Request(url) as unknown as NextRequest, {
|
|
params: Promise.resolve({ provider, action: "device-code" }),
|
|
});
|
|
}
|
|
|
|
test("kiro device-code rejects a non-canonical region before any outbound fetch (GHSA-7x63)", async () => {
|
|
for (const bad of [
|
|
"evil.com",
|
|
"169.254.169.254",
|
|
"us-east-1@169.254.169.254",
|
|
"us-east-1#.amazonaws.com@evil.com",
|
|
"us-east-1/../..",
|
|
"US-EAST-1", // uppercase is not the canonical shape
|
|
]) {
|
|
const res = await deviceCode("kiro", bad);
|
|
assert.equal(res.status, 400, `region "${bad}" must be rejected with 400`);
|
|
}
|
|
});
|
|
|
|
test("amazon-q device-code also validates region", async () => {
|
|
const res = await deviceCode("amazon-q", "evil.com:1@169.254.169.254");
|
|
assert.equal(res.status, 400);
|
|
});
|