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

Handle process exit better + some PR cleanup

Browse source
This commit is contained in:
Sander Declerck 2025-10-01 08:53:56 +02:00
parent bf97f089ca
commit 67304751bd
No known key found for this signature in database
8 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/safe-chain/bin/aikido-npm.js
View file

@ -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 {

4
packages/safe-chain/bin/aikido-npx.js
View file

@ -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);

4
packages/safe-chain/bin/aikido-pnpm.js
View file

@ -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);

4
packages/safe-chain/bin/aikido-pnpx.js
View file

@ -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);

4
packages/safe-chain/bin/aikido-yarn.js
View file

@ -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);

2
packages/safe-chain/src/main.js
View file

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

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

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

6
packages/safe-chain/src/registryProxy/registryProxy.js
View file

@ -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;
}