@openai/codex-security 0.1.6 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -0
- package/_bundled_plugin/.mcp.json +16 -0
- package/dist/api.d.ts +4 -0
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +55 -18
- package/dist/api.js.map +1 -1
- package/dist/cli.d.ts +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +31 -12
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +18 -10
- package/dist/config.js.map +1 -1
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +4 -1
- package/dist/cost.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -128,6 +128,10 @@ npx @openai/codex-security scan . --provider openrouter --model anthropic/claude
|
|
|
128
128
|
|
|
129
129
|
export FIREWORKS_API_KEY="<your-fireworks-api-key>"
|
|
130
130
|
npx @openai/codex-security scan . --provider fireworks --model accounts/fireworks/models/qwen3-235b-a22b
|
|
131
|
+
|
|
132
|
+
export AWS_BEARER_TOKEN_BEDROCK="<your-bedrock-api-key>"
|
|
133
|
+
export AWS_REGION="us-east-2"
|
|
134
|
+
npx @openai/codex-security scan . --provider amazon-bedrock --model openai.gpt-5.6-luna
|
|
131
135
|
```
|
|
132
136
|
|
|
133
137
|
On Windows, set the API key in PowerShell:
|
|
@@ -429,6 +433,12 @@ Use `--provider openrouter` to send inference through OpenRouter. Set
|
|
|
429
433
|
Use `--provider fireworks` to send inference through Fireworks AI. Set
|
|
430
434
|
`FIREWORKS_API_KEY` and specify a supported model with `--model`.
|
|
431
435
|
|
|
436
|
+
Use `--provider amazon-bedrock` to send inference through Amazon Bedrock. Set
|
|
437
|
+
`AWS_REGION` and authenticate with `AWS_BEARER_TOKEN_BEDROCK`, standard AWS
|
|
438
|
+
access keys, an AWS profile, web identity, container credentials, or the
|
|
439
|
+
default AWS credential chain. Specify a supported Bedrock model with `--model`;
|
|
440
|
+
OpenAI Bedrock models such as `openai.gpt-5.6-luna` support `--max-cost`.
|
|
441
|
+
|
|
432
442
|
Scan progress identifies the requested paths and reports actual ranking,
|
|
433
443
|
file-review, validation, and attack-path phases as they become available.
|
|
434
444
|
Interactive terminals show a full-screen view; CI, redirected output, and
|
|
@@ -9,6 +9,22 @@
|
|
|
9
9
|
"CODEX_SQLITE_HOME",
|
|
10
10
|
"CODEX_API_KEY",
|
|
11
11
|
"CODEX_CLI_PATH",
|
|
12
|
+
"AWS_BEARER_TOKEN_BEDROCK",
|
|
13
|
+
"AWS_ACCESS_KEY_ID",
|
|
14
|
+
"AWS_SECRET_ACCESS_KEY",
|
|
15
|
+
"AWS_SESSION_TOKEN",
|
|
16
|
+
"AWS_PROFILE",
|
|
17
|
+
"AWS_REGION",
|
|
18
|
+
"AWS_DEFAULT_REGION",
|
|
19
|
+
"AWS_CONFIG_FILE",
|
|
20
|
+
"AWS_SHARED_CREDENTIALS_FILE",
|
|
21
|
+
"AWS_ROLE_ARN",
|
|
22
|
+
"AWS_ROLE_SESSION_NAME",
|
|
23
|
+
"AWS_WEB_IDENTITY_TOKEN_FILE",
|
|
24
|
+
"AWS_CONTAINER_CREDENTIALS_RELATIVE_URI",
|
|
25
|
+
"AWS_CONTAINER_CREDENTIALS_FULL_URI",
|
|
26
|
+
"AWS_CONTAINER_AUTHORIZATION_TOKEN",
|
|
27
|
+
"AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE",
|
|
12
28
|
"PYTHON",
|
|
13
29
|
"CODEX_SECURITY_KNOWLEDGE_BASE",
|
|
14
30
|
"CODEX_SECURITY_SCAN_ROOT",
|
package/dist/api.d.ts
CHANGED
|
@@ -61,6 +61,10 @@ export type ScanAuthentication = {
|
|
|
61
61
|
method: "stored_credentials";
|
|
62
62
|
credentialType?: "api_key" | "chatgpt";
|
|
63
63
|
verified: false;
|
|
64
|
+
} | {
|
|
65
|
+
method: "aws_credentials";
|
|
66
|
+
source: "AWS_BEARER_TOKEN_BEDROCK" | "AWS_ACCESS_KEY_ID" | "AWS_PROFILE" | "AWS_WEB_IDENTITY_TOKEN_FILE" | "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI" | "AWS_CONTAINER_CREDENTIALS_FULL_URI" | "default_credential_chain";
|
|
67
|
+
verified: false;
|
|
64
68
|
};
|
|
65
69
|
export type ScanTrustedAccessStatus = "granted" | "not_granted" | "unknown";
|
|
66
70
|
export interface ScanReconnectDetails {
|
package/dist/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";AAoBA,OAAO,EAEL,gBAAgB,EAGhB,KAAK,aAAa,EACnB,MAAM,WAAW,CAAC;AACnB,OAAO,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
|
package/dist/api.js
CHANGED
|
@@ -6,7 +6,7 @@ import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
|
|
|
6
6
|
import { Codex } from "@openai/codex-sdk";
|
|
7
7
|
import { parse as parseToml, stringify as stringifyToml, } from "smol-toml";
|
|
8
8
|
import { accountStatus, CodexLoginHandle, loginApiKey as persistApiKey, logout as codexLogout, } from "./auth.js";
|
|
9
|
-
import { EXTERNAL_CODEX_PROVIDERS, isExternalModelProvider, mergedCodexConfig, scanModelConfiguration, writeCodexConfig, } from "./config.js";
|
|
9
|
+
import { EXTERNAL_CODEX_PROVIDERS, isExternalModelProvider, mergedCodexConfig, scanModelConfiguration, scanModelProvider, writeCodexConfig, } from "./config.js";
|
|
10
10
|
import { estimateScanCost, ScanCostTracker } from "./cost.js";
|
|
11
11
|
import { loadContract, requireScanFile, } from "./contract.js";
|
|
12
12
|
import { AuthenticationRequiredError, CodexSecurityError, IncompleteScanError, OutputDirectoryError, OutputInsideProtectedRootError, redactedErrorMessage, ScanCostLimitExceededError, ScanInterruptedError, } from "./errors.js";
|
|
@@ -60,6 +60,7 @@ export class CodexSecurity {
|
|
|
60
60
|
requireOutputOutsideRepository(inputs.protectedRoot, await realpath(tmpdir()), "temporary");
|
|
61
61
|
const configuration = await mergedCodexConfig(this.config);
|
|
62
62
|
const model = scanModelConfiguration(configuration);
|
|
63
|
+
const modelProvider = scanModelProvider(configuration);
|
|
63
64
|
validateScanCostLimit(options.maxCostUsd, model.model);
|
|
64
65
|
const archiveDir = options.archiveExisting === true
|
|
65
66
|
? await planOutputArchive(inputs.outputDir)
|
|
@@ -75,11 +76,9 @@ export class CodexSecurity {
|
|
|
75
76
|
: {}),
|
|
76
77
|
outputDir: inputs.outputDir,
|
|
77
78
|
...(archiveDir === null ? {} : { archiveDir }),
|
|
78
|
-
authentication: scanAuthentication(this.#dependencies.environment, options.auth,
|
|
79
|
+
authentication: scanAuthentication(this.#dependencies.environment, options.auth, modelProvider),
|
|
79
80
|
...model,
|
|
80
|
-
...(typeof
|
|
81
|
-
? { modelProvider: configuration["model_provider"] }
|
|
82
|
-
: {}),
|
|
81
|
+
...(typeof modelProvider === "string" ? { modelProvider } : {}),
|
|
83
82
|
...(options.maxCostUsd === undefined
|
|
84
83
|
? {}
|
|
85
84
|
: { maxCostUsd: options.maxCostUsd }),
|
|
@@ -129,7 +128,7 @@ export class CodexSecurity {
|
|
|
129
128
|
}
|
|
130
129
|
checkOpen();
|
|
131
130
|
const requestedConfig = await mergedCodexConfig(this.config);
|
|
132
|
-
const modelProvider = requestedConfig
|
|
131
|
+
const modelProvider = scanModelProvider(requestedConfig);
|
|
133
132
|
const externalProvider = isExternalModelProvider(modelProvider)
|
|
134
133
|
? EXTERNAL_CODEX_PROVIDERS[modelProvider]
|
|
135
134
|
: null;
|
|
@@ -187,7 +186,9 @@ export class CodexSecurity {
|
|
|
187
186
|
? "stored_credentials"
|
|
188
187
|
: null;
|
|
189
188
|
}
|
|
190
|
-
if (!runtime.credentialsAvailable &&
|
|
189
|
+
if (!runtime.credentialsAvailable &&
|
|
190
|
+
apiKey === null &&
|
|
191
|
+
authentication.method !== "aws_credentials") {
|
|
191
192
|
throw new AuthenticationRequiredError("No credentials were found. Run 'codex-security login', use " +
|
|
192
193
|
"'codex-security login --device-auth' on a remote or headless machine, or set " +
|
|
193
194
|
"OPENAI_API_KEY or CODEX_API_KEY for CI.");
|
|
@@ -829,7 +830,8 @@ export class CodexSecurity {
|
|
|
829
830
|
environment: withoutCodexHome(processEnvironment),
|
|
830
831
|
signal,
|
|
831
832
|
});
|
|
832
|
-
const credentialsAvailable = isExternalModelProvider(modelProvider)
|
|
833
|
+
const credentialsAvailable = isExternalModelProvider(modelProvider) ||
|
|
834
|
+
modelProvider === "amazon-bedrock"
|
|
833
835
|
? false
|
|
834
836
|
: await initialCredentialsAvailable(processEnvironment, ambientHome, codexHome);
|
|
835
837
|
return {
|
|
@@ -1268,6 +1270,22 @@ async function collectResult(turnResult, threadId, scanDir, pluginRoot, expectat
|
|
|
1268
1270
|
});
|
|
1269
1271
|
}
|
|
1270
1272
|
export function scanAuthentication(environment, auth = "auto", modelProvider) {
|
|
1273
|
+
if (modelProvider === "amazon-bedrock") {
|
|
1274
|
+
const sources = [
|
|
1275
|
+
"AWS_BEARER_TOKEN_BEDROCK",
|
|
1276
|
+
"AWS_ACCESS_KEY_ID",
|
|
1277
|
+
"AWS_PROFILE",
|
|
1278
|
+
"AWS_WEB_IDENTITY_TOKEN_FILE",
|
|
1279
|
+
"AWS_CONTAINER_CREDENTIALS_RELATIVE_URI",
|
|
1280
|
+
"AWS_CONTAINER_CREDENTIALS_FULL_URI",
|
|
1281
|
+
];
|
|
1282
|
+
const source = sources.find((name) => environmentValue(environment, name));
|
|
1283
|
+
return {
|
|
1284
|
+
method: "aws_credentials",
|
|
1285
|
+
source: source ?? "default_credential_chain",
|
|
1286
|
+
verified: false,
|
|
1287
|
+
};
|
|
1288
|
+
}
|
|
1271
1289
|
if (auth === "chatgpt" && !isExternalModelProvider(modelProvider)) {
|
|
1272
1290
|
return { method: "stored_credentials", verified: false };
|
|
1273
1291
|
}
|
|
@@ -1307,16 +1325,17 @@ function selectedScanEnvironment(environment, auth = "auto", modelProvider) {
|
|
|
1307
1325
|
const selectedProviderKey = isExternalModelProvider(modelProvider)
|
|
1308
1326
|
? EXTERNAL_CODEX_PROVIDERS[modelProvider].env_key
|
|
1309
1327
|
: null;
|
|
1310
|
-
|
|
1328
|
+
const bedrockProvider = modelProvider === "amazon-bedrock";
|
|
1329
|
+
if (auth !== "chatgpt" && selectedProviderKey === null && !bedrockProvider) {
|
|
1311
1330
|
return environment;
|
|
1331
|
+
}
|
|
1312
1332
|
return Object.fromEntries(Object.entries(environment).filter(([name]) => {
|
|
1313
1333
|
const key = name.toUpperCase();
|
|
1314
1334
|
if (key === "OPENAI_API_KEY" || key === "CODEX_API_KEY")
|
|
1315
1335
|
return false;
|
|
1316
|
-
if (selectedProviderKey === null)
|
|
1317
|
-
return true;
|
|
1318
1336
|
if (key === "OPENROUTER_API_KEY" || key === "FIREWORKS_API_KEY") {
|
|
1319
|
-
return
|
|
1337
|
+
return (!bedrockProvider &&
|
|
1338
|
+
(selectedProviderKey === null || key === selectedProviderKey));
|
|
1320
1339
|
}
|
|
1321
1340
|
return true;
|
|
1322
1341
|
}));
|
|
@@ -1518,12 +1537,6 @@ export function scanPreflightCodexConfig(config, activeProjectPath) {
|
|
|
1518
1537
|
];
|
|
1519
1538
|
};
|
|
1520
1539
|
const result = executionConfig(config);
|
|
1521
|
-
const modelProvider = result["model_provider"];
|
|
1522
|
-
if (isExternalModelProvider(modelProvider)) {
|
|
1523
|
-
result["model_providers"] = {
|
|
1524
|
-
[modelProvider]: { ...EXTERNAL_CODEX_PROVIDERS[modelProvider] },
|
|
1525
|
-
};
|
|
1526
|
-
}
|
|
1527
1540
|
const selectedProfile = safeProfileName(config["profile"])
|
|
1528
1541
|
? config["profile"]
|
|
1529
1542
|
: undefined;
|
|
@@ -1548,6 +1561,30 @@ export function scanPreflightCodexConfig(config, activeProjectPath) {
|
|
|
1548
1561
|
if (Object.keys(sanitized).length > 0)
|
|
1549
1562
|
result["profiles"] = sanitized;
|
|
1550
1563
|
}
|
|
1564
|
+
const modelProvider = scanModelProvider(result);
|
|
1565
|
+
if (isExternalModelProvider(modelProvider)) {
|
|
1566
|
+
result["model_providers"] = {
|
|
1567
|
+
[modelProvider]: { ...EXTERNAL_CODEX_PROVIDERS[modelProvider] },
|
|
1568
|
+
};
|
|
1569
|
+
}
|
|
1570
|
+
else if (modelProvider === "amazon-bedrock") {
|
|
1571
|
+
const providers = config["model_providers"];
|
|
1572
|
+
const provider = isRecord(providers) ? providers[modelProvider] : undefined;
|
|
1573
|
+
const aws = isRecord(provider) ? provider["aws"] : undefined;
|
|
1574
|
+
if (isRecord(aws)) {
|
|
1575
|
+
const sanitized = {};
|
|
1576
|
+
for (const key of ["region", "profile"]) {
|
|
1577
|
+
const value = aws[key];
|
|
1578
|
+
if (safeString(value, 512))
|
|
1579
|
+
sanitized[key] = value;
|
|
1580
|
+
}
|
|
1581
|
+
if (Object.keys(sanitized).length > 0) {
|
|
1582
|
+
result["model_providers"] = {
|
|
1583
|
+
[modelProvider]: { aws: sanitized },
|
|
1584
|
+
};
|
|
1585
|
+
}
|
|
1586
|
+
}
|
|
1587
|
+
}
|
|
1551
1588
|
const rootMarkers = config["project_root_markers"];
|
|
1552
1589
|
if (Array.isArray(rootMarkers)) {
|
|
1553
1590
|
result["project_root_markers"] = rootMarkers
|