Skip to content

Commit ee5f8dd

Browse files
committed
refactor(management): keep provider capability checks out of auth boundary
1 parent e351c5e commit ee5f8dd

3 files changed

Lines changed: 42 additions & 12 deletions

File tree

‎src/server/auth-cors.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,6 @@ export function providerManagementConfigError(name: unknown, provider: unknown):
570570
return `provider ${name} must not include codexAccountMode`;
571571
}
572572
const typed = provider as unknown as OcxProviderConfig;
573-
if (raw.allowEncryptedV2AgentTasks !== undefined && typeof raw.allowEncryptedV2AgentTasks !== "boolean") {
574-
return `provider ${name} allowEncryptedV2AgentTasks must be a boolean`;
575-
}
576-
if (raw.allowEncryptedV2AgentTasks === true && typed.adapter !== "openai-responses") {
577-
return `provider ${name} allowEncryptedV2AgentTasks requires adapter=openai-responses`;
578-
}
579573
const baseUrlError = providerBaseUrlConfigError(typed.baseUrl);
580574
if (baseUrlError) return `provider ${name} ${baseUrlError}`;
581575
if (effectiveGoogleMode(name, typed) === "vertex" && typed.location !== undefined) {
@@ -697,7 +691,6 @@ export function safeConfigDTO(config: OcxConfig): unknown {
697691
for (const key of [
698692
"defaultModel",
699693
"disabled",
700-
"allowEncryptedV2AgentTasks",
701694
"allowPrivateNetwork",
702695
"authMode",
703696
"apiKeyTransport",

‎src/server/management/provider-capability-config.ts‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,25 @@ export function providerServiceTierConfigError(name: unknown, provider: unknown)
1717
return error ? `provider ${name} ${error}` : null;
1818
}
1919

20+
/**
21+
* Validate the provider editor's encrypted V2 capability outside the auth/CORS boundary.
22+
* The capability is an explicit operator trust decision, and only Responses adapters can
23+
* preserve the opaque task wire required by the feature.
24+
*/
25+
export function providerEncryptedV2ConfigError(name: unknown, provider: unknown): string | null {
26+
if (typeof name !== "string" || !provider || typeof provider !== "object" || Array.isArray(provider)) {
27+
return null;
28+
}
29+
const raw = provider as Record<string, unknown>;
30+
if (raw.allowEncryptedV2AgentTasks !== undefined && typeof raw.allowEncryptedV2AgentTasks !== "boolean") {
31+
return `provider ${name} allowEncryptedV2AgentTasks must be a boolean`;
32+
}
33+
if (raw.allowEncryptedV2AgentTasks === true && raw.adapter !== "openai-responses") {
34+
return `provider ${name} allowEncryptedV2AgentTasks requires adapter=openai-responses`;
35+
}
36+
return null;
37+
}
38+
2039
function publicServiceTierRecord(value: unknown): Record<string, boolean> | undefined {
2140
if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
2241
const entries = Object.entries(value).filter(([model, supported]) =>
@@ -26,9 +45,9 @@ function publicServiceTierRecord(value: unknown): Record<string, boolean> | unde
2645
}
2746

2847
/**
29-
* Add the provider editor's capability map to the already secret-free config
48+
* Add the provider editor's capability fields to the already secret-free config
3049
* DTO. `safeConfigDTO` remains the owner of auth/cors redaction; this helper
31-
* only projects a boolean model capability used by the management UI.
50+
* only projects the booleans used by the management UI.
3251
*/
3352
export function withProviderServiceTierDTO(dto: unknown, config: OcxConfig): unknown {
3453
if (!dto || typeof dto !== "object" || Array.isArray(dto)) return dto;
@@ -41,8 +60,15 @@ export function withProviderServiceTierDTO(dto: unknown, config: OcxConfig): unk
4160
const dtoProvider = providers[name];
4261
if (!dtoProvider || typeof dtoProvider !== "object" || Array.isArray(dtoProvider)) continue;
4362
const capabilities = publicServiceTierRecord(provider.modelSupportsServiceTier);
44-
if (capabilities === undefined) continue;
45-
projectedProviders[name] = { ...(dtoProvider as Record<string, unknown>), modelSupportsServiceTier: capabilities };
63+
const encryptedV2 = typeof provider.allowEncryptedV2AgentTasks === "boolean"
64+
? provider.allowEncryptedV2AgentTasks
65+
: undefined;
66+
if (capabilities === undefined && encryptedV2 === undefined) continue;
67+
projectedProviders[name] = {
68+
...(dtoProvider as Record<string, unknown>),
69+
...(capabilities === undefined ? {} : { modelSupportsServiceTier: capabilities }),
70+
...(encryptedV2 === undefined ? {} : { allowEncryptedV2AgentTasks: encryptedV2 }),
71+
};
4672
}
4773
return { ...root, providers: projectedProviders };
4874
}

‎src/server/management/provider-routes.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ import { filterRequestLogs, getRequestLogEntries, type RequestLogEntry } from ".
7575
import { estimateComboCost, estimateRequestCost, normalizeCostTokens, tokensPerSecond } from "../../usage/cost";
7676
import type { PersistedUsageAttempt } from "../../usage/log";
7777
import { isAllowedRequestOrigin, jsonResponse, providerManagementConfigError, publicProviderBaseUrl, safeConfigDTO } from "../auth-cors";
78-
import { providerServiceTierConfigError } from "./provider-capability-config";
78+
import { providerEncryptedV2ConfigError, providerServiceTierConfigError } from "./provider-capability-config";
7979
import { applySystemEnvToggle } from "../system-env";
8080
import {
8181
LOCAL_PROVIDER_RELOAD_NAME_HEADER,
@@ -428,6 +428,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
428428
const provider = diskConfig.providers[name]!;
429429
const providerError = providerManagementConfigError(name, provider);
430430
if (providerError) return jsonResponse({ error: "provider reload target invalid" }, 409);
431+
const encryptedV2Error = providerEncryptedV2ConfigError(name, provider);
432+
if (encryptedV2Error) return jsonResponse({ error: "provider reload target invalid" }, 409);
431433
const namespaceCollision = codexAccountNamespaceProviderCollisionError(
432434
diskConfig.codexAccountNamespaces,
433435
name,
@@ -487,6 +489,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
487489
const name = typeof body.name === "string" ? body.name.trim() : "";
488490
const providerError = providerManagementConfigError(name, body.provider);
489491
if (providerError) return jsonResponse({ error: providerError }, 400);
492+
const encryptedV2Error = providerEncryptedV2ConfigError(name, body.provider);
493+
if (encryptedV2Error) return jsonResponse({ error: encryptedV2Error }, 400);
490494
const serviceTierError = providerServiceTierConfigError(name, body.provider);
491495
if (serviceTierError) return jsonResponse({ error: serviceTierError }, 400);
492496
const prov = body.provider ? stripCodexRuntimeProviderFields(body.provider as OcxProviderConfig) : undefined;
@@ -644,6 +648,8 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
644648
if (applied.editorTouched && !pacingOnly) {
645649
const providerError = providerManagementConfigError(name, next);
646650
if (providerError) return jsonResponse({ error: providerError }, 400);
651+
const encryptedV2Error = providerEncryptedV2ConfigError(name, next);
652+
if (encryptedV2Error) return jsonResponse({ error: encryptedV2Error }, 400);
647653
const serviceTierError = providerServiceTierConfigError(name, next);
648654
if (serviceTierError) return jsonResponse({ error: serviceTierError }, 400);
649655
const resolvedError = await providerDestinationResolvedError(name, next);
@@ -676,6 +682,11 @@ export async function handleProviderRoutes(ctx: ManagementContext): Promise<Resp
676682
replayError = syncError;
677683
return;
678684
}
685+
const encryptedV2Error = providerEncryptedV2ConfigError(name, replay.next);
686+
if (encryptedV2Error) {
687+
replayError = encryptedV2Error;
688+
return;
689+
}
679690
const serviceTierError = providerServiceTierConfigError(name, replay.next);
680691
if (serviceTierError) {
681692
replayError = serviceTierError;

0 commit comments

Comments
 (0)