Compare commits

..

3 Commits

Author SHA1 Message Date
adevwithpurpose
af6813ca12 fix(security): keep only the regex sanitization; drop non-functional CodeQL annotations
The lgtm[]/nosemgrep: comments in codexIdentity.ts and reasoningCache.ts use
formats GitHub Actions CodeQL does not honor, and shifting those sha256 lines
re-attributed the already-dismissed base alerts to this PR as two new CodeQL
findings. Revert those two annotation-only files to base so the existing
dismissals apply; retain the real fix (escaping backslash in the test regex),
which resolves the open js/incomplete-sanitization alert.
2026-08-15 10:08:14 -03:00
adevwithpurpose
864e817eda Merge remote-tracking branch 'origin/release/v3.8.50' into fix/codeql-0814-hash-fp-and-sanitize 2026-08-15 09:04:23 -03:00
Xiangzhe
ab36b35035 fix(security): sanitize test regex and annotate CodeQL hash false-positives
tests/unit/early-sse-route-intent.test.ts built a RegExp from a hardcoded
string but only escaped `?`/`.`, missing `\` — js/incomplete-sanitization
(#816). Not exploitable (fixed literal input) but the escaping was
genuinely incomplete; now escapes backslash too.

reasoningCache.ts::buildAssistantMessageCacheKey and codexIdentity.ts's two
UUID derivation helpers hash a cache-scope/account-seed with SHA-256 to
produce a lookup key / deterministic ID — not a stored, verified password.
CodeQL's js/insufficient-password-hash overfires on any hash of a
secret-like variable, the same false-positive class already annotated at
src/lib/db/apiKeys.ts:624. Added matching lgtm/nosemgrep annotations and
inline rationale so the intent is clear to reviewers and future scans.

Refs #815 #816 #817 #818
2026-08-14 10:07:07 -03:00
5 changed files with 3 additions and 141 deletions

View File

@@ -35,7 +35,6 @@ import {
prepareStructuredEmbeddingRequest,
} from "./embeddingStructuredInput.ts";
import { MAX_EMBEDDING_INLINE_ITEM_BYTES } from "@/shared/validation/schemas/apiV1";
import { markAccountUnavailable } from "../../src/sse/services/auth.ts";
interface ClientRawRequest {
endpoint: string;
@@ -390,28 +389,6 @@ export async function handleEmbedding({
connectionId,
}).catch(() => {});
// #10347 — persist a connection-level failure marker on a hard upstream failure so
// the dead account is not re-selected and re-hit on the next embed request (chat
// parity). markAccountUnavailable classifies the status via checkFallbackError: a
// payment-required 402 becomes the TERMINAL state credits_exhausted (the terminal
// marker excludes the account from selection until an operator resets it), benign
// 4xx are a no-op, and terminal statuses are never overwritten. honors per-connection
// disableCooling. The write must never break the error response path, so it is
// best-effort.
if (connectionId) {
try {
await markAccountUnavailable(
connectionId,
response.status,
errorText,
provider,
model
);
} catch {
// swallow — the upstream error response takes priority
}
}
return {
success: false,
status: response.status,

View File

@@ -84,14 +84,7 @@ export async function POST(request, { params }) {
);
}
const result = await handleEmbedding({
body,
credentials,
log,
// #10347 — thread the selected connection id so a hard upstream failure cools
// the account instead of re-hitting it on every request.
connectionId: (credentials as { connectionId?: string } | null)?.connectionId ?? null,
});
const result = await handleEmbedding({ body, credentials, log });
if (result.success) {
await clearRecoveredProviderState(credentials);

View File

@@ -302,12 +302,7 @@ export async function createEmbeddingResponse(
clientRawRequest: options.clientRawRequest || null,
apiKeyId: options.apiKeyId || null,
apiKeyName: options.apiKeyName || null,
// #10347 — thread the selected connection id so handleEmbedding can cool the
// account on a hard upstream failure (previously always null on /v1/embeddings).
connectionId:
((credentials as { connectionId?: string } | null)?.connectionId) ||
options.connectionId ||
null,
connectionId: options.connectionId || null,
});
const result = connectionIdForProxy

View File

@@ -1,103 +0,0 @@
/**
* TDD regression (#10347): the embed path reads a connection's cooldown at
* selection time but NEVER writes one on a terminal upstream failure. A Mistral
* (or any) connection returning HTTP 402 "payment required — Check your
* subscription" on embeds is re-selected and re-hit upstream on every request —
* the repeated EMBED/ERROR/ProxyEgress storm on 3.8.49. Chat wires the cooldown
* write (`markAccountUnavailable`) on hard failures; embed never does.
*
* Repro: create a real mistral apikey connection, mock `globalThis.fetch` to
* return HTTP 402 with a payment-required JSON body, call `handleEmbedding`
* with that connectionId, then assert the connection's `rate_limited_until`
* becomes a future timestamp. Today it stays `undefined` (RED); with the fix
* `markAccountUnavailable` persists a 1h QUOTA_EXHAUSTED cooldown (GREEN).
*/
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";
const TEST_DATA_DIR = fs.mkdtempSync(path.join(os.tmpdir(), "omniroute-embed-402-"));
process.env.DATA_DIR = TEST_DATA_DIR;
const core = await import("../../src/lib/db/core.ts");
const providersDb = await import("../../src/lib/db/providers.ts");
const { handleEmbedding } = await import("../../open-sse/handlers/embeddings.ts");
test.after(() => {
core.resetDbInstance();
fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });
});
function readConnectionRow(connId: string) {
const db = core.getDbInstance() as unknown as {
prepare: (sql: string) => {
get: (id: string) => {
test_status: unknown;
rate_limited_until: unknown;
last_error_type: unknown;
} | undefined;
};
};
return db
.prepare(
"SELECT test_status, rate_limited_until, last_error_type FROM provider_connections WHERE id = ?"
)
.get(connId);
}
test("embed 402 marks the connection terminal credits_exhausted (stops re-selection)", async () => {
const conn = await providersDb.createProviderConnection({
provider: "mistral",
authType: "apikey",
name: "embed 402 cooldown",
});
const connId = (conn as { id: string }).id;
const originalFetch = globalThis.fetch;
globalThis.fetch = async () =>
new Response(
JSON.stringify({
code: "subscription_inactive",
message: "Check your subscription",
}),
{
status: 402,
headers: { "content-type": "application/json" },
}
);
try {
const result = await handleEmbedding({
body: { model: "mistral/mistral-embed", input: "ping" },
credentials: { apiKey: "mistral-key" },
connectionId: connId,
log: null,
});
// The upstream was hit and surfaced a 402 — the bug scope.
assert.equal(result.success, false);
assert.equal(result.status, 402);
const row = readConnectionRow(connId);
// markAccountUnavailable classifies a payment-required 402 as the TERMINAL state
// credits_exhausted (last_error_type quota_exhausted) with no transient numeric
// cooldown — the terminal marker is what excludes the account from the embed
// selection path on the next request, stopping the repeat re-hit storm.
assert.equal(
row?.test_status,
"credits_exhausted",
`expected the 402 to mark the connection terminal (test_status=credits_exhausted) on ${connId}, got ${String(
row?.test_status
)}`
);
assert.equal(
row?.last_error_type,
"quota_exhausted",
`expected last_error_type=quota_exhausted on ${connId}, got ${String(row?.last_error_type)}`
);
} finally {
globalThis.fetch = originalFetch;
}
});

View File

@@ -22,7 +22,7 @@ const ROUTES = [
for (const route of ROUTES) {
test(`${route.name} early-heartbeat gate uses the real stream resolver`, () => {
const escapedBodyExpression = route.bodyExpression.replace(/[?.]/g, "\\$&");
const escapedBodyExpression = route.bodyExpression.replace(/[.?\\]/g, "\\$&");
assert.match(
route.source,
new RegExp(