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): compare ignored policy paths by their Git filename bytes (#2573)

Michael D'Angelo4b3779276cdd
diff --git a/sdk/typescript/src/security-policy.ts b/sdk/typescript/src/security-policy.ts
index 824221571..a05b21d8c 100644
--- a/sdk/typescript/src/security-policy.ts
+++ b/sdk/typescript/src/security-policy.ts
@@ -432,13 +432,14 @@ async function securityPolicyPaths(
const gitDirectories = new Set<string>();
const policies: string[] = [];
const reportingPaths = new Set<string>();
- const ignored = new Set<string>();
+ const ignoredPathBytes = new Set<string>();
const isGitData = (path: string): boolean =>
[...gitDirectories].some(
(directory) => !relativePathIsOutside(relative(directory, path)),
);
const isIgnored = (path: string): boolean =>
- ignored.has(path) || (dirname(path) !== path && isIgnored(dirname(path)));
+ ignoredPathBytes.has(Buffer.from(path).toString("latin1")) ||
+ (dirname(path) !== path && isIgnored(dirname(path)));
const addRoot = async (repository: string) => {
if (knownRoots.has(repository)) return;
knownRoots.add(repository);
@@ -461,9 +462,17 @@ async function securityPolicyPaths(
"-z",
],
signal,
+ undefined,
+ undefined,
+ "buffer",
);
- for (const path of ignoredPaths.split("\0").filter(Boolean))
- ignored.add(resolve(gitRoot, path));
+ // Match Git's filename bytes without aliasing invalid UTF-8 to U+FFFD.
+ const rootBytes = Buffer.from(gitRoot).toString("latin1");
+ for (const path of ignoredPaths
+ .toString("latin1")
+ .split("\0")
+ .filter(Boolean))
+ ignoredPathBytes.add(resolve(rootBytes, path));
}
for (const name of [".github", "docs"]) {
let directory = join(repository, name);
diff --git a/sdk/typescript/tests-ts/security-policy.test.ts b/sdk/typescript/tests-ts/security-policy.test.ts
index 2af6bd6fa..ef05d69ee 100644
--- a/sdk/typescript/tests-ts/security-policy.test.ts
+++ b/sdk/typescript/tests-ts/security-policy.test.ts
@@ -428,6 +428,34 @@ describe("security policy generation", () => {
},
);
+ test.skipIf(process.platform !== "linux")(
+ "keeps a tracked policy distinct from an ignored non-UTF-8 filename",
+ async () => {
+ const f = await fixture();
+ policyGit(f.repository, "init", "--quiet");
+ const directory = "dependency-\uFFFD";
+ const policy = `${directory}/SECURITY.md`;
+ await mkdir(join(f.repository, directory));
+ await writeFile(join(f.repository, policy), POLICY);
+ policyGit(f.repository, "add", "--", policy);
+ await writeFile(join(f.repository, ".gitignore"), "dependency-*\n");
+
+ const ignored = Buffer.concat([
+ Buffer.from(join(f.repository, "dependency-")),
+ Buffer.from([0xff]),
+ ]);
+ await writeFile(ignored, "ignored file\n");
+ try {
+ const inventory = await inspectSecurityPolicySources(
+ await resolveSecurityPolicyTarget(f.repository),
+ );
+ expect(inventory.policyPaths).toEqual([policy]);
+ } finally {
+ await rm(ignored);
+ }
+ },
+ );
+
test("leaves Git-ignored dependencies out of the policy inventory", async () => {
const f = await fixture();
policyGit(f.repository, "init", "--quiet");