From 61a53b24fd92de1b6c3bbd8c603ba6d782e11693 Mon Sep 17 00:00:00 2001 From: Reinier Criel Date: Thu, 6 Nov 2025 13:24:00 -0800 Subject: [PATCH] Some cleanup --- packages/safe-chain/bin/aikido-pip.js | 1 - packages/safe-chain/src/packagemanager/pip/pipSettings.js | 1 - packages/safe-chain/src/packagemanager/pip/runPipCommand.js | 4 ++-- packages/safe-chain/src/registryProxy/registryProxy.js | 1 + packages/safe-chain/src/shell-integration/setup-ci.js | 2 -- .../src/shell-integration/startup-scripts/init-posix.sh | 1 + test/e2e/Dockerfile | 1 - 7 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/safe-chain/bin/aikido-pip.js b/packages/safe-chain/bin/aikido-pip.js index 59951ed..39184f0 100755 --- a/packages/safe-chain/bin/aikido-pip.js +++ b/packages/safe-chain/bin/aikido-pip.js @@ -1,6 +1,5 @@ #!/usr/bin/env node - import { main } from "../src/main.js"; import { initializePackageManager } from "../src/packagemanager/currentPackageManager.js"; import { setEcoSystem, ECOSYSTEM_PY } from "../src/config/settings.js"; diff --git a/packages/safe-chain/src/packagemanager/pip/pipSettings.js b/packages/safe-chain/src/packagemanager/pip/pipSettings.js index 2b2f6ad..5e47644 100644 --- a/packages/safe-chain/src/packagemanager/pip/pipSettings.js +++ b/packages/safe-chain/src/packagemanager/pip/pipSettings.js @@ -1,4 +1,3 @@ -// Constant for pip package manager name export const PIP_PACKAGE_MANAGER = "pip"; // Enum of possible Python/pip invocations for Safe Chain interception diff --git a/packages/safe-chain/src/packagemanager/pip/runPipCommand.js b/packages/safe-chain/src/packagemanager/pip/runPipCommand.js index 058f38f..793302d 100644 --- a/packages/safe-chain/src/packagemanager/pip/runPipCommand.js +++ b/packages/safe-chain/src/packagemanager/pip/runPipCommand.js @@ -26,11 +26,11 @@ export async function runPip(command, args) { }); return { status: result.status }; } catch (/** @type any */ error) { - ui.writeError(`Error executing command: ${error.message}`); - ui.writeError(`Is '${command}' installed and available on your system?`); if (error.status) { return { status: error.status }; } else { + ui.writeError(`Error executing command: ${error.message}`); + ui.writeError(`Is '${command}' installed and available on your system?`); return { status: 1 }; } } diff --git a/packages/safe-chain/src/registryProxy/registryProxy.js b/packages/safe-chain/src/registryProxy/registryProxy.js index 3344e8f..c5e272b 100644 --- a/packages/safe-chain/src/registryProxy/registryProxy.js +++ b/packages/safe-chain/src/registryProxy/registryProxy.js @@ -145,6 +145,7 @@ function handleConnect(req, clientSocket, head) { if (isKnownRegistry) { mitmConnect(req, clientSocket, isAllowedUrl); } else { + // For other hosts, just tunnel the request to the destination tcp socket ui.writeVerbose(`Safe-chain: Tunneling request to ${req.url}`); tunnelRequest(req, clientSocket, head); } diff --git a/packages/safe-chain/src/shell-integration/setup-ci.js b/packages/safe-chain/src/shell-integration/setup-ci.js index 926386d..8793832 100644 --- a/packages/safe-chain/src/shell-integration/setup-ci.js +++ b/packages/safe-chain/src/shell-integration/setup-ci.js @@ -71,8 +71,6 @@ function createUnixShims(shimsDir) { ); } - - /** * @param {string} shimsDir * diff --git a/packages/safe-chain/src/shell-integration/startup-scripts/init-posix.sh b/packages/safe-chain/src/shell-integration/startup-scripts/init-posix.sh index d78b9a4..278b31a 100644 --- a/packages/safe-chain/src/shell-integration/startup-scripts/init-posix.sh +++ b/packages/safe-chain/src/shell-integration/startup-scripts/init-posix.sh @@ -21,6 +21,7 @@ function wrapSafeChainCommand() { else # If the aikido command is not available, print a warning and run the original command printSafeChainWarning "$original_cmd" + command "$original_cmd" "$@" fi } diff --git a/test/e2e/Dockerfile b/test/e2e/Dockerfile index 778924a..6c9743e 100644 --- a/test/e2e/Dockerfile +++ b/test/e2e/Dockerfile @@ -50,7 +50,6 @@ RUN volta install pnpm@${PNPM_VERSION} # Install Bun RUN curl -fsSL https://bun.sh/install | bash - # Install Python and pip (pip3) RUN apt-get update && apt-get install -y python${PYTHON_VERSION} python3-pip && \ ln -sf /usr/bin/python${PYTHON_VERSION} /usr/local/bin/python3 && \