Handle process exit better + some PR cleanup

packages/safe-chain/bin/aikido-npm.js

@@ -6,7 +6,9 @@ import { initializePackageManager } from "../src/packagemanager/currentPackageMa
 
 const packageManagerName = "npm";
 initializePackageManager(packageManagerName, getNpmVersion());
-await main(process.argv.slice(2));
+var exitCode = await main(process.argv.slice(2));
+
+process.exit(exitCode);
 
 function getNpmVersion() {
   try {

packages/safe-chain/bin/aikido-npx.js

@@ -5,4 +5,6 @@ import { initializePackageManager } from "../src/packagemanager/currentPackageMa
 
 const packageManagerName = "npx";
 initializePackageManager(packageManagerName, process.versions.node);
-await main(process.argv.slice(2));
+var exitCode = await main(process.argv.slice(2));
+
+process.exit(exitCode);

packages/safe-chain/bin/aikido-pnpm.js

@@ -5,4 +5,6 @@ import { initializePackageManager } from "../src/packagemanager/currentPackageMa
 
 const packageManagerName = "pnpm";
 initializePackageManager(packageManagerName, process.versions.node);
-await main(process.argv.slice(2));
+var exitCode = await main(process.argv.slice(2));
+
+process.exit(exitCode);

packages/safe-chain/bin/aikido-pnpx.js

@@ -5,4 +5,6 @@ import { initializePackageManager } from "../src/packagemanager/currentPackageMa
 
 const packageManagerName = "pnpx";
 initializePackageManager(packageManagerName, process.versions.node);
-await main(process.argv.slice(2));
+var exitCode = await main(process.argv.slice(2));
+
+process.exit(exitCode);

packages/safe-chain/bin/aikido-yarn.js

@@ -5,4 +5,6 @@ import { initializePackageManager } from "../src/packagemanager/currentPackageMa
 
 const packageManagerName = "yarn";
 initializePackageManager(packageManagerName, process.versions.node);
-await main(process.argv.slice(2));
+var exitCode = await main(process.argv.slice(2));
+
+process.exit(exitCode);

packages/safe-chain/src/main.js

@@ -27,5 +27,5 @@ export async function main(args) {
   await proxy.stopServer();
   proxy.verifyNoMaliciousPackages();
 
-  process.exit(result.status);
+  return result.status;
 }

packages/safe-chain/src/packagemanager/npm/dependencyScanner/dryRunScanner.js

@@ -9,7 +9,7 @@ export function dryRunScanner(scannerOptions) {
   };
 }
 
-async function scanDependencies(scannerOptions, args) {
+function scanDependencies(scannerOptions, args) {
   let dryRunArgs = args;
 
   if (scannerOptions?.dryRunCommand) {

packages/safe-chain/src/registryProxy/registryProxy.js

@@ -42,7 +42,7 @@ export function mergeSafeChainProxyEnvironmentVariables(env) {
     const upperKey = key.toUpperCase();
 
     if (!proxyEnv[upperKey]) {
-      proxyEnv[upperKey] = env[key];
+      proxyEnv[key] = env[key];
     }
   }
 
@@ -104,7 +104,8 @@ function handleConnect(req, clientSocket, head) {
 async function isAllowedUrl(url) {
   const { packageName, version } = parsePackageFromUrl(url);
 
-  // This happens when the URL is not a tarball download url.
+  // packageName and version are undefined when the URL is not a package download
+  // In that case, we can allow the request to proceed
   if (!packageName || !version) {
     return true;
   }
@@ -123,6 +124,7 @@ async function isAllowedUrl(url) {
 
 function verifyNoMaliciousPackages() {
   if (state.blockedRequests.length === 0) {
+    // No malicious packages were blocked, so nothing to block
     return;
   }