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

Preserve policy discovery with malformed archived Git metadata (#935)

mldangelo-oaiefcc6c26a85c
diff --git a/sdk/typescript/src/targets.ts b/sdk/typescript/src/targets.ts
index 47576ca3e..fb680300d 100644
--- a/sdk/typescript/src/targets.ts
+++ b/sdk/typescript/src/targets.ts
@@ -275,12 +275,13 @@ export async function isGitMetadataDirectory(
}
if (!head.isFile() && !head.isSymbolicLink()) return false;
try {
- // This resolver validates Git directories without loading their configuration.
+ // Resolve from outside the candidate so Git does not load its configuration.
const directory = await gitOutput(
repository,
["rev-parse", "--resolve-git-dir", repository],
signal,
{ LC_ALL: "C" },
+ dirname(repository),
);
return (
relative(await realpath(directory), await realpath(repository)) === ""
@@ -724,6 +725,7 @@ async function gitOutput(
args: readonly string[],
signal?: AbortSignal,
environment: NodeJS.ProcessEnv = {},
+ workingDirectory = repository,
): Promise<string> {
throwIfAborted(signal);
const command = await resolveTrustedExecutable(
@@ -736,7 +738,7 @@ async function gitOutput(
throwIfAborted(signal);
const { stdout } = await execFile(
command.executable,
- ["-c", "core.fsmonitor=false", "-C", repository, ...args],
+ ["-c", "core.fsmonitor=false", "-C", workingDirectory, ...args],
{
encoding: "utf8",
signal,
diff --git a/sdk/typescript/tests-ts/security-policy.test.ts b/sdk/typescript/tests-ts/security-policy.test.ts
index 168f05e0a..8ed02394f 100644
--- a/sdk/typescript/tests-ts/security-policy.test.ts
+++ b/sdk/typescript/tests-ts/security-policy.test.ts
@@ -314,25 +314,32 @@ describe("security policy generation", () => {
}
});
- test.each(["detached", "explicit worktree", "malformed config"])(
- "excludes %s Git metadata without a worktree marker",
- async (kind) => {
- const f = await fixture();
- const metadata = join(f.repository, "saved-metadata");
- policyGit(f.repository, "init", "--quiet", "--bare", metadata);
- policyGit(metadata, "config", "core.bare", "false");
- if (kind === "explicit worktree")
- policyGit(metadata, "config", "core.worktree", f.repository);
- if (kind === "malformed config")
- await writeFile(join(metadata, "config"), "[malformed config\n");
- await writeFile(join(metadata, "SECURITY.md"), "Git metadata fixture");
- const inventory = await inspectSecurityPolicySources(
- await resolveSecurityPolicyTarget(f.repository),
- );
- expect(inventory.policyPaths).toEqual([]);
- expect(inventory.gitMetadataPaths).toContain(metadata);
- },
- );
+ test.each([
+ "detached",
+ "explicit worktree",
+ "malformed config",
+ "malformed config in checkout",
+ ])("excludes %s Git metadata without a worktree marker", async (kind) => {
+ const f = await fixture();
+ const metadata = join(f.repository, "saved-metadata");
+ if (kind === "malformed config in checkout")
+ policyGit(f.repository, "init", "--quiet");
+ policyGit(f.repository, "init", "--quiet", "--bare", metadata);
+ policyGit(metadata, "config", "core.bare", "false");
+ if (kind === "explicit worktree")
+ policyGit(metadata, "config", "core.worktree", f.repository);
+ if (kind.startsWith("malformed config"))
+ await writeFile(join(metadata, "config"), "[malformed config\n");
+ const originalConfig = await readFile(join(metadata, "config"));
+ await writeFile(join(f.repository, "SECURITY.md"), POLICY);
+ await writeFile(join(metadata, "SECURITY.md"), "Git metadata fixture");
+ const inventory = await inspectSecurityPolicySources(
+ await resolveSecurityPolicyTarget(f.repository),
+ );
+ expect(inventory.policyPaths).toEqual(["SECURITY.md"]);
+ expect(inventory.gitMetadataPaths).toContain(metadata);
+ expect(await readFile(join(metadata, "config"))).toEqual(originalConfig);
+ });
test("excludes copied linked-worktree metadata", async () => {
const f = await fixture();