mirror of
https://github.com/AikidoSec/safe-chain.git
synced 2026-05-26 12:10:49 +00:00
Ensure that --cert parameters do not get overriden
This commit is contained in:
parent
70dc89c3e8
commit
a17e14c988
3 changed files with 103 additions and 4 deletions
|
|
@ -7,10 +7,16 @@ export async function runPip(command, args) {
|
|||
try {
|
||||
const env = mergeSafeChainProxyEnvironmentVariables(process.env);
|
||||
|
||||
// Pass --cert with our CA to pip so it trusts our MITM for known registries.
|
||||
// pip will append this to its default CA bundle, so it still validates
|
||||
// non-registry HTTPS (GitHub, custom mirrors) against system CAs.
|
||||
const finalArgs = [...args, "--cert", getCaCertPath()];
|
||||
// If the user already provided --cert, respect their choice and do not override.
|
||||
// Support both "--cert <path>" and "--cert=<path>" forms.
|
||||
const hasUserCert = args.some((a, i) => {
|
||||
if (a === "--cert") return true;
|
||||
return typeof a === "string" && a.startsWith("--cert=");
|
||||
});
|
||||
|
||||
// By default, pass --cert with our CA so pip trusts our MITM for known registries.
|
||||
// Note: pip treats --cert as the CA bundle to use for TLS (it does not merge with system CAs).
|
||||
const finalArgs = hasUserCert ? [...args] : [...args, "--cert", getCaCertPath()];
|
||||
|
||||
const result = await safeSpawn(command, finalArgs, {
|
||||
stdio: "inherit",
|
||||
|
|
|
|||
|
|
@ -60,4 +60,28 @@ describe("runPipCommand --cert handling", () => {
|
|||
assert.strictEqual(capturedArgs.args[0], "install");
|
||||
assert.strictEqual(capturedArgs.args[1], "requests");
|
||||
});
|
||||
|
||||
it("should not override user-provided --cert <path>", async () => {
|
||||
const res = await runPip("pip3", ["install", "requests", "--cert", "/tmp/user-ca.pem"]);
|
||||
assert.strictEqual(res.status, 0);
|
||||
|
||||
// Ensure only the user-provided --cert is present
|
||||
const certIndices = capturedArgs.args
|
||||
.map((a, i) => (a === "--cert" ? i : -1))
|
||||
.filter((i) => i >= 0);
|
||||
assert.strictEqual(certIndices.length, 1, "should not inject an extra --cert");
|
||||
const userPath = capturedArgs.args[certIndices[0] + 1];
|
||||
assert.strictEqual(userPath, "/tmp/user-ca.pem", "should preserve user-provided cert path");
|
||||
});
|
||||
|
||||
it("should not override user-provided --cert=<path>", async () => {
|
||||
const res = await runPip("pip3", ["install", "requests", "--cert=/tmp/user-ca.pem"]);
|
||||
assert.strictEqual(res.status, 0);
|
||||
|
||||
// Ensure args contain the inline --cert=<path> and no extra --cert token
|
||||
const hasInline = capturedArgs.args.some((a) => typeof a === "string" && a.startsWith("--cert="));
|
||||
assert.ok(hasInline, "should keep inline --cert=<path>");
|
||||
const injectedIndex = capturedArgs.args.indexOf("--cert");
|
||||
assert.strictEqual(injectedIndex, -1, "should not inject separate --cert when inline is provided");
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue