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

update deps & remvoe archiver in favour of yazl

Browse source
This commit is contained in:
BitterPanda 2026-04-04 20:58:15 +02:00
parent 3f47ae890c
commit 86ca98645d
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -21,6 +21,6 @@
"devDependencies": { "devDependencies": {
"oxlint": "^1.22.0", "oxlint": "^1.22.0",
"esbuild": "^0.27.0", "esbuild": "^0.27.0",
"@yao-pkg/pkg": "6.10.1" "@yao-pkg/pkg": "6.14.2"
} }
} }

11
packages/safe-chain/package.json
View file

@ -38,18 +38,17 @@
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"description": "The Aikido Safe Chain wraps around the [npm cli](https://github.com/npm/cli), [npx](https://github.com/npm/cli/blob/latest/docs/content/commands/npx.md), [yarn](https://yarnpkg.com/), [pnpm](https://pnpm.io/), [pnpx](https://pnpm.io/cli/dlx), [bun](https://bun.sh/), [bunx](https://bun.sh/docs/cli/bunx), [uv](https://docs.astral.sh/uv/) (Python), and [pip](https://pip.pypa.io/) to provide extra checks before installing new packages. This tool will detect when a package contains malware and prompt you to exit, preventing npm, npx, yarn, pnpm, pnpx, bun, bunx, uv, or pip/pip3 from downloading or running the malware.", "description": "The Aikido Safe Chain wraps around the [npm cli](https://github.com/npm/cli), [npx](https://github.com/npm/cli/blob/latest/docs/content/commands/npx.md), [yarn](https://yarnpkg.com/), [pnpm](https://pnpm.io/), [pnpx](https://pnpm.io/cli/dlx), [bun](https://bun.sh/), [bunx](https://bun.sh/docs/cli/bunx), [uv](https://docs.astral.sh/uv/) (Python), and [pip](https://pip.pypa.io/) to provide extra checks before installing new packages. This tool will detect when a package contains malware and prompt you to exit, preventing npm, npx, yarn, pnpm, pnpx, bun, bunx, uv, or pip/pip3 from downloading or running the malware.",
"dependencies": { "dependencies": {
"archiver": "^7.0.1",
"certifi": "14.5.15", "certifi": "14.5.15",
"chalk": "5.4.1", "chalk": "5.6.2",
"https-proxy-agent": "7.0.6", "https-proxy-agent": "7.0.6",
"ini": "6.0.0", "ini": "6.0.0",
"make-fetch-happen": "15.0.3", "make-fetch-happen": "15.0.5",
"node-forge": "1.3.2", "node-forge": "1.4.0",
"npm-registry-fetch": "19.1.1", "npm-registry-fetch": "19.1.1",
"semver": "7.7.2" "semver": "7.7.4",
"yazl": "3.3.1"
}, },
"devDependencies": { "devDependencies": {
"@types/archiver": "^7.0.0",
"@types/ini": "^4.1.1", "@types/ini": "^4.1.1",
"@types/make-fetch-happen": "^10.0.4", "@types/make-fetch-happen": "^10.0.4",
"@types/node": "^18.19.130", "@types/node": "^18.19.130",

22
packages/safe-chain/src/ultimate/ultimateTroubleshooting.js
View file

@ -2,9 +2,9 @@ import { platform } from 'os';
import { ui } from "../environment/userInteraction.js"; import { ui } from "../environment/userInteraction.js";
import { readFileSync, existsSync } from "node:fs"; import { readFileSync, existsSync } from "node:fs";
import {randomUUID} from "node:crypto"; import {randomUUID} from "node:crypto";
import {createWriteStream} from "fs"; import {createWriteStream, readdirSync, statSync} from "fs";
import archiver from 'archiver';
import path from "node:path"; import path from "node:path";
import yazl from "yazl";
export async function printUltimateLogs() { export async function printUltimateLogs() {
const { proxyLogPath, ultimateLogPath, proxyErrLogPath, ultimateErrLogPath } = getPathsPerPlatform(); const { proxyLogPath, ultimateLogPath, proxyErrLogPath, ultimateErrLogPath } = getPathsPerPlatform();
@ -34,22 +34,28 @@ export async function troubleshootingExport() {
const date = new Date().toISOString().split('T')[0]; const date = new Date().toISOString().split('T')[0];
const uuid = randomUUID(); const uuid = randomUUID();
const zipFileName = `safechain-ultimate-${date}-${uuid}.zip`; const zipFileName = `safechain-ultimate-${date}-${uuid}.zip`;
const zipfile = new yazl.ZipFile();
const entries = readdirSync(logDir);
for (const entry of entries) {
const fullPath = path.join(logDir, entry);
if (statSync(fullPath).isFile()) {
zipfile.addFile(fullPath, entry);
}
}
zipfile.end();
const output = createWriteStream(zipFileName); const output = createWriteStream(zipFileName);
const archive = archiver('zip', { zlib: { level: 9 } }); zipfile.outputStream.pipe(output);
output.on('close', () => { output.on('close', () => {
ui.writeInformation(`Logs collected and zipped as: ${path.resolve(zipFileName)}`); ui.writeInformation(`Logs collected and zipped as: ${path.resolve(zipFileName)}`);
resolve(zipFileName); resolve(zipFileName);
}); });
archive.on('error', (/** @type {Error} */ err) => { output.on('error', (/** @type {Error} */ err) => {
ui.writeError(`Failed to zip logs: ${err.message}`); ui.writeError(`Failed to zip logs: ${err.message}`);
reject(err); reject(err);
}); });
archive.pipe(output);
archive.directory(logDir, false);
archive.finalize();
}); });
} }