mirror of
https://github.com/AikidoSec/safe-chain.git
synced 2026-05-26 20:20:49 +00:00
Merge pull request #198 from AikidoSec/bug/pip-config
For config-related commands, don't inject custom config, to allow persistent config/cache access
This commit is contained in:
commit
d782ca68af
3 changed files with 325 additions and 0 deletions
|
|
@ -46,6 +46,9 @@ function setFallbackCaBundleEnvironmentVariables(env, combinedCaPath) {
|
||||||
* If the user has an existing PIP_CONFIG_FILE, a new temporary config is created that merges
|
* If the user has an existing PIP_CONFIG_FILE, a new temporary config is created that merges
|
||||||
* their settings with safe-chain's, leaving the original file unchanged.
|
* their settings with safe-chain's, leaving the original file unchanged.
|
||||||
*
|
*
|
||||||
|
* Special handling for commands that modify config/cache/state: PIP_CONFIG_FILE is NOT overridden to allow
|
||||||
|
* users to read/write persistent config. Only CA environment variables are set for these commands.
|
||||||
|
*
|
||||||
* @param {string} command - The pip command to execute (e.g., 'pip3')
|
* @param {string} command - The pip command to execute (e.g., 'pip3')
|
||||||
* @param {string[]} args - Command line arguments to pass to pip
|
* @param {string[]} args - Command line arguments to pass to pip
|
||||||
* @returns {Promise<{status: number}>} Exit status of the pip command
|
* @returns {Promise<{status: number}>} Exit status of the pip command
|
||||||
|
|
@ -59,6 +62,12 @@ export async function runPip(command, args) {
|
||||||
// validates correctly under both MITM'd and tunneled HTTPS.
|
// validates correctly under both MITM'd and tunneled HTTPS.
|
||||||
const combinedCaPath = getCombinedCaBundlePath();
|
const combinedCaPath = getCombinedCaBundlePath();
|
||||||
|
|
||||||
|
// Commands that need access to persistent config/cache/state files
|
||||||
|
// These should not have PIP_CONFIG_FILE overridden as it would prevent them from
|
||||||
|
// reading/writing to the user's actual pip configuration and cache directories
|
||||||
|
const configRelatedCommands = ['config', 'cache', 'debug', 'completion'];
|
||||||
|
const isConfigRelatedCommand = args.length > 0 && configRelatedCommands.includes(args[0]);
|
||||||
|
|
||||||
// https://pip.pypa.io/en/stable/topics/https-certificates/ explains that the 'cert' param (which we're providing via INI file)
|
// https://pip.pypa.io/en/stable/topics/https-certificates/ explains that the 'cert' param (which we're providing via INI file)
|
||||||
// will tell pip to use the provided CA bundle for HTTPS verification.
|
// will tell pip to use the provided CA bundle for HTTPS verification.
|
||||||
|
|
||||||
|
|
@ -70,6 +79,22 @@ export async function runPip(command, args) {
|
||||||
const pipConfigPath = path.join(tmpDir, `safe-chain-pip-${Date.now()}.ini`);
|
const pipConfigPath = path.join(tmpDir, `safe-chain-pip-${Date.now()}.ini`);
|
||||||
let cleanupConfigPath = null; // Track temp file for cleanup
|
let cleanupConfigPath = null; // Track temp file for cleanup
|
||||||
|
|
||||||
|
if (isConfigRelatedCommand) {
|
||||||
|
ui.writeVerbose(`Safe-chain: Skipping PIP_CONFIG_FILE override for 'pip ${args[0]}' command to allow persistent config/cache access.`);
|
||||||
|
|
||||||
|
// Still set the fallback CA bundle environment variables to avoid edge cases where a
|
||||||
|
// plugin or extension triggers a network call during config introspection
|
||||||
|
// This can do no harm
|
||||||
|
setFallbackCaBundleEnvironmentVariables(env, combinedCaPath);
|
||||||
|
|
||||||
|
const result = await safeSpawn(command, args, {
|
||||||
|
stdio: "inherit",
|
||||||
|
env,
|
||||||
|
});
|
||||||
|
|
||||||
|
return { status: result.status };
|
||||||
|
}
|
||||||
|
|
||||||
// Note: Setting PIP_CONFIG_FILE overrides all pip config levels (Global/User/Site) per pip's loading order
|
// Note: Setting PIP_CONFIG_FILE overrides all pip config levels (Global/User/Site) per pip's loading order
|
||||||
if (!env.PIP_CONFIG_FILE) {
|
if (!env.PIP_CONFIG_FILE) {
|
||||||
/** @type {{ global: { cert: string, proxy?: string } }} */
|
/** @type {{ global: { cert: string, proxy?: string } }} */
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,103 @@ describe("runPipCommand environment variable handling", () => {
|
||||||
mock.reset();
|
mock.reset();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip config' commands to allow persistent config access", async () => {
|
||||||
|
const res = await runPip("pip3", ["config", "set", "global.index-url", "https://test.pypi.org/simple"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
// PIP_CONFIG_FILE should NOT be set for config commands
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip config commands"
|
||||||
|
);
|
||||||
|
|
||||||
|
// But CA environment variables should still be set
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.REQUESTS_CA_BUNDLE,
|
||||||
|
"/tmp/test-combined-ca.pem",
|
||||||
|
"REQUESTS_CA_BUNDLE should still be set"
|
||||||
|
);
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.SSL_CERT_FILE,
|
||||||
|
"/tmp/test-combined-ca.pem",
|
||||||
|
"SSL_CERT_FILE should still be set"
|
||||||
|
);
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CERT,
|
||||||
|
"/tmp/test-combined-ca.pem",
|
||||||
|
"PIP_CERT should still be set"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip config get' commands", async () => {
|
||||||
|
const res = await runPip("pip3", ["config", "get", "global.index-url"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip config get"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip config list' commands", async () => {
|
||||||
|
const res = await runPip("pip3", ["config", "list"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip config list"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip cache' commands", async () => {
|
||||||
|
const res = await runPip("pip3", ["cache", "dir"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip cache commands"
|
||||||
|
);
|
||||||
|
|
||||||
|
// CA env vars should still be set
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.SSL_CERT_FILE,
|
||||||
|
"/tmp/test-combined-ca.pem",
|
||||||
|
"SSL_CERT_FILE should still be set"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip debug' commands", async () => {
|
||||||
|
const res = await runPip("pip3", ["debug"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip debug"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should NOT set PIP_CONFIG_FILE for 'pip completion' commands", async () => {
|
||||||
|
const res = await runPip("pip3", ["completion", "--bash"]);
|
||||||
|
assert.strictEqual(res.status, 0);
|
||||||
|
assert.ok(capturedArgs, "safeSpawn should have been called");
|
||||||
|
|
||||||
|
assert.strictEqual(
|
||||||
|
capturedArgs.options.env.PIP_CONFIG_FILE,
|
||||||
|
undefined,
|
||||||
|
"PIP_CONFIG_FILE should NOT be set for pip completion"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it("should set PIP_CERT env var and create config file", async () => {
|
it("should set PIP_CERT env var and create config file", async () => {
|
||||||
const res = await runPip("pip3", ["install", "requests"]);
|
const res = await runPip("pip3", ["install", "requests"]);
|
||||||
assert.strictEqual(res.status, 0);
|
assert.strictEqual(res.status, 0);
|
||||||
|
|
|
||||||
|
|
@ -336,4 +336,207 @@ describe("E2E: pip coverage", () => {
|
||||||
`Output did not include expected text. Output was:\n${result.output}`
|
`Output did not include expected text. Output was:\n${result.output}`
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it(`pip3 config set should work and persist configuration`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Set a config value
|
||||||
|
const setResult = await shell.runCommand(
|
||||||
|
"pip3 config set global.timeout 60"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
setResult.output.includes("Writing to"),
|
||||||
|
`pip3 config set should write config. Output was:\n${setResult.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Verify it was persisted by reading it back
|
||||||
|
const getResult = await shell.runCommand(
|
||||||
|
"pip3 config get global.timeout"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
getResult.output.includes("60"),
|
||||||
|
`Config value should be 60. Output was:\n${getResult.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 config list should show user configuration`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Set a value first
|
||||||
|
await shell.runCommand("pip3 config set global.timeout 90");
|
||||||
|
|
||||||
|
// List config
|
||||||
|
const listResult = await shell.runCommand("pip3 config list");
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
listResult.output.includes("timeout") && listResult.output.includes("90"),
|
||||||
|
`Config list should show timeout=90. Output was:\n${listResult.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 config unset should remove configuration`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Set a value
|
||||||
|
await shell.runCommand("pip3 config set global.timeout 120");
|
||||||
|
|
||||||
|
// Verify it exists
|
||||||
|
const getResult = await shell.runCommand("pip3 config get global.timeout");
|
||||||
|
assert.ok(getResult.output.includes("120"));
|
||||||
|
|
||||||
|
// Unset it
|
||||||
|
const unsetResult = await shell.runCommand("pip3 config unset global.timeout");
|
||||||
|
assert.ok(
|
||||||
|
unsetResult.output.includes("Writing to"),
|
||||||
|
`pip3 config unset should write config. Output was:\n${unsetResult.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 cache dir should return cache directory path`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
const result = await shell.runCommand("pip3 cache dir");
|
||||||
|
|
||||||
|
// Should output a directory path
|
||||||
|
assert.ok(
|
||||||
|
result.output.includes("/") && result.output.includes("cache"),
|
||||||
|
`Should output a cache directory path. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 cache info should show cache information`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Install something first to populate cache
|
||||||
|
await shell.runCommand("pip3 install --break-system-packages certifi");
|
||||||
|
|
||||||
|
const result = await shell.runCommand("pip3 cache info");
|
||||||
|
|
||||||
|
// Output should contain cache-related information
|
||||||
|
assert.ok(
|
||||||
|
result.output.match(/cache|wheel|http/i),
|
||||||
|
`Should output cache information. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 cache list should list cached packages`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Download a package to ensure something is in cache
|
||||||
|
await shell.runCommand("pip3 download certifi");
|
||||||
|
|
||||||
|
const result = await shell.runCommand("pip3 cache list certifi");
|
||||||
|
|
||||||
|
// Should show either cached wheels or "No locally built wheels"
|
||||||
|
assert.ok(
|
||||||
|
result.output.includes("certifi") || result.output.includes("No locally built"),
|
||||||
|
`Should output cache list information. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 debug should output debug information`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
const result = await shell.runCommand("pip3 debug");
|
||||||
|
|
||||||
|
// Should contain debug information about pip environment
|
||||||
|
assert.ok(
|
||||||
|
result.output.match(/pip version|sys\.version|sys\.executable/i),
|
||||||
|
`Should output debug information. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Should NOT show safe-chain's temporary config file in the debug output
|
||||||
|
assert.ok(
|
||||||
|
!result.output.includes("safe-chain-pip-"),
|
||||||
|
`Debug output should not reference safe-chain temp config. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 completion should generate shell completion script`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
const result = await shell.runCommand("pip3 completion --zsh");
|
||||||
|
|
||||||
|
// Should output shell completion code
|
||||||
|
assert.ok(
|
||||||
|
result.output.includes("compdef") || result.output.includes("_pip") || result.output.includes("pip completion"),
|
||||||
|
`Should output completion code. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 install still works after config operations`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Perform config operations
|
||||||
|
await shell.runCommand("pip3 config set global.timeout 60");
|
||||||
|
await shell.runCommand("pip3 cache dir");
|
||||||
|
|
||||||
|
// Now install should still work with malware protection
|
||||||
|
const result = await shell.runCommand(
|
||||||
|
"pip3 install --break-system-packages certifi"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
result.output.includes("Successfully installed") ||
|
||||||
|
result.output.includes("Requirement already satisfied"),
|
||||||
|
`Install should succeed after config operations. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
result.output.includes("no malware found."),
|
||||||
|
`Should still scan for malware. Output was:\n${result.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it(`pip3 download works after configuring pip settings`, async () => {
|
||||||
|
const shell = await container.openShell("zsh");
|
||||||
|
|
||||||
|
// Configure pip with timeout and extra index URL
|
||||||
|
const configTimeout = await shell.runCommand("pip3 config set global.timeout 60");
|
||||||
|
assert.ok(
|
||||||
|
configTimeout.output.includes("Writing to"),
|
||||||
|
`Config set should succeed. Output was:\n${configTimeout.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
const configIndex = await shell.runCommand(
|
||||||
|
"pip3 config set global.extra-index-url https://pypi.org/simple"
|
||||||
|
);
|
||||||
|
assert.ok(
|
||||||
|
configIndex.output.includes("Writing to"),
|
||||||
|
`Config set should succeed. Output was:\n${configIndex.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Verify config persisted
|
||||||
|
const listConfig = await shell.runCommand("pip3 config list");
|
||||||
|
assert.ok(
|
||||||
|
listConfig.output.includes("timeout") && listConfig.output.includes("60"),
|
||||||
|
`Config should show timeout=60. Output was:\n${listConfig.output}`
|
||||||
|
);
|
||||||
|
assert.ok(
|
||||||
|
listConfig.output.includes("extra-index-url") && listConfig.output.includes("pypi.org"),
|
||||||
|
`Config should show extra-index-url. Output was:\n${listConfig.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Now download packages with the configured settings
|
||||||
|
const downloadResult = await shell.runCommand(
|
||||||
|
"pip3 download -d /tmp/packages requests certifi"
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
downloadResult.output.includes("no malware found."),
|
||||||
|
`Should scan for malware. Output was:\n${downloadResult.output}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Verify downloads succeeded
|
||||||
|
assert.ok(
|
||||||
|
downloadResult.output.includes("Saved") || downloadResult.output.includes("requests"),
|
||||||
|
`Download should succeed with configured settings. Output was:\n${downloadResult.output}`
|
||||||
|
);
|
||||||
|
assert.ok(
|
||||||
|
downloadResult.output.includes("certifi"),
|
||||||
|
`Should download certifi. Output was:\n${downloadResult.output}`
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue