Skip to content

OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security

fix(sdk): preserve effective Bedrock settings in saved recipes (#1811)

Michael D'Angelo0ab029ee5caa
diff --git a/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts b/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts
index e81ada2b1..1f270499c 100644
--- a/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts
+++ b/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts
@@ -1591,6 +1591,10 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,
wire_api: "responses",
env_key: "SYNTHETIC_GATEWAY_KEY",
env_http_headers: { "X-Synthetic": "SYNTHETIC_HEADER_VALUE" },
+ aws: {
+ region: index % 2 === 0 ? "us-east-2" : "us-west-2",
+ profile: `synthetic-scan-${index}`,
+ },
...(index === 3 ? {} : { requires_openai_auth: index === 2 }),
experimental_bearer_token: `synthetic-bearer-${index}`,
auth: {
@@ -2467,6 +2471,21 @@ async function testBedrockCredentialsReachWorker(
assert.ok(awsEnvironment.AWS_ACCESS_KEY_ID);
assert.ok(awsEnvironment.AWS_SECRET_ACCESS_KEY);
assert.ok(awsEnvironment.AWS_SESSION_TOKEN);
+ const codexHome = path.join(fixture.root, "private profile home");
+ const nativeProfile = `bedrock_${credentials}`;
+ const providerConfig = {
+ aws: {
+ region: credentials === "all" ? "eu-west-1" : "eu-central-1",
+ profile: `synthetic-bedrock-${credentials}`,
+ },
+ };
+ await mkdir(codexHome);
+ await writeFile(
+ path.join(codexHome, `${nativeProfile}.config.toml`),
+ stringifyToml({
+ model_providers: { "amazon-bedrock": providerConfig },
+ }),
+ );
const configPath = path.join(fixture.root, "bedrock.toml");
await writeFile(
configPath,
@@ -2475,12 +2494,19 @@ async function testBedrockCredentialsReachWorker(
const deepConfigPath = path.join(fixture.root, "bedrock-workers.toml");
await writeFile(
deepConfigPath,
- '[worker_runtime]\nmodel_provider = "amazon-bedrock"\nmodel_reasoning_summary = "none"\n',
+ stringifyToml({
+ worker_runtime: {
+ model_provider: "amazon-bedrock",
+ model_reasoning_summary: "none",
+ native_profile: nativeProfile,
+ },
+ }),
);
const environment = {
...Object.fromEntries(awsNames.map((name) => [name, awsEnvironment[name]])),
OPENAI_API_KEY: undefined,
CODEX_API_KEY: undefined,
+ CODEX_HOME: codexHome,
CODEX_SECURITY_CONFIG_PATH: configPath,
CODEX_SECURITY_DEEP_SCAN_CONFIG_PATH: deepConfigPath,
CODEX_CLI_PATH: fixture.executablePath,
@@ -2519,6 +2545,15 @@ async function testBedrockCredentialsReachWorker(
const invocation = await readJson(fixture.markerPath);
assert.deepEqual(invocation.bedrockAuthentication, awsEnvironment);
assert.deepEqual(invocation.openaiAuthentication, {});
+ assertFlagPair(invocation.argv, "--profile", nativeProfile);
+ assert.deepEqual(
+ JSON.parse(
+ JSON.stringify(
+ parseToml(invocation.profileContents).model_providers,
+ ),
+ ),
+ { "amazon-bedrock": providerConfig },
+ );
assert.equal(
invocation.argv.includes("resume"),
resumeThreadId !== undefined,
diff --git a/sdk/typescript/src/api.ts b/sdk/typescript/src/api.ts
index e8868227c..f83677934 100644
--- a/sdk/typescript/src/api.ts
+++ b/sdk/typescript/src/api.ts
@@ -5659,7 +5659,7 @@ export function scanPreflightCodexConfig(config: JsonObject): JsonObject {
[modelProvider]: { ...EXTERNAL_CODEX_PROVIDERS[modelProvider] },
};
} else if (modelProvider === "amazon-bedrock") {
- const providers = config["model_providers"];
+ const providers = resolved["model_providers"];
const provider = isRecord(providers) ? providers[modelProvider] : undefined;
const aws = isRecord(provider) ? provider["aws"] : undefined;
if (isRecord(aws)) {
diff --git a/sdk/typescript/tests-ts/api-preflight-config.test.ts b/sdk/typescript/tests-ts/api-preflight-config.test.ts
index 57f5cf5af..7d1d19392 100644
--- a/sdk/typescript/tests-ts/api-preflight-config.test.ts
+++ b/sdk/typescript/tests-ts/api-preflight-config.test.ts
@@ -640,21 +640,14 @@ describe("CodexSecurity preflight configuration", () => {
},
);
- test("preserves safe Bedrock provider settings in profile-selected scan recipes", () => {
- const config = scanPreflightCodexConfig({
- model_provider: "openai",
- profile: "bedrock",
- profiles: {
- bedrock: {
- model: "openai.gpt-5.6-luna",
- model_provider: "amazon-bedrock",
- },
- },
- model_providers: {
+ test.each(["root", "profile", "merged"] as const)(
+ "preserves safe Bedrock provider settings from %s in scan recipes",
+ (source) => {
+ const providers = {
"amazon-bedrock": {
aws: {
region: "us-east-2",
- profile: "security-prod",
+ profile: "scan-profile",
access_key_id: "synthetic-aws-access-key",
secret_access_key: "synthetic-aws-secret-key",
session_token: "synthetic-aws-session-token",
@@ -663,25 +656,46 @@ describe("CodexSecurity preflight configuration", () => {
api_key: "synthetic-provider-key",
},
openrouter: { api_key: "synthetic-unrelated-key" },
- },
- });
+ };
+ const selectedProviders = structuredClone(providers);
+ if (source === "merged") {
+ providers["amazon-bedrock"].aws.region = "us-west-2";
+ delete (selectedProviders["amazon-bedrock"].aws as JsonObject)[
+ "profile"
+ ];
+ }
+ const config = scanPreflightCodexConfig({
+ model_provider: "openai",
+ profile: "bedrock",
+ profiles: {
+ bedrock: {
+ model: "openai.gpt-5.6-luna",
+ model_provider: "amazon-bedrock",
+ ...(source === "root"
+ ? {}
+ : { model_providers: selectedProviders }),
+ },
+ },
+ ...(source === "profile" ? {} : { model_providers: providers }),
+ });
- expect(config).toEqual({
- model_provider: "openai",
- profile: "bedrock",
- profiles: {
- bedrock: {
- model: "openai.gpt-5.6-luna",
- model_provider: "amazon-bedrock",
+ expect(config).toEqual({
+ model_provider: "openai",
+ profile: "bedrock",
+ profiles: {
+ bedrock: {
+ model: "openai.gpt-5.6-luna",
+ model_provider: "amazon-bedrock",
+ },
},
- },
- model_providers: {
- "amazon-bedrock": {
- aws: { region: "us-east-2", profile: "security-prod" },
+ model_providers: {
+ "amazon-bedrock": {
+ aws: { region: "us-east-2", profile: "scan-profile" },
+ },
},
- },
- });
- expect(scanModelProvider(config)).toBe("amazon-bedrock");
- expect(JSON.stringify(config)).not.toContain("synthetic-");
- });
+ });
+ expect(scanModelProvider(config)).toBe("amazon-bedrock");
+ expect(JSON.stringify(config)).not.toContain("synthetic-");
+ },
+ );
});
diff --git a/sdk/typescript/tests-ts/scan-recipe.test.ts b/sdk/typescript/tests-ts/scan-recipe.test.ts
index 41ff9c2fe..8ebca1172 100644
--- a/sdk/typescript/tests-ts/scan-recipe.test.ts
+++ b/sdk/typescript/tests-ts/scan-recipe.test.ts
@@ -29,6 +29,11 @@ test.each(
model_provider: "amazon-bedrock",
features: { goals: false },
};
+ const selectedProviders = {
+ "amazon-bedrock": {
+ aws: { region: "us-east-2", profile: "scan-profile" },
+ },
+ };
const root = await temporaryDirectory();
const repository = join(root, "repository");
const codexHome = join(root, "state", "codex-home");
@@ -79,8 +84,18 @@ test.each(
model: "synthetic-root-model",
model_reasoning_effort: "low",
model_provider: "openai",
+ model_providers: {
+ "amazon-bedrock": {
+ aws: { region: "us-west-2", profile: "ambient-profile" },
+ },
+ },
profile,
- profiles: { [profile]: selected },
+ profiles: {
+ [profile]: {
+ ...selected,
+ model_providers: selectedProviders,
+ },
+ },
},
},
{
@@ -111,7 +126,11 @@ test.each(
"--scan-id",
scans[0]!.scanId,
]);
- expect(saved["recipe"]).toMatchObject({ mode, postScanPrompt });
+ expect(saved["recipe"]).toMatchObject({
+ mode,
+ postScanPrompt,
+ config: { model_providers: selectedProviders },
+ });
expect(JSON.stringify(saved)).not.toContain(promptFile);
expect(JSON.stringify(saved)).not.toContain("synthetic-launch-key");
expect(JSON.stringify(saved)).not.toContain("synthetic-bedrock-key");
@@ -121,9 +140,10 @@ test.each(
environment,
currentDirectory: root,
onConfig: ({ codexOverrides }) => {
- expect(resolveCodexProfile(codexOverrides!)).toMatchObject(
- selected,
- );
+ expect(resolveCodexProfile(codexOverrides!)).toMatchObject({
+ ...selected,
+ model_providers: selectedProviders,
+ });
},
}),
runWorkbench: command,