milliways-infosec/AikidoSec-safe-chain
7
0
Fork 0
mirror of https://github.com/AikidoSec/safe-chain.git synced 2026-05-26 12:10:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some more cleanup

Browse source
This commit is contained in:
Reinier Criel 2025-11-13 15:50:14 -08:00
parent 474d91d29a
commit 0b3cc1c175
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
packages/safe-chain/src/packagemanager/pip/runPipCommand.js
View file

@ -23,20 +23,8 @@ 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();
if (!env.REQUESTS_CA_BUNDLE) { // https://pip.pypa.io/en/stable/topics/https-certificates/ explains that the --cert option (which we're providing via INI file)
env.REQUESTS_CA_BUNDLE = combinedCaPath; // will tell pip to use the provided CA bundle for HTTPS verification.
}
// https://pip.pypa.io/en/stable/topics/https-certificates/ explains that the --cert option (which we're providing via both INI and PIP_CERT)
// Testing has shown that REQUESTS_CA_BUNDLE alone is not sufficient; PIP_CERT, SSL_CERT_FILE, or pip config cert is also needed in some cases.
if (!env.SSL_CERT_FILE) {
env.SSL_CERT_FILE = combinedCaPath;
}
if (!env.PIP_CERT) {
env.PIP_CERT = combinedCaPath;
}
// Proxy settings: prefer GLOBAL_AGENT_HTTP_PROXY, then HTTPS_PROXY, then HTTP_PROXY // Proxy settings: prefer GLOBAL_AGENT_HTTP_PROXY, then HTTPS_PROXY, then HTTP_PROXY
const proxy = env.GLOBAL_AGENT_HTTP_PROXY || env.HTTPS_PROXY || env.HTTP_PROXY || ''; const proxy = env.GLOBAL_AGENT_HTTP_PROXY || env.HTTPS_PROXY || env.HTTP_PROXY || '';
@ -45,7 +33,6 @@ 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`);
if (!env.PIP_CONFIG_FILE) { if (!env.PIP_CONFIG_FILE) {
// Build pip config INI // Build pip config INI
/** @type {{ global: { cert: string, proxy?: string } }} */ /** @type {{ global: { cert: string, proxy?: string } }} */
const configObj = { global: { cert: combinedCaPath } }; const configObj = { global: { cert: combinedCaPath } };
@ -55,6 +42,7 @@ export async function runPip(command, args) {
const pipConfig = ini.stringify(configObj); const pipConfig = ini.stringify(configObj);
await fs.writeFile(pipConfigPath, pipConfig); await fs.writeFile(pipConfigPath, pipConfig);
env.PIP_CONFIG_FILE = pipConfigPath; env.PIP_CONFIG_FILE = pipConfigPath;
} else if (fsSync.existsSync(env.PIP_CONFIG_FILE)) { } else if (fsSync.existsSync(env.PIP_CONFIG_FILE)) {
// Existing pip config file present and exists on disk. // Existing pip config file present and exists on disk.
// Lets merge in our cert and proxy settings if not already present // Lets merge in our cert and proxy settings if not already present
@ -72,18 +60,17 @@ export async function runPip(command, args) {
// Adding CERT and PROXY // Adding CERT and PROXY
// If either is already set, there's no neeed to throw an error // If either is already set, there's no neeed to throw an error
// MITM might fail and throw later if the proxy config is invalid // MITM might fail and throw later if the proxy config is invalid
// This ensures that no malware will be installed by safe-chain
// Cert // Cert
if (typeof parsed.global.cert === "undefined") { if (typeof parsed.global.cert === "undefined") {
ui.writeVerbose("Safe-chain: Adding cert to existing PIP_CONFIG_FILE."); ui.writeVerbose("Safe-chain: Adding cert to temporary PIP_CONFIG_FILE.");
parsed.global.cert = combinedCaPath; parsed.global.cert = combinedCaPath;
} }
// Proxy // Proxy
if (typeof parsed.global.proxy === "undefined") { if (typeof parsed.global.proxy === "undefined") {
if (proxy) { if (proxy) {
ui.writeVerbose("Safe-chain: Adding proxy to existing PIP_CONFIG_FILE."); ui.writeVerbose("Safe-chain: Adding proxy to temporary PIP_CONFIG_FILE.");
parsed.global.proxy = proxy; parsed.global.proxy = proxy;
} }
} }
@ -93,6 +80,21 @@ export async function runPip(command, args) {
// Save to a new temp file to avoid overwriting user's original config // Save to a new temp file to avoid overwriting user's original config
await fs.writeFile(pipConfigPath, updated, "utf-8"); await fs.writeFile(pipConfigPath, updated, "utf-8");
env.PIP_CONFIG_FILE = pipConfigPath; env.PIP_CONFIG_FILE = pipConfigPath;
} else {
// The user provided PIP_CONFIG_FILE does not exist on disk
// PIP will handle this as an error and inform the user
}
// REQUESTS_CA_BUNDLE, SSL_CERT_FILE and PIP_CERT as extra safety nets.
if (!env.REQUESTS_CA_BUNDLE) {
env.REQUESTS_CA_BUNDLE = combinedCaPath;
}
if (!env.SSL_CERT_FILE) {
env.SSL_CERT_FILE = combinedCaPath;
}
if (!env.PIP_CERT) {
env.PIP_CERT = combinedCaPath;
} }
const result = await safeSpawn(command, args, { const result = await safeSpawn(command, args, {