@openai/codex-security 0.1.10 → 0.1.12
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 +72 -41
- package/_bundled_plugin/.codex-plugin/plugin.json +1 -1
- package/_bundled_plugin/.mcp.json +5 -1
- package/_bundled_plugin/examples/completed-scan/coverage.json +1 -1
- package/_bundled_plugin/examples/completed-scan/scan-manifest.json +2 -2
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/preflight/capability-profiles.toml +1 -34
- package/_bundled_plugin/references/config-preflight.md +11 -13
- package/_bundled_plugin/references/core-scan.md +94 -0
- package/_bundled_plugin/references/final-report.md +6 -6
- package/_bundled_plugin/references/scan-artifacts.md +15 -14
- package/_bundled_plugin/references/scan-prologue.md +27 -0
- package/_bundled_plugin/schemas/tools/deep-reducer.schema.json +1 -106
- package/_bundled_plugin/scripts/config_preflight.py +40 -3
- package/_bundled_plugin/scripts/deep_scan_config.py +29 -6
- package/_bundled_plugin/scripts/deep_scan_workbench.py +132 -34
- package/_bundled_plugin/scripts/finalize_scan_contract.py +44 -224
- package/_bundled_plugin/scripts/finding_preview.py +122 -6
- package/_bundled_plugin/scripts/generate_in_scope_files.py +77 -31
- package/_bundled_plugin/scripts/generate_rank_input.py +58 -7
- package/_bundled_plugin/scripts/normalize_candidates.py +5 -5
- package/_bundled_plugin/scripts/rank_preview.py +4 -0
- package/_bundled_plugin/scripts/report_projection.py +40 -20
- package/_bundled_plugin/scripts/workbench_cli.py +5 -0
- package/_bundled_plugin/scripts/workbench_db.py +304 -32
- package/_bundled_plugin/scripts/workbench_progress.py +0 -5
- package/_bundled_plugin/scripts/workbench_scan_usage.py +43 -8
- package/_bundled_plugin/scripts/workbench_schema.py +16 -20
- package/_bundled_plugin/scripts/workbench_source_excerpt.py +1 -5
- package/_bundled_plugin/scripts/workbench_target.py +82 -0
- package/_bundled_plugin/skills/attack-path-analysis/SKILL.md +8 -11
- package/_bundled_plugin/skills/deep-security-scan/SKILL.md +24 -108
- package/_bundled_plugin/skills/security-scan/SKILL.md +5 -88
- package/_bundled_plugin/skills/threat-model/SKILL.md +4 -2
- package/_bundled_plugin/skills/track-findings/SKILL.md +1 -1
- package/_bundled_plugin/skills/triage-finding/SKILL.md +5 -6
- package/_bundled_plugin/skills/triage-finding/references/github-rest-intake.md +6 -7
- package/_bundled_plugin/skills/validation/SKILL.md +9 -12
- package/_bundled_plugin/skills/vulnerability-writeup/SKILL.md +3 -2
- package/_bundled_plugin/skills/vulnerability-writeup/references/report-format.md +1 -1
- package/dist/api.d.ts +2 -0
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +393 -145
- package/dist/api.js.map +1 -1
- package/dist/auth.d.ts +2 -3
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +59 -270
- package/dist/auth.js.map +1 -1
- package/dist/bulk-scan-discovery.js +14 -2
- package/dist/bulk-scan-discovery.js.map +1 -1
- package/dist/cli.d.ts +6 -3
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +202 -46
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/contract.js +7 -5
- package/dist/contract.js.map +1 -1
- package/dist/cost.d.ts +1 -0
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +33 -2
- package/dist/cost.js.map +1 -1
- package/dist/knowledge-base.d.ts.map +1 -1
- package/dist/knowledge-base.js +12 -4
- package/dist/knowledge-base.js.map +1 -1
- package/dist/multiscan.d.ts +1 -0
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +77 -17
- package/dist/multiscan.js.map +1 -1
- package/dist/runtime.d.ts +9 -6
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +140 -326
- package/dist/runtime.js.map +1 -1
- package/dist/scan-comparison.js +1 -1
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +5 -1
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +65 -16
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-logs.d.ts +2 -0
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +97 -37
- package/dist/scan-logs.js.map +1 -1
- package/dist/targets.d.ts +1 -0
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +35 -4
- package/dist/targets.js.map +1 -1
- package/dist/trusted-executable.js +1 -1
- package/dist/trusted-executable.js.map +1 -1
- package/dist/version.d.ts +3 -3
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +6 -4
- package/dist/version.js.map +1 -1
- package/package.json +4 -4
- package/_bundled_plugin/references/shared-hard-rules.md +0 -15
- package/_bundled_plugin/scripts/validate_report_format.py +0 -138
- package/_bundled_plugin/skills/security-scan/references/repository-wide-scan.md +0 -33
package/dist/scan-logs.js
CHANGED
|
@@ -1,60 +1,59 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { join } from "node:path";
|
|
1
|
+
import { createReadStream } from "node:fs";
|
|
2
|
+
import { basename, dirname, isAbsolute, join, relative, sep } from "node:path";
|
|
3
|
+
import { createInterface } from "node:readline";
|
|
3
4
|
import { sessionFiles } from "./cost.js";
|
|
4
5
|
import { CodexSecurityError } from "./errors.js";
|
|
5
6
|
export async function readScanLogs(options) {
|
|
6
7
|
const logs = new Map();
|
|
7
8
|
for await (const path of sessionFiles(join(options.codexHome, "sessions"))) {
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
.flatMap((line) => {
|
|
12
|
-
try {
|
|
13
|
-
const event = JSON.parse(line);
|
|
14
|
-
return isRecord(event) ? [event] : [];
|
|
15
|
-
}
|
|
16
|
-
catch {
|
|
17
|
-
return [];
|
|
9
|
+
for await (const first of sessionEvents(path)) {
|
|
10
|
+
if (first["type"] !== "session_meta" || !isRecord(first["payload"])) {
|
|
11
|
+
break;
|
|
18
12
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
13
|
+
const metadata = first["payload"];
|
|
14
|
+
const threadId = metadata["id"];
|
|
15
|
+
if (typeof threadId !== "string")
|
|
16
|
+
break;
|
|
17
|
+
const source = metadata["source"];
|
|
18
|
+
const subagent = isRecord(source) ? source["subagent"] : undefined;
|
|
19
|
+
const spawn = isRecord(subagent) ? subagent["thread_spawn"] : undefined;
|
|
20
|
+
const parent = metadata["parent_thread_id"] ??
|
|
21
|
+
(isRecord(spawn) ? spawn["parent_thread_id"] : undefined);
|
|
22
|
+
const startedAt = typeof metadata["timestamp"] === "string"
|
|
23
|
+
? Date.parse(metadata["timestamp"])
|
|
24
|
+
: Number.NaN;
|
|
25
|
+
logs.set(threadId, {
|
|
26
|
+
threadId,
|
|
27
|
+
parentThreadId: typeof parent === "string" ? parent : null,
|
|
28
|
+
startedAt: Number.isFinite(startedAt) ? startedAt : null,
|
|
29
|
+
workingDirectory: typeof metadata["cwd"] === "string" ? metadata["cwd"] : null,
|
|
30
|
+
path,
|
|
31
|
+
});
|
|
32
|
+
break;
|
|
23
33
|
}
|
|
24
|
-
const metadata = first["payload"];
|
|
25
|
-
const threadId = metadata["id"];
|
|
26
|
-
if (typeof threadId !== "string")
|
|
27
|
-
continue;
|
|
28
|
-
const source = metadata["source"];
|
|
29
|
-
const subagent = isRecord(source) ? source["subagent"] : undefined;
|
|
30
|
-
const spawn = isRecord(subagent) ? subagent["thread_spawn"] : undefined;
|
|
31
|
-
const parent = metadata["parent_thread_id"] ??
|
|
32
|
-
(isRecord(spawn) ? spawn["parent_thread_id"] : undefined);
|
|
33
|
-
logs.set(threadId, {
|
|
34
|
-
threadId,
|
|
35
|
-
parentThreadId: typeof parent === "string" ? parent : null,
|
|
36
|
-
startedAt: typeof metadata["timestamp"] === "string"
|
|
37
|
-
? Math.floor(Date.parse(metadata["timestamp"]) / 1_000)
|
|
38
|
-
: null,
|
|
39
|
-
path,
|
|
40
|
-
events,
|
|
41
|
-
});
|
|
42
34
|
}
|
|
43
35
|
const root = logs.get(options.threadId);
|
|
44
36
|
if (root === undefined) {
|
|
45
37
|
throw new CodexSecurityError(`No saved session logs are available for scan ${options.scanId}.`);
|
|
46
38
|
}
|
|
47
39
|
const sessions = [root];
|
|
40
|
+
const included = new Set([root.threadId]);
|
|
48
41
|
for (const parent of sessions) {
|
|
49
42
|
for (const session of logs.values()) {
|
|
50
|
-
if (session.
|
|
43
|
+
if (!included.has(session.threadId) &&
|
|
44
|
+
(session.parentThreadId === parent.threadId ||
|
|
45
|
+
(parent === root &&
|
|
46
|
+
session.parentThreadId === null &&
|
|
47
|
+
belongsToScan(session, root, options)))) {
|
|
48
|
+
included.add(session.threadId);
|
|
51
49
|
sessions.push(session);
|
|
50
|
+
}
|
|
52
51
|
}
|
|
53
52
|
}
|
|
54
53
|
const events = [];
|
|
55
54
|
for (const session of sessions) {
|
|
56
55
|
let replaying = false;
|
|
57
|
-
for (const event of session.
|
|
56
|
+
for await (const event of sessionEvents(session.path)) {
|
|
58
57
|
const payload = event["payload"];
|
|
59
58
|
if (event["type"] === "session_meta" && isRecord(payload)) {
|
|
60
59
|
replaying = payload["id"] !== session.threadId;
|
|
@@ -65,7 +64,7 @@ export async function readScanLogs(options) {
|
|
|
65
64
|
payload["type"] !== "task_started" ||
|
|
66
65
|
typeof payload["started_at"] !== "number" ||
|
|
67
66
|
session.startedAt === null ||
|
|
68
|
-
payload["started_at"] < session.startedAt) {
|
|
67
|
+
payload["started_at"] < Math.floor(session.startedAt / 1_000)) {
|
|
69
68
|
continue;
|
|
70
69
|
}
|
|
71
70
|
replaying = false;
|
|
@@ -84,6 +83,67 @@ export async function readScanLogs(options) {
|
|
|
84
83
|
events,
|
|
85
84
|
};
|
|
86
85
|
}
|
|
86
|
+
function belongsToScan(session, root, options) {
|
|
87
|
+
const { scanDirectory, completedAt } = options;
|
|
88
|
+
if (scanDirectory === undefined ||
|
|
89
|
+
session.workingDirectory === null ||
|
|
90
|
+
root.startedAt === null ||
|
|
91
|
+
session.startedAt === null ||
|
|
92
|
+
session.startedAt < root.startedAt) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
if (completedAt !== undefined && completedAt !== null) {
|
|
96
|
+
const completed = Date.parse(completedAt);
|
|
97
|
+
if (!Number.isFinite(completed) || session.startedAt >= completed) {
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
const roots = [scanDirectory];
|
|
102
|
+
const name = basename(scanDirectory);
|
|
103
|
+
const marker = name.lastIndexOf(".previous-");
|
|
104
|
+
if (marker > 0 &&
|
|
105
|
+
root.workingDirectory !== null &&
|
|
106
|
+
relative(join(dirname(scanDirectory), name.slice(0, marker)), root.workingDirectory) === "") {
|
|
107
|
+
roots.push(root.workingDirectory);
|
|
108
|
+
}
|
|
109
|
+
for (const directoryRoot of roots) {
|
|
110
|
+
const artifacts = join(directoryRoot, "artifacts");
|
|
111
|
+
if (relative(artifacts, session.workingDirectory) === "")
|
|
112
|
+
return true;
|
|
113
|
+
const workers = join(artifacts, "deep_discovery", "workers");
|
|
114
|
+
const directory = relative(workers, session.workingDirectory);
|
|
115
|
+
const components = directory.split(sep);
|
|
116
|
+
if (!isAbsolute(directory) &&
|
|
117
|
+
components.length === 2 &&
|
|
118
|
+
components[0] !== ".." &&
|
|
119
|
+
relative(join(workers, components[0], "output"), session.workingDirectory) === "") {
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
async function* sessionEvents(path) {
|
|
126
|
+
const stream = createReadStream(path, { encoding: "utf8" });
|
|
127
|
+
const lines = createInterface({ input: stream, crlfDelay: Infinity });
|
|
128
|
+
try {
|
|
129
|
+
for await (const line of lines) {
|
|
130
|
+
if (line.trim() === "")
|
|
131
|
+
continue;
|
|
132
|
+
try {
|
|
133
|
+
const event = JSON.parse(line);
|
|
134
|
+
if (isRecord(event))
|
|
135
|
+
yield event;
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
finally {
|
|
143
|
+
lines.close();
|
|
144
|
+
stream.destroy();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
87
147
|
function isRecord(value) {
|
|
88
148
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
89
149
|
}
|
package/dist/scan-logs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-logs.js","sourceRoot":"","sources":["../src/scan-logs.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { sessionFiles } from \"./cost.js\";\nimport { CodexSecurityError } from \"./errors.js\";\n\ninterface ScanLogOptions {\n scanId: string;\n threadId: string;\n codexHome: string;\n}\n\ninterface SessionLog {\n threadId: string;\n parentThreadId: string | null;\n startedAt: number | null;\n path: string;\n events: Record<string, unknown>[];\n}\n\nexport async function readScanLogs(options: ScanLogOptions) {\n const logs = new Map<string, SessionLog>();\n for await (const path of sessionFiles(join(options.codexHome, \"sessions\"))) {\n const events = (await readFile(path, \"utf8\"))\n .split(\"\\n\")\n .filter((line) => line.trim() !== \"\")\n .flatMap((line) => {\n try {\n const event: unknown = JSON.parse(line);\n return isRecord(event) ? [event] : [];\n } catch {\n return [];\n }\n });\n const first = events[0];\n if (first?.[\"type\"] !== \"session_meta\" || !isRecord(first[\"payload\"])) {\n continue;\n }\n const metadata = first[\"payload\"];\n const threadId = metadata[\"id\"];\n if (typeof threadId !== \"string\") continue;\n const source = metadata[\"source\"];\n const subagent = isRecord(source) ? source[\"subagent\"] : undefined;\n const spawn = isRecord(subagent) ? subagent[\"thread_spawn\"] : undefined;\n const parent =\n metadata[\"parent_thread_id\"] ??\n (isRecord(spawn) ? spawn[\"parent_thread_id\"] : undefined);\n logs.set(threadId, {\n threadId,\n parentThreadId: typeof parent === \"string\" ? parent : null,\n startedAt:\n typeof metadata[\"timestamp\"] === \"string\"\n ? Math.floor(Date.parse(metadata[\"timestamp\"]) / 1_000)\n : null,\n path,\n events,\n });\n }\n\n const root = logs.get(options.threadId);\n if (root === undefined) {\n throw new CodexSecurityError(\n `No saved session logs are available for scan ${options.scanId}.`,\n );\n }\n\n const sessions = [root];\n for (const parent of sessions) {\n for (const session of logs.values()) {\n if (session.parentThreadId === parent.threadId) sessions.push(session);\n }\n }\n const events: Record<string, unknown>[] = [];\n for (const session of sessions) {\n let replaying = false;\n for (const event of session.events) {\n const payload = event[\"payload\"];\n if (event[\"type\"] === \"session_meta\" && isRecord(payload)) {\n replaying = payload[\"id\"] !== session.threadId;\n }\n if (replaying) {\n if (\n event[\"type\"] !== \"event_msg\" ||\n !isRecord(payload) ||\n payload[\"type\"] !== \"task_started\" ||\n typeof payload[\"started_at\"] !== \"number\" ||\n session.startedAt === null ||\n payload[\"started_at\"] < session.startedAt\n ) {\n continue;\n }\n replaying = false;\n }\n events.push({ threadId: session.threadId, event });\n }\n }\n\n return {\n scanId: options.scanId,\n threadId: root.threadId,\n sessions: sessions.map(({ threadId, parentThreadId, path }) => ({\n threadId,\n parentThreadId,\n path,\n })),\n events,\n };\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}
|
|
1
|
+
{"version":3,"file":"scan-logs.js","sourceRoot":"","sources":["../src/scan-logs.ts"],"names":[],"mappings":"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","sourcesContent":["import { createReadStream } from \"node:fs\";\nimport { basename, dirname, isAbsolute, join, relative, sep } from \"node:path\";\nimport { createInterface } from \"node:readline\";\nimport { sessionFiles } from \"./cost.js\";\nimport { CodexSecurityError } from \"./errors.js\";\n\ninterface ScanLogOptions {\n scanId: string;\n threadId: string;\n codexHome: string;\n scanDirectory?: string;\n completedAt?: string | null;\n}\n\ninterface SessionLog {\n threadId: string;\n parentThreadId: string | null;\n startedAt: number | null;\n workingDirectory: string | null;\n path: string;\n}\n\nexport async function readScanLogs(options: ScanLogOptions) {\n const logs = new Map<string, SessionLog>();\n for await (const path of sessionFiles(join(options.codexHome, \"sessions\"))) {\n for await (const first of sessionEvents(path)) {\n if (first[\"type\"] !== \"session_meta\" || !isRecord(first[\"payload\"])) {\n break;\n }\n const metadata = first[\"payload\"];\n const threadId = metadata[\"id\"];\n if (typeof threadId !== \"string\") break;\n const source = metadata[\"source\"];\n const subagent = isRecord(source) ? source[\"subagent\"] : undefined;\n const spawn = isRecord(subagent) ? subagent[\"thread_spawn\"] : undefined;\n const parent =\n metadata[\"parent_thread_id\"] ??\n (isRecord(spawn) ? spawn[\"parent_thread_id\"] : undefined);\n const startedAt =\n typeof metadata[\"timestamp\"] === \"string\"\n ? Date.parse(metadata[\"timestamp\"])\n : Number.NaN;\n logs.set(threadId, {\n threadId,\n parentThreadId: typeof parent === \"string\" ? parent : null,\n startedAt: Number.isFinite(startedAt) ? startedAt : null,\n workingDirectory:\n typeof metadata[\"cwd\"] === \"string\" ? metadata[\"cwd\"] : null,\n path,\n });\n break;\n }\n }\n\n const root = logs.get(options.threadId);\n if (root === undefined) {\n throw new CodexSecurityError(\n `No saved session logs are available for scan ${options.scanId}.`,\n );\n }\n\n const sessions = [root];\n const included = new Set([root.threadId]);\n for (const parent of sessions) {\n for (const session of logs.values()) {\n if (\n !included.has(session.threadId) &&\n (session.parentThreadId === parent.threadId ||\n (parent === root &&\n session.parentThreadId === null &&\n belongsToScan(session, root, options)))\n ) {\n included.add(session.threadId);\n sessions.push(session);\n }\n }\n }\n const events: Record<string, unknown>[] = [];\n for (const session of sessions) {\n let replaying = false;\n for await (const event of sessionEvents(session.path)) {\n const payload = event[\"payload\"];\n if (event[\"type\"] === \"session_meta\" && isRecord(payload)) {\n replaying = payload[\"id\"] !== session.threadId;\n }\n if (replaying) {\n if (\n event[\"type\"] !== \"event_msg\" ||\n !isRecord(payload) ||\n payload[\"type\"] !== \"task_started\" ||\n typeof payload[\"started_at\"] !== \"number\" ||\n session.startedAt === null ||\n payload[\"started_at\"] < Math.floor(session.startedAt / 1_000)\n ) {\n continue;\n }\n replaying = false;\n }\n events.push({ threadId: session.threadId, event });\n }\n }\n\n return {\n scanId: options.scanId,\n threadId: root.threadId,\n sessions: sessions.map(({ threadId, parentThreadId, path }) => ({\n threadId,\n parentThreadId,\n path,\n })),\n events,\n };\n}\n\nfunction belongsToScan(\n session: SessionLog,\n root: SessionLog,\n options: ScanLogOptions,\n): boolean {\n const { scanDirectory, completedAt } = options;\n if (\n scanDirectory === undefined ||\n session.workingDirectory === null ||\n root.startedAt === null ||\n session.startedAt === null ||\n session.startedAt < root.startedAt\n ) {\n return false;\n }\n if (completedAt !== undefined && completedAt !== null) {\n const completed = Date.parse(completedAt);\n if (!Number.isFinite(completed) || session.startedAt >= completed) {\n return false;\n }\n }\n\n const roots = [scanDirectory];\n const name = basename(scanDirectory);\n const marker = name.lastIndexOf(\".previous-\");\n if (\n marker > 0 &&\n root.workingDirectory !== null &&\n relative(\n join(dirname(scanDirectory), name.slice(0, marker)),\n root.workingDirectory,\n ) === \"\"\n ) {\n roots.push(root.workingDirectory);\n }\n\n for (const directoryRoot of roots) {\n const artifacts = join(directoryRoot, \"artifacts\");\n if (relative(artifacts, session.workingDirectory) === \"\") return true;\n const workers = join(artifacts, \"deep_discovery\", \"workers\");\n const directory = relative(workers, session.workingDirectory);\n const components = directory.split(sep);\n if (\n !isAbsolute(directory) &&\n components.length === 2 &&\n components[0] !== \"..\" &&\n relative(\n join(workers, components[0]!, \"output\"),\n session.workingDirectory,\n ) === \"\"\n ) {\n return true;\n }\n }\n return false;\n}\n\nasync function* sessionEvents(\n path: string,\n): AsyncGenerator<Record<string, unknown>> {\n const stream = createReadStream(path, { encoding: \"utf8\" });\n const lines = createInterface({ input: stream, crlfDelay: Infinity });\n try {\n for await (const line of lines) {\n if (line.trim() === \"\") continue;\n try {\n const event: unknown = JSON.parse(line);\n if (isRecord(event)) yield event;\n } catch {\n continue;\n }\n }\n } finally {\n lines.close();\n stream.destroy();\n }\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === \"object\" && value !== null && !Array.isArray(value);\n}\n"]}
|
package/dist/targets.d.ts
CHANGED
|
@@ -34,6 +34,7 @@ export declare function resolveRepositoryPath(repository: string): string;
|
|
|
34
34
|
export declare function enclosingGitWorktreeRoot(repository: string, signal?: AbortSignal): Promise<string | null>;
|
|
35
35
|
export declare function validatedGitEnvironment(environment?: Readonly<Record<string, string | undefined>>): void;
|
|
36
36
|
export declare function normalizeTarget(repository: string, target: ScanTarget, signal?: AbortSignal): Promise<NormalizedTarget>;
|
|
37
|
+
export declare function validateCommittedDiffCheckout(repository: string, target: NormalizedTarget, signal?: AbortSignal): Promise<void>;
|
|
37
38
|
export declare function validateMode(target: NormalizedTarget, mode: ScanMode): void;
|
|
38
39
|
export declare function repositoryRevision(repository: string, signal?: AbortSignal): Promise<string | null>;
|
|
39
40
|
//# sourceMappingURL=targets.d.ts.map
|
package/dist/targets.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"AA+BA,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,MAAM,CAAC;AAC3C,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,cAAc,CAAC;AAErD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,UAAU;;IAErB,SAAgB,IAAI,EAAE,cAAc,CAAC;IACrC,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B,SAAgB,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEX,OAAO,EAAE,iBAAiB;WA6B/B,IAAI,CAAC,EACjB,IAAI,EACJ,IAAa,GACd,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,UAAU;WAIA,WAAW,CAAC,EACxB,IAAa,GACd,GAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,UAAU;CAGvC;AAED,MAAM,MAAM,UAAU,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,MAAM,EAAE,CAAC;AACvE,MAAM,MAAM,oBAAoB,GAC5B,YAAY,GACZ,OAAO,GACP,MAAM,GACN,cAAc,CAAC;AAEnB,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,oBAAoB,CAAC;IAC3B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CAkBjB;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAYxB;AAED,wBAAgB,uBAAuB,CACrC,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GACtE,IAAI,CAYN;AAED,wBAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAgH3B;AAED,wBAAsB,6BAA6B,CACjD,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAY3E;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAWxB"}
|
package/dist/targets.js
CHANGED
|
@@ -16,6 +16,17 @@ const UNSUPPORTED_GIT_ENVIRONMENT = new Set([
|
|
|
16
16
|
"GIT_COMMON_DIR",
|
|
17
17
|
"GIT_REPLACE_REF_BASE",
|
|
18
18
|
]);
|
|
19
|
+
const GIT_REPOSITORY_ENVIRONMENT = new Set([
|
|
20
|
+
...UNSUPPORTED_GIT_ENVIRONMENT,
|
|
21
|
+
"GIT_CEILING_DIRECTORIES",
|
|
22
|
+
"GIT_DISCOVERY_ACROSS_FILESYSTEM",
|
|
23
|
+
"GIT_GRAFT_FILE",
|
|
24
|
+
"GIT_IMPLICIT_WORK_TREE",
|
|
25
|
+
"GIT_NAMESPACE",
|
|
26
|
+
"GIT_NO_REPLACE_OBJECTS",
|
|
27
|
+
"GIT_PREFIX",
|
|
28
|
+
"GIT_SHALLOW_FILE",
|
|
29
|
+
]);
|
|
19
30
|
export class DiffTarget {
|
|
20
31
|
#brand = "DiffTarget";
|
|
21
32
|
kind;
|
|
@@ -175,6 +186,22 @@ export async function normalizeTarget(repository, target, signal) {
|
|
|
175
186
|
}
|
|
176
187
|
return { kind: "paths", paths };
|
|
177
188
|
}
|
|
189
|
+
export async function validateCommittedDiffCheckout(repository, target, signal) {
|
|
190
|
+
if (target.kind !== "refs")
|
|
191
|
+
return;
|
|
192
|
+
const checkoutHead = await resolveGitRef(repository, "HEAD", signal);
|
|
193
|
+
if (checkoutHead !== target.head) {
|
|
194
|
+
throw new InvalidTargetError(`Committed-diff scans require the repository checkout to match the requested head revision. Checkout HEAD is ${checkoutHead}; requested head is ${target.head}. Check out the requested head and retry.`);
|
|
195
|
+
}
|
|
196
|
+
const status = await gitOutput(repository, ["status", "--porcelain=v1", "--untracked-files=all"], signal);
|
|
197
|
+
if (status.length !== 0) {
|
|
198
|
+
throw new InvalidTargetError("Committed-diff scans require a clean repository checkout. Commit, stash, or remove local changes and retry. Use `git stash --include-untracked` to stash untracked files.");
|
|
199
|
+
}
|
|
200
|
+
const tracked = await gitOutput(repository, ["ls-files", "-t", "-z"], signal);
|
|
201
|
+
if (tracked.split("\0").some((entry) => entry.startsWith("S "))) {
|
|
202
|
+
throw new InvalidTargetError("Committed-diff scans require a full repository checkout. Sparse checkouts are not supported; materialize skipped tracked files and retry.");
|
|
203
|
+
}
|
|
204
|
+
}
|
|
178
205
|
export function validateMode(target, mode) {
|
|
179
206
|
if (mode !== "standard" && mode !== "deep") {
|
|
180
207
|
throw new InvalidTargetError(`Unsupported scan mode: ${String(mode)}`);
|
|
@@ -220,11 +247,11 @@ async function resolveGitRef(repository, ref, signal) {
|
|
|
220
247
|
}
|
|
221
248
|
async function gitOutput(repository, args, signal) {
|
|
222
249
|
throwIfAborted(signal);
|
|
223
|
-
const command = await resolveTrustedExecutable("git", isolatedGitEnvironment(), await outermostGitMarkerRoot(repository, signal));
|
|
250
|
+
const command = await resolveTrustedExecutable("git", isolatedGitEnvironment(args[0] === "rev-parse"), await outermostGitMarkerRoot(repository, signal));
|
|
224
251
|
if (command === null)
|
|
225
252
|
throw new Error("Git is not available on a trusted PATH.");
|
|
226
253
|
throwIfAborted(signal);
|
|
227
|
-
const { stdout } = await execFile(command.executable, ["-C", repository, ...args], {
|
|
254
|
+
const { stdout } = await execFile(command.executable, ["-c", "core.fsmonitor=false", "-C", repository, ...args], {
|
|
228
255
|
encoding: "utf8",
|
|
229
256
|
signal,
|
|
230
257
|
env: command.environment,
|
|
@@ -250,13 +277,17 @@ async function outermostGitMarkerRoot(repository, signal) {
|
|
|
250
277
|
current = parent;
|
|
251
278
|
}
|
|
252
279
|
}
|
|
253
|
-
function isolatedGitEnvironment() {
|
|
280
|
+
function isolatedGitEnvironment(preserveGitConfiguration) {
|
|
254
281
|
const environment = { ...process.env };
|
|
255
282
|
for (const name of Object.keys(environment)) {
|
|
256
|
-
|
|
283
|
+
const normalized = name.toUpperCase();
|
|
284
|
+
if (GIT_REPOSITORY_ENVIRONMENT.has(normalized) ||
|
|
285
|
+
normalized === "GIT_ALLOW_PROTOCOL" ||
|
|
286
|
+
(!preserveGitConfiguration && normalized.startsWith("GIT_"))) {
|
|
257
287
|
delete environment[name];
|
|
258
288
|
}
|
|
259
289
|
}
|
|
290
|
+
environment["GIT_ALLOW_PROTOCOL"] = "";
|
|
260
291
|
return environment;
|
|
261
292
|
}
|
|
262
293
|
async function abortable(operation, signal) {
|
package/dist/targets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"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","sourcesContent":["import { execFile as execFileCallback } from \"node:child_process\";\nimport { existsSync } from \"node:fs\";\nimport { lstat, realpath, stat } from \"node:fs/promises\";\nimport { homedir } from \"node:os\";\nimport { dirname, isAbsolute, join, relative, resolve, sep } from \"node:path\";\nimport { promisify } from \"node:util\";\nimport { InvalidTargetError } from \"./errors.js\";\nimport { resolveTrustedExecutable } from \"./trusted-executable.js\";\n\nconst execFile = promisify(execFileCallback);\nconst UNSUPPORTED_GIT_ENVIRONMENT = new Set([\n \"GIT_DIR\",\n \"GIT_WORK_TREE\",\n \"GIT_INDEX_FILE\",\n \"GIT_OBJECT_DIRECTORY\",\n \"GIT_ALTERNATE_OBJECT_DIRECTORIES\",\n \"GIT_COMMON_DIR\",\n \"GIT_REPLACE_REF_BASE\",\n]);\n\nexport type ScanMode = \"standard\" | \"deep\";\nexport type DiffTargetKind = \"refs\" | \"working_tree\";\n\nexport interface DiffTargetOptions {\n kind: DiffTargetKind;\n base: string;\n head?: string;\n}\n\nexport class DiffTarget {\n readonly #brand = \"DiffTarget\";\n public readonly kind: DiffTargetKind;\n public readonly base: string;\n public readonly head?: string;\n\n public constructor(options: DiffTargetOptions) {\n void this.#brand;\n this.kind = options.kind;\n this.base = options.base;\n this.head = options.head;\n if (this.kind !== \"refs\" && this.kind !== \"working_tree\") {\n throw new InvalidTargetError(\n `Unsupported diff target kind: ${String(this.kind)}`,\n );\n }\n if (typeof this.base !== \"string\" || this.base.length === 0) {\n throw new InvalidTargetError(\"The diff base ref must be non-empty.\");\n }\n if (\n this.kind === \"refs\" &&\n (typeof this.head !== \"string\" || this.head.length === 0)\n ) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n if (this.kind === \"working_tree\" && this.head !== undefined) {\n throw new InvalidTargetError(\n \"Working-tree targets cannot specify a head ref.\",\n );\n }\n Object.freeze(this);\n }\n\n public static refs({\n base,\n head = \"HEAD\",\n }: {\n base: string;\n head?: string;\n }): DiffTarget {\n return new DiffTarget({ kind: \"refs\", base, head });\n }\n\n public static workingTree({\n base = \"HEAD\",\n }: { base?: string } = {}): DiffTarget {\n return new DiffTarget({ kind: \"working_tree\", base });\n }\n}\n\nexport type ScanTarget = \"repository\" | DiffTarget | readonly string[];\nexport type NormalizedTargetKind =\n | \"repository\"\n | \"paths\"\n | \"refs\"\n | \"working_tree\";\n\nexport interface NormalizedTarget {\n kind: NormalizedTargetKind;\n paths: readonly string[];\n base?: string;\n head?: string;\n baseRef?: string;\n headRef?: string;\n}\n\nexport async function normalizeRepository(\n repository: string,\n signal?: AbortSignal,\n): Promise<string> {\n const candidate = resolveRepositoryPath(repository);\n let canonical: string;\n try {\n canonical = await abortable(() => realpath(candidate), signal);\n if (!(await abortable(() => stat(canonical), signal)).isDirectory()) {\n throw new Error(\"not a directory\");\n }\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(\n `Repository is not a directory: ${candidate}`,\n {\n cause: error,\n },\n );\n }\n return canonical;\n}\n\nexport function resolveRepositoryPath(repository: string): string {\n return resolve(expandHome(repository));\n}\n\nexport async function enclosingGitWorktreeRoot(\n repository: string,\n signal?: AbortSignal,\n): Promise<string | null> {\n try {\n const root = await gitOutput(\n repository,\n [\"rev-parse\", \"--show-toplevel\"],\n signal,\n );\n return await abortable(() => realpath(root), signal);\n } catch {\n throwIfAborted(signal);\n return null;\n }\n}\n\nexport function validatedGitEnvironment(\n environment: Readonly<Record<string, string | undefined>> = process.env,\n): void {\n const unsupported = Object.entries(environment).find(\n ([name, value]) =>\n UNSUPPORTED_GIT_ENVIRONMENT.has(name.toUpperCase()) &&\n value !== undefined &&\n value.trim() !== \"\",\n );\n if (unsupported !== undefined) {\n throw new InvalidTargetError(\n `${unsupported[0]} is not supported for Codex Security scans.`,\n );\n }\n}\n\nexport async function normalizeTarget(\n repository: string,\n target: ScanTarget,\n signal?: AbortSignal,\n): Promise<NormalizedTarget> {\n const root = await normalizeRepository(repository, signal);\n throwIfAborted(signal);\n if (target === \"repository\") {\n return { kind: \"repository\", paths: [] };\n }\n\n if (target instanceof DiffTarget) {\n if (target.kind !== \"refs\" && target.kind !== \"working_tree\") {\n throw new InvalidTargetError(\n `Unsupported diff target kind: ${String(target.kind)}`,\n );\n }\n if (typeof target.base !== \"string\" || target.base.length === 0) {\n throw new InvalidTargetError(\"The diff base ref must be non-empty.\");\n }\n if (\n target.kind === \"refs\" &&\n (typeof target.head !== \"string\" || target.head.length === 0)\n ) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n if (target.kind === \"working_tree\" && target.head !== undefined) {\n throw new InvalidTargetError(\n \"Working-tree targets cannot specify a head ref.\",\n );\n }\n await requireGitRepository(root, signal);\n const base = await resolveGitRef(root, target.base, signal);\n if (target.kind === \"refs\") {\n const head = target.head;\n if (typeof head !== \"string\" || head.length === 0) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n return {\n kind: \"refs\",\n paths: [],\n base,\n head: await resolveGitRef(root, head, signal),\n baseRef: target.base,\n headRef: head,\n };\n }\n return {\n kind: \"working_tree\",\n paths: [],\n base,\n head: await resolveGitRef(root, \"HEAD\", signal),\n baseRef: target.base,\n headRef: \"HEAD\",\n };\n }\n\n if (!Array.isArray(target)) {\n throw new InvalidTargetError(\n \"Scan target must be 'repository', a DiffTarget, or an array of paths.\",\n );\n }\n if (target.length === 0) {\n throw new InvalidTargetError(\n \"A path scan target must contain at least one path.\",\n );\n }\n\n const paths: string[] = [];\n for (const value of target) {\n throwIfAborted(signal);\n if (typeof value !== \"string\") {\n throw new InvalidTargetError(\n \"Path scan targets must contain only strings.\",\n );\n }\n if (value.length === 0) {\n throw new InvalidTargetError(\n \"Path scan targets must not contain an empty path.\",\n );\n }\n const candidate = isAbsolute(expandHome(value))\n ? resolve(expandHome(value))\n : resolve(root, expandHome(value));\n if (!existsSync(candidate)) {\n throw new InvalidTargetError(`Path target does not exist: ${value}`);\n }\n let canonical: string;\n try {\n canonical = await abortable(() => realpath(candidate), signal);\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(`Path target does not exist: ${value}`, {\n cause: error,\n });\n }\n const relativePath = relative(root, canonical);\n if (\n relativePath === \"..\" ||\n relativePath.startsWith(`..${sep}`) ||\n isAbsolute(relativePath)\n ) {\n throw new InvalidTargetError(\n `Path target is outside the repository: ${value}`,\n );\n }\n const normalized = relativePath.split(sep).join(\"/\") || \".\";\n if (!paths.includes(normalized)) {\n paths.push(normalized);\n }\n }\n return { kind: \"paths\", paths };\n}\n\nexport function validateMode(target: NormalizedTarget, mode: ScanMode): void {\n if (mode !== \"standard\" && mode !== \"deep\") {\n throw new InvalidTargetError(`Unsupported scan mode: ${String(mode)}`);\n }\n if (\n mode === \"deep\" &&\n (target.kind === \"refs\" || target.kind === \"working_tree\")\n ) {\n throw new InvalidTargetError(\n \"Deep mode supports repository and path targets only.\",\n );\n }\n}\n\nexport async function repositoryRevision(\n repository: string,\n signal?: AbortSignal,\n): Promise<string | null> {\n try {\n return await gitOutput(\n repository,\n [\"rev-parse\", \"--verify\", \"HEAD^{commit}\"],\n signal,\n );\n } catch {\n throwIfAborted(signal);\n return null;\n }\n}\n\nasync function requireGitRepository(\n repository: string,\n signal?: AbortSignal,\n): Promise<void> {\n let root: string;\n try {\n root = await gitOutput(\n repository,\n [\"rev-parse\", \"--show-toplevel\"],\n signal,\n );\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(\n `Diff targets require a Git repository: ${repository}`,\n {\n cause: error,\n },\n );\n }\n const canonicalRoot = await abortable(() => realpath(root), signal);\n if (canonicalRoot !== repository) {\n throw new InvalidTargetError(\n `Diff target repository must be the Git worktree root: ${canonicalRoot}`,\n );\n }\n}\n\nasync function resolveGitRef(\n repository: string,\n ref: string,\n signal?: AbortSignal,\n): Promise<string> {\n try {\n return await gitOutput(\n repository,\n [\"rev-parse\", \"--verify\", \"--end-of-options\", `${ref}^{commit}`],\n signal,\n );\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(`unknown Git ref: ${ref}`, { cause: error });\n }\n}\n\nasync function gitOutput(\n repository: string,\n args: readonly string[],\n signal?: AbortSignal,\n): Promise<string> {\n throwIfAborted(signal);\n const command = await resolveTrustedExecutable(\n \"git\",\n isolatedGitEnvironment(),\n await outermostGitMarkerRoot(repository, signal),\n );\n if (command === null)\n throw new Error(\"Git is not available on a trusted PATH.\");\n throwIfAborted(signal);\n const { stdout } = await execFile(\n command.executable,\n [\"-C\", repository, ...args],\n {\n encoding: \"utf8\",\n signal,\n env: command.environment,\n },\n );\n return stdout.trim();\n}\n\nasync function outermostGitMarkerRoot(\n repository: string,\n signal?: AbortSignal,\n): Promise<string> {\n let current = repository;\n let root = repository;\n while (true) {\n throwIfAborted(signal);\n try {\n await lstat(join(current, \".git\"));\n root = current;\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code !== \"ENOENT\") throw error;\n }\n const parent = dirname(current);\n if (parent === current) return root;\n current = parent;\n }\n}\n\nfunction isolatedGitEnvironment(): NodeJS.ProcessEnv {\n const environment = { ...process.env };\n for (const name of Object.keys(environment)) {\n if (name.toUpperCase().startsWith(\"GIT_\")) {\n delete environment[name];\n }\n }\n return environment;\n}\n\nasync function abortable<T>(\n operation: () => Promise<T>,\n signal?: AbortSignal,\n): Promise<T> {\n if (signal === undefined) return await operation();\n throwIfAborted(signal);\n return await new Promise<T>((resolvePromise, reject) => {\n const onAbort = (): void => reject(abortReason(signal));\n signal.addEventListener(\"abort\", onAbort, { once: true });\n void operation().then(\n (value) => {\n signal.removeEventListener(\"abort\", onAbort);\n resolvePromise(value);\n },\n (error: unknown) => {\n signal.removeEventListener(\"abort\", onAbort);\n reject(error);\n },\n );\n });\n}\n\nfunction throwIfAborted(signal?: AbortSignal): void {\n if (signal?.aborted === true) throw abortReason(signal);\n}\n\nfunction abortReason(signal: AbortSignal): unknown {\n return (\n signal.reason ??\n new DOMException(\"The operation was aborted.\", \"AbortError\")\n );\n}\n\nfunction expandHome(value: string): string {\n if (value === \"~\") {\n return homedir();\n }\n if (value.startsWith(\"~/\") || value.startsWith(\"~\\\\\")) {\n return resolve(homedir(), value.slice(2).replace(/^[/\\\\]+/, \"\"));\n }\n return value;\n}\n"]}
|
|
1
|
+
{"version":3,"file":"targets.js","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"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","sourcesContent":["import { execFile as execFileCallback } from \"node:child_process\";\nimport { existsSync } from \"node:fs\";\nimport { lstat, realpath, stat } from \"node:fs/promises\";\nimport { homedir } from \"node:os\";\nimport { dirname, isAbsolute, join, relative, resolve, sep } from \"node:path\";\nimport { promisify } from \"node:util\";\nimport { InvalidTargetError } from \"./errors.js\";\nimport { resolveTrustedExecutable } from \"./trusted-executable.js\";\n\nconst execFile = promisify(execFileCallback);\nconst UNSUPPORTED_GIT_ENVIRONMENT = new Set([\n \"GIT_DIR\",\n \"GIT_WORK_TREE\",\n \"GIT_INDEX_FILE\",\n \"GIT_OBJECT_DIRECTORY\",\n \"GIT_ALTERNATE_OBJECT_DIRECTORIES\",\n \"GIT_COMMON_DIR\",\n \"GIT_REPLACE_REF_BASE\",\n]);\nconst GIT_REPOSITORY_ENVIRONMENT = new Set([\n ...UNSUPPORTED_GIT_ENVIRONMENT,\n \"GIT_CEILING_DIRECTORIES\",\n \"GIT_DISCOVERY_ACROSS_FILESYSTEM\",\n \"GIT_GRAFT_FILE\",\n \"GIT_IMPLICIT_WORK_TREE\",\n \"GIT_NAMESPACE\",\n \"GIT_NO_REPLACE_OBJECTS\",\n \"GIT_PREFIX\",\n \"GIT_SHALLOW_FILE\",\n]);\n\nexport type ScanMode = \"standard\" | \"deep\";\nexport type DiffTargetKind = \"refs\" | \"working_tree\";\n\nexport interface DiffTargetOptions {\n kind: DiffTargetKind;\n base: string;\n head?: string;\n}\n\nexport class DiffTarget {\n readonly #brand = \"DiffTarget\";\n public readonly kind: DiffTargetKind;\n public readonly base: string;\n public readonly head?: string;\n\n public constructor(options: DiffTargetOptions) {\n void this.#brand;\n this.kind = options.kind;\n this.base = options.base;\n this.head = options.head;\n if (this.kind !== \"refs\" && this.kind !== \"working_tree\") {\n throw new InvalidTargetError(\n `Unsupported diff target kind: ${String(this.kind)}`,\n );\n }\n if (typeof this.base !== \"string\" || this.base.length === 0) {\n throw new InvalidTargetError(\"The diff base ref must be non-empty.\");\n }\n if (\n this.kind === \"refs\" &&\n (typeof this.head !== \"string\" || this.head.length === 0)\n ) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n if (this.kind === \"working_tree\" && this.head !== undefined) {\n throw new InvalidTargetError(\n \"Working-tree targets cannot specify a head ref.\",\n );\n }\n Object.freeze(this);\n }\n\n public static refs({\n base,\n head = \"HEAD\",\n }: {\n base: string;\n head?: string;\n }): DiffTarget {\n return new DiffTarget({ kind: \"refs\", base, head });\n }\n\n public static workingTree({\n base = \"HEAD\",\n }: { base?: string } = {}): DiffTarget {\n return new DiffTarget({ kind: \"working_tree\", base });\n }\n}\n\nexport type ScanTarget = \"repository\" | DiffTarget | readonly string[];\nexport type NormalizedTargetKind =\n | \"repository\"\n | \"paths\"\n | \"refs\"\n | \"working_tree\";\n\nexport interface NormalizedTarget {\n kind: NormalizedTargetKind;\n paths: readonly string[];\n base?: string;\n head?: string;\n baseRef?: string;\n headRef?: string;\n}\n\nexport async function normalizeRepository(\n repository: string,\n signal?: AbortSignal,\n): Promise<string> {\n const candidate = resolveRepositoryPath(repository);\n let canonical: string;\n try {\n canonical = await abortable(() => realpath(candidate), signal);\n if (!(await abortable(() => stat(canonical), signal)).isDirectory()) {\n throw new Error(\"not a directory\");\n }\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(\n `Repository is not a directory: ${candidate}`,\n {\n cause: error,\n },\n );\n }\n return canonical;\n}\n\nexport function resolveRepositoryPath(repository: string): string {\n return resolve(expandHome(repository));\n}\n\nexport async function enclosingGitWorktreeRoot(\n repository: string,\n signal?: AbortSignal,\n): Promise<string | null> {\n try {\n const root = await gitOutput(\n repository,\n [\"rev-parse\", \"--show-toplevel\"],\n signal,\n );\n return await abortable(() => realpath(root), signal);\n } catch {\n throwIfAborted(signal);\n return null;\n }\n}\n\nexport function validatedGitEnvironment(\n environment: Readonly<Record<string, string | undefined>> = process.env,\n): void {\n const unsupported = Object.entries(environment).find(\n ([name, value]) =>\n UNSUPPORTED_GIT_ENVIRONMENT.has(name.toUpperCase()) &&\n value !== undefined &&\n value.trim() !== \"\",\n );\n if (unsupported !== undefined) {\n throw new InvalidTargetError(\n `${unsupported[0]} is not supported for Codex Security scans.`,\n );\n }\n}\n\nexport async function normalizeTarget(\n repository: string,\n target: ScanTarget,\n signal?: AbortSignal,\n): Promise<NormalizedTarget> {\n const root = await normalizeRepository(repository, signal);\n throwIfAborted(signal);\n if (target === \"repository\") {\n return { kind: \"repository\", paths: [] };\n }\n\n if (target instanceof DiffTarget) {\n if (target.kind !== \"refs\" && target.kind !== \"working_tree\") {\n throw new InvalidTargetError(\n `Unsupported diff target kind: ${String(target.kind)}`,\n );\n }\n if (typeof target.base !== \"string\" || target.base.length === 0) {\n throw new InvalidTargetError(\"The diff base ref must be non-empty.\");\n }\n if (\n target.kind === \"refs\" &&\n (typeof target.head !== \"string\" || target.head.length === 0)\n ) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n if (target.kind === \"working_tree\" && target.head !== undefined) {\n throw new InvalidTargetError(\n \"Working-tree targets cannot specify a head ref.\",\n );\n }\n await requireGitRepository(root, signal);\n const base = await resolveGitRef(root, target.base, signal);\n if (target.kind === \"refs\") {\n const head = target.head;\n if (typeof head !== \"string\" || head.length === 0) {\n throw new InvalidTargetError(\n \"Git diff refs must include a non-empty head ref.\",\n );\n }\n return {\n kind: \"refs\",\n paths: [],\n base,\n head: await resolveGitRef(root, head, signal),\n baseRef: target.base,\n headRef: head,\n };\n }\n return {\n kind: \"working_tree\",\n paths: [],\n base,\n head: await resolveGitRef(root, \"HEAD\", signal),\n baseRef: target.base,\n headRef: \"HEAD\",\n };\n }\n\n if (!Array.isArray(target)) {\n throw new InvalidTargetError(\n \"Scan target must be 'repository', a DiffTarget, or an array of paths.\",\n );\n }\n if (target.length === 0) {\n throw new InvalidTargetError(\n \"A path scan target must contain at least one path.\",\n );\n }\n\n const paths: string[] = [];\n for (const value of target) {\n throwIfAborted(signal);\n if (typeof value !== \"string\") {\n throw new InvalidTargetError(\n \"Path scan targets must contain only strings.\",\n );\n }\n if (value.length === 0) {\n throw new InvalidTargetError(\n \"Path scan targets must not contain an empty path.\",\n );\n }\n const candidate = isAbsolute(expandHome(value))\n ? resolve(expandHome(value))\n : resolve(root, expandHome(value));\n if (!existsSync(candidate)) {\n throw new InvalidTargetError(`Path target does not exist: ${value}`);\n }\n let canonical: string;\n try {\n canonical = await abortable(() => realpath(candidate), signal);\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(`Path target does not exist: ${value}`, {\n cause: error,\n });\n }\n const relativePath = relative(root, canonical);\n if (\n relativePath === \"..\" ||\n relativePath.startsWith(`..${sep}`) ||\n isAbsolute(relativePath)\n ) {\n throw new InvalidTargetError(\n `Path target is outside the repository: ${value}`,\n );\n }\n const normalized = relativePath.split(sep).join(\"/\") || \".\";\n if (!paths.includes(normalized)) {\n paths.push(normalized);\n }\n }\n return { kind: \"paths\", paths };\n}\n\nexport async function validateCommittedDiffCheckout(\n repository: string,\n target: NormalizedTarget,\n signal?: AbortSignal,\n): Promise<void> {\n if (target.kind !== \"refs\") return;\n\n const checkoutHead = await resolveGitRef(repository, \"HEAD\", signal);\n if (checkoutHead !== target.head) {\n throw new InvalidTargetError(\n `Committed-diff scans require the repository checkout to match the requested head revision. Checkout HEAD is ${checkoutHead}; requested head is ${target.head}. Check out the requested head and retry.`,\n );\n }\n\n const status = await gitOutput(\n repository,\n [\"status\", \"--porcelain=v1\", \"--untracked-files=all\"],\n signal,\n );\n if (status.length !== 0) {\n throw new InvalidTargetError(\n \"Committed-diff scans require a clean repository checkout. Commit, stash, or remove local changes and retry. Use `git stash --include-untracked` to stash untracked files.\",\n );\n }\n\n const tracked = await gitOutput(repository, [\"ls-files\", \"-t\", \"-z\"], signal);\n if (tracked.split(\"\\0\").some((entry) => entry.startsWith(\"S \"))) {\n throw new InvalidTargetError(\n \"Committed-diff scans require a full repository checkout. Sparse checkouts are not supported; materialize skipped tracked files and retry.\",\n );\n }\n}\n\nexport function validateMode(target: NormalizedTarget, mode: ScanMode): void {\n if (mode !== \"standard\" && mode !== \"deep\") {\n throw new InvalidTargetError(`Unsupported scan mode: ${String(mode)}`);\n }\n if (\n mode === \"deep\" &&\n (target.kind === \"refs\" || target.kind === \"working_tree\")\n ) {\n throw new InvalidTargetError(\n \"Deep mode supports repository and path targets only.\",\n );\n }\n}\n\nexport async function repositoryRevision(\n repository: string,\n signal?: AbortSignal,\n): Promise<string | null> {\n try {\n return await gitOutput(\n repository,\n [\"rev-parse\", \"--verify\", \"HEAD^{commit}\"],\n signal,\n );\n } catch {\n throwIfAborted(signal);\n return null;\n }\n}\n\nasync function requireGitRepository(\n repository: string,\n signal?: AbortSignal,\n): Promise<void> {\n let root: string;\n try {\n root = await gitOutput(\n repository,\n [\"rev-parse\", \"--show-toplevel\"],\n signal,\n );\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(\n `Diff targets require a Git repository: ${repository}`,\n {\n cause: error,\n },\n );\n }\n const canonicalRoot = await abortable(() => realpath(root), signal);\n if (canonicalRoot !== repository) {\n throw new InvalidTargetError(\n `Diff target repository must be the Git worktree root: ${canonicalRoot}`,\n );\n }\n}\n\nasync function resolveGitRef(\n repository: string,\n ref: string,\n signal?: AbortSignal,\n): Promise<string> {\n try {\n return await gitOutput(\n repository,\n [\"rev-parse\", \"--verify\", \"--end-of-options\", `${ref}^{commit}`],\n signal,\n );\n } catch (error) {\n throwIfAborted(signal);\n throw new InvalidTargetError(`unknown Git ref: ${ref}`, { cause: error });\n }\n}\n\nasync function gitOutput(\n repository: string,\n args: readonly string[],\n signal?: AbortSignal,\n): Promise<string> {\n throwIfAborted(signal);\n const command = await resolveTrustedExecutable(\n \"git\",\n isolatedGitEnvironment(args[0] === \"rev-parse\"),\n await outermostGitMarkerRoot(repository, signal),\n );\n if (command === null)\n throw new Error(\"Git is not available on a trusted PATH.\");\n throwIfAborted(signal);\n const { stdout } = await execFile(\n command.executable,\n [\"-c\", \"core.fsmonitor=false\", \"-C\", repository, ...args],\n {\n encoding: \"utf8\",\n signal,\n env: command.environment,\n },\n );\n return stdout.trim();\n}\n\nasync function outermostGitMarkerRoot(\n repository: string,\n signal?: AbortSignal,\n): Promise<string> {\n let current = repository;\n let root = repository;\n while (true) {\n throwIfAborted(signal);\n try {\n await lstat(join(current, \".git\"));\n root = current;\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code !== \"ENOENT\") throw error;\n }\n const parent = dirname(current);\n if (parent === current) return root;\n current = parent;\n }\n}\n\nfunction isolatedGitEnvironment(\n preserveGitConfiguration: boolean,\n): NodeJS.ProcessEnv {\n const environment = { ...process.env };\n for (const name of Object.keys(environment)) {\n const normalized = name.toUpperCase();\n if (\n GIT_REPOSITORY_ENVIRONMENT.has(normalized) ||\n normalized === \"GIT_ALLOW_PROTOCOL\" ||\n (!preserveGitConfiguration && normalized.startsWith(\"GIT_\"))\n ) {\n delete environment[name];\n }\n }\n environment[\"GIT_ALLOW_PROTOCOL\"] = \"\";\n return environment;\n}\n\nasync function abortable<T>(\n operation: () => Promise<T>,\n signal?: AbortSignal,\n): Promise<T> {\n if (signal === undefined) return await operation();\n throwIfAborted(signal);\n return await new Promise<T>((resolvePromise, reject) => {\n const onAbort = (): void => reject(abortReason(signal));\n signal.addEventListener(\"abort\", onAbort, { once: true });\n void operation().then(\n (value) => {\n signal.removeEventListener(\"abort\", onAbort);\n resolvePromise(value);\n },\n (error: unknown) => {\n signal.removeEventListener(\"abort\", onAbort);\n reject(error);\n },\n );\n });\n}\n\nfunction throwIfAborted(signal?: AbortSignal): void {\n if (signal?.aborted === true) throw abortReason(signal);\n}\n\nfunction abortReason(signal: AbortSignal): unknown {\n return (\n signal.reason ??\n new DOMException(\"The operation was aborted.\", \"AbortError\")\n );\n}\n\nfunction expandHome(value: string): string {\n if (value === \"~\") {\n return homedir();\n }\n if (value.startsWith(\"~/\") || value.startsWith(\"~\\\\\")) {\n return resolve(homedir(), value.slice(2).replace(/^[/\\\\]+/, \"\"));\n }\n return value;\n}\n"]}
|
|
@@ -6,7 +6,7 @@ export async function resolveTrustedExecutable(candidate, environment, protected
|
|
|
6
6
|
const path = Object.entries(environment).find(([name]) => name.toUpperCase() === "PATH")?.[1];
|
|
7
7
|
const entries = [];
|
|
8
8
|
for (const entry of path?.split(delimiter) ?? []) {
|
|
9
|
-
if (entry.length === 0
|
|
9
|
+
if (entry.length === 0)
|
|
10
10
|
continue;
|
|
11
11
|
const canonical = await realpath(entry).catch(() => null);
|
|
12
12
|
if (canonical === null || isWithin(root, canonical))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trusted-executable.js","sourceRoot":"","sources":["../src/trusted-executable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAOhF,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,SAAiB,EACjB,WAAyD,EACzD,aAAqB;IAErB,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CACpD,OAAO,CAAC,aAAa,CAAC,CACvB,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAC3C,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAC1C,EAAE,CAAC,CAAC,CAAC,CAAC;IACP,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC
|
|
1
|
+
{"version":3,"file":"trusted-executable.js","sourceRoot":"","sources":["../src/trusted-executable.ts"],"names":[],"mappings":"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","sourcesContent":["import { constants } from \"node:fs\";\nimport { access, realpath, stat } from \"node:fs/promises\";\nimport { delimiter, isAbsolute, join, relative, resolve, sep } from \"node:path\";\n\nexport interface TrustedExecutable {\n executable: string;\n environment: Record<string, string | undefined>;\n}\n\nexport async function resolveTrustedExecutable(\n candidate: string,\n environment: Readonly<Record<string, string | undefined>>,\n protectedRoot: string,\n): Promise<TrustedExecutable | null> {\n const root = await realpath(protectedRoot).catch(() =>\n resolve(protectedRoot),\n );\n const path = Object.entries(environment).find(\n ([name]) => name.toUpperCase() === \"PATH\",\n )?.[1];\n const entries: string[] = [];\n for (const entry of path?.split(delimiter) ?? []) {\n if (entry.length === 0) continue;\n const canonical = await realpath(entry).catch(() => null);\n if (canonical === null || isWithin(root, canonical)) continue;\n if (!entries.includes(canonical)) entries.push(canonical);\n }\n\n // execFile cannot launch batch files, but their symlink targets still affect PATH trust.\n const extensions =\n process.platform === \"win32\"\n ? /\\.(?:exe|com)$/iu.test(candidate)\n ? [{ suffix: \"\", runnable: true }]\n : [\n { suffix: \".exe\", runnable: true },\n { suffix: \".com\", runnable: true },\n { suffix: \".bat\", runnable: false },\n { suffix: \".cmd\", runnable: false },\n { suffix: \"\", runnable: false },\n ]\n : [{ suffix: \"\", runnable: true }];\n const pathLike = candidate.includes(\"/\") || candidate.includes(\"\\\\\");\n const candidates = pathLike\n ? [{ entry: null, path: resolve(candidate), runnable: true }]\n : entries.flatMap((entry) =>\n extensions.map((extension) => ({\n entry,\n path: join(entry, `${candidate}${extension.suffix}`),\n runnable: extension.runnable,\n })),\n );\n const unsafeEntries = new Set<string>();\n let executable: string | null = null;\n for (const current of candidates) {\n const canonical = await realpath(current.path).catch(() => null);\n if (canonical === null) continue;\n if (isWithin(root, canonical)) {\n if (current.entry !== null) unsafeEntries.add(current.entry);\n continue;\n }\n if (!current.runnable) continue;\n try {\n await access(\n canonical,\n process.platform === \"win32\" ? constants.F_OK : constants.X_OK,\n );\n if (!(await stat(canonical)).isFile()) continue;\n executable ??= pathLike ? canonical : current.path;\n } catch {\n continue;\n }\n }\n if (executable === null) return null;\n\n const sanitizedEnvironment = { ...environment };\n for (const name of Object.keys(sanitizedEnvironment)) {\n if (name.toUpperCase() === \"PATH\") delete sanitizedEnvironment[name];\n }\n sanitizedEnvironment[\"PATH\"] = entries\n .filter((entry) => !unsafeEntries.has(entry))\n .join(delimiter);\n return { executable, environment: sanitizedEnvironment };\n}\n\nfunction isWithin(root: string, candidate: string): boolean {\n const path = relative(root, candidate);\n return (\n path === \"\" ||\n (path !== \"..\" && !path.startsWith(`..${sep}`) && !isAbsolute(path))\n );\n}\n"]}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
/** npm-compatible successor to the Python package version 0.1.0b3. */
|
|
2
1
|
export declare const VERSION: string;
|
|
3
2
|
export declare const CODEX_SDK_VERSION: string;
|
|
4
3
|
export declare const CODEX_EXECUTABLE_VERSION: string;
|
|
5
|
-
export declare const BUNDLED_PLUGIN_VERSION: "0.1.
|
|
4
|
+
export declare const BUNDLED_PLUGIN_VERSION: "0.1.20";
|
|
6
5
|
export interface UpdateNotice {
|
|
7
6
|
readonly currentVersion: string;
|
|
8
7
|
readonly latestVersion: string;
|
|
@@ -10,11 +9,12 @@ export interface UpdateNotice {
|
|
|
10
9
|
}
|
|
11
10
|
export declare function updateNoticeEnabled(environment: NodeJS.ProcessEnv): boolean;
|
|
12
11
|
export declare function updateCommand(environment?: NodeJS.ProcessEnv, entrypoint?: string): string;
|
|
13
|
-
export declare function checkForUpdate({ environment, entrypoint, currentVersion, fetch: fetchLatest, }?: {
|
|
12
|
+
export declare function checkForUpdate({ environment, entrypoint, currentVersion, fetch: fetchLatest, signal, }?: {
|
|
14
13
|
environment?: NodeJS.ProcessEnv;
|
|
15
14
|
entrypoint?: string;
|
|
16
15
|
currentVersion?: string;
|
|
17
16
|
fetch?: (input: Parameters<typeof fetch>[0], init?: Parameters<typeof fetch>[1]) => ReturnType<typeof fetch>;
|
|
17
|
+
signal?: AbortSignal;
|
|
18
18
|
}): Promise<UpdateNotice | undefined>;
|
|
19
19
|
export declare function formatUpdateNotice(notice: UpdateNotice): string;
|
|
20
20
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAOA,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,QAA2B,CAAC;AAChD,eAAO,MAAM,iBAAiB,QAAuB,CAAC;AACtD,eAAO,MAAM,wBAAwB,QAA8B,CAAC;AACpE,eAAO,MAAM,sBAAsB,EAAG,QAAiB,CAAC;AAMxD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAM3E;AAED,wBAAgB,aAAa,CAC3B,WAAW,GAAE,MAAM,CAAC,UAAwB,EAC5C,UAAU,GAAE,MAAuC,GAClD,MAAM,CAwCR;AAED,wBAAsB,cAAc,CAAC,EACnC,WAAyB,EACzB,UAAU,EACV,cAAwB,EACxB,KAAK,EAAE,WAAmB,EAC1B,MAAM,GACP,GAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,CACN,KAAK,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAClC,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAC/B,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,WAAW,CAAC;CACjB,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAyCzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAa/D"}
|
package/dist/version.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { readFileSync } from "node:fs";
|
|
2
2
|
import { fileURLToPath } from "node:url";
|
|
3
3
|
const PACKAGE_VERSIONS = packageVersions(new URL("../package.json", import.meta.url));
|
|
4
|
-
/** npm-compatible successor to the Python package version 0.1.0b3. */
|
|
5
4
|
export const VERSION = PACKAGE_VERSIONS.package;
|
|
6
5
|
export const CODEX_SDK_VERSION = PACKAGE_VERSIONS.sdk;
|
|
7
6
|
export const CODEX_EXECUTABLE_VERSION = PACKAGE_VERSIONS.executable;
|
|
8
|
-
export const BUNDLED_PLUGIN_VERSION = "0.1.
|
|
7
|
+
export const BUNDLED_PLUGIN_VERSION = "0.1.20";
|
|
9
8
|
const PACKAGE_NAME = "@openai/codex-security";
|
|
10
9
|
const VERSION_PATTERN = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/u;
|
|
11
10
|
export function updateNoticeEnabled(environment) {
|
|
@@ -46,7 +45,7 @@ export function updateCommand(environment = process.env, entrypoint = fileURLToP
|
|
|
46
45
|
? `npm install${global ? " -g" : ""} ${PACKAGE_NAME}@latest`
|
|
47
46
|
: `npx ${PACKAGE_NAME}@latest`;
|
|
48
47
|
}
|
|
49
|
-
export async function checkForUpdate({ environment = process.env, entrypoint, currentVersion = VERSION, fetch: fetchLatest = fetch, } = {}) {
|
|
48
|
+
export async function checkForUpdate({ environment = process.env, entrypoint, currentVersion = VERSION, fetch: fetchLatest = fetch, signal, } = {}) {
|
|
50
49
|
if (!updateNoticeEnabled(environment))
|
|
51
50
|
return undefined;
|
|
52
51
|
try {
|
|
@@ -54,7 +53,10 @@ export async function checkForUpdate({ environment = process.env, entrypoint, cu
|
|
|
54
53
|
environment["npm_config_registry"] ??
|
|
55
54
|
environment["NPM_CONFIG_REGISTRY"] ??
|
|
56
55
|
"https://registry.npmjs.org/";
|
|
57
|
-
const
|
|
56
|
+
const timeout = AbortSignal.timeout(3_000);
|
|
57
|
+
const response = await fetchLatest(new URL(`${encodeURIComponent(PACKAGE_NAME)}/latest`, registry.endsWith("/") ? registry : `${registry}/`), {
|
|
58
|
+
signal: signal === undefined ? timeout : AbortSignal.any([signal, timeout]),
|
|
59
|
+
});
|
|
58
60
|
if (!response.ok)
|
|
59
61
|
return undefined;
|
|
60
62
|
const manifest = await response.json();
|