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

Implement pnpm and pnpx support

Browse source
This commit is contained in:
Sander Declerck 2025-07-17 10:08:49 +02:00
parent 21cdefadde
commit f10749923a
No known key found for this signature in database
14 changed files with 754 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

179
src/shell-integration/teardown.spec.js
View file

@ -6,41 +6,64 @@ import { getAliases } from "./helpers.js";
import { removeAliasesFromFile } from "./teardown.js";
describe("teardown", () => {
function runRemovalTestsForEnvironment(shell, startupExtension, expectedAliases) {
function runRemovalTestsForEnvironment(
shell,
startupExtension,
expectedAliases
) {
describe(`${shell} shell removal`, () => {
it(`should remove aliases from ${shell} file`, () => {
const lines = [`#!/usr/bin/env ${shell}`, "", ...expectedAliases, ""];
const filePath = createShellStartupScript(lines, startupExtension);
// Test the removeAliasesFromFile function directly
const aliases = getAliases(filePath);
const fileContent = fs.readFileSync(filePath, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 3, "Should remove 3 aliases");
assert.strictEqual(
result.removedCount,
expectedAliases.length,
"Should remove all aliases"
);
assert.strictEqual(result.notFoundCount, 0, "Should find all aliases");
const updatedContent = readAndDeleteFile(filePath);
for (const alias of expectedAliases) {
assert.ok(!updatedContent.includes(alias), `Alias "${alias}" should be removed`);
assert.ok(
!updatedContent.includes(alias),
`Alias "${alias}" should be removed`
);
}
});
it(`should handle file with no aliases for ${shell}`, () => {
const lines = [`#!/usr/bin/env ${shell}`, "", "alias other='command'", ""];
const lines = [
`#!/usr/bin/env ${shell}`,
"",
"alias other='command'",
"",
];
const filePath = createShellStartupScript(lines, startupExtension);
const aliases = getAliases(filePath);
const fileContent = fs.readFileSync(filePath, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 0, "Should remove 0 aliases");
assert.strictEqual(result.notFoundCount, 3, "Should report 3 aliases not found");
assert.strictEqual(
result.notFoundCount,
expectedAliases.length,
"Should report all aliases not found"
);
const updatedContent = readAndDeleteFile(filePath);
assert.ok(updatedContent.includes("alias other='command'"), "Other aliases should remain unchanged");
assert.ok(
updatedContent.includes("alias other='command'"),
"Other aliases should remain unchanged"
);
});
it(`should remove duplicate aliases from ${shell} file`, () => {
@ -50,33 +73,51 @@ describe("teardown", () => {
...expectedAliases,
"alias other='command'",
...expectedAliases, // duplicates
""
"",
];
const filePath = createShellStartupScript(lines, startupExtension);
const aliases = getAliases(filePath);
const fileContent = fs.readFileSync(filePath, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 3, "Should remove 3 aliases (counting duplicates as single removal)");
assert.strictEqual(
result.removedCount,
expectedAliases.length,
"Should remove all aliases (counting duplicates as single removal)"
);
assert.strictEqual(result.notFoundCount, 0, "Should find all aliases");
const updatedContent = readAndDeleteFile(filePath);
for (const alias of expectedAliases) {
assert.ok(!updatedContent.includes(alias), `Alias "${alias}" should be completely removed`);
assert.ok(
!updatedContent.includes(alias),
`Alias "${alias}" should be completely removed`
);
}
assert.ok(updatedContent.includes("alias other='command'"), "Other aliases should remain");
assert.ok(
updatedContent.includes("alias other='command'"),
"Other aliases should remain"
);
});
it(`should use real getAliases() for ${shell} file`, () => {
const filePath = `${tmpdir()}/test${startupExtension}`;
const aliases = getAliases(filePath);
// Verify we get the expected aliases for this shell type
assert.strictEqual(aliases.length, 3, "Should get 3 aliases (npm, npx, yarn)");
assert.strictEqual(
aliases.length,
expectedAliases.length,
"Should get all aliases (npm, npx, yarn)"
);
for (let i = 0; i < aliases.length; i++) {
assert.strictEqual(aliases[i], expectedAliases[i], `Alias ${i} should match expected format`);
assert.strictEqual(
aliases[i],
expectedAliases[i],
`Alias ${i} should match expected format`
);
}
});
@ -86,21 +127,31 @@ describe("teardown", () => {
"",
expectedAliases[0], // Only first alias
"alias other='command'",
""
"",
];
const filePath = createShellStartupScript(lines, startupExtension);
const aliases = getAliases(filePath);
const fileContent = fs.readFileSync(filePath, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 1, "Should remove 1 alias");
assert.strictEqual(result.notFoundCount, 2, "Should report 2 aliases not found");
assert.strictEqual(
result.notFoundCount,
expectedAliases.length - 1,
"Should report all aliases not found"
);
const updatedContent = readAndDeleteFile(filePath);
assert.ok(!updatedContent.includes(expectedAliases[0]), "First alias should be removed");
assert.ok(updatedContent.includes("alias other='command'"), "Other aliases should remain");
assert.ok(
!updatedContent.includes(expectedAliases[0]),
"First alias should be removed"
);
assert.ok(
updatedContent.includes("alias other='command'"),
"Other aliases should remain"
);
});
});
}
@ -109,39 +160,57 @@ describe("teardown", () => {
runRemovalTestsForEnvironment("bash", ".bashrc", [
"alias npm='aikido-npm'",
"alias npx='aikido-npx'",
"alias yarn='aikido-yarn'"
"alias yarn='aikido-yarn'",
"alias pnpm='aikido-pnpm'",
"alias pnpx='aikido-pnpx'",
]);
runRemovalTestsForEnvironment("zsh", ".zshrc", [
"alias npm='aikido-npm'",
"alias npx='aikido-npx'",
"alias yarn='aikido-yarn'"
"alias yarn='aikido-yarn'",
"alias pnpm='aikido-pnpm'",
"alias pnpx='aikido-pnpx'",
]);
runRemovalTestsForEnvironment("fish", ".fish", [
'alias npm "aikido-npm"',
'alias npx "aikido-npx"',
'alias yarn "aikido-yarn"'
'alias yarn "aikido-yarn"',
'alias pnpm "aikido-pnpm"',
'alias pnpx "aikido-pnpx"',
]);
runRemovalTestsForEnvironment("pwsh", ".ps1", [
"Set-Alias npm aikido-npm",
"Set-Alias npx aikido-npx",
"Set-Alias yarn aikido-yarn"
"Set-Alias yarn aikido-yarn",
"Set-Alias pnpm aikido-pnpm",
"Set-Alias pnpx aikido-pnpx",
]);
describe("removeAliasesFromFile edge cases", () => {
it("should handle empty file", () => {
const aliases = ["alias npm='aikido-npm'"];
const fileContent = "";
const filePath = `${tmpdir()}/test-${Math.random().toString(36).substring(2, 15)}.bashrc`;
const filePath = `${tmpdir()}/test-${Math.random()
.toString(36)
.substring(2, 15)}.bashrc`;
fs.writeFileSync(filePath, fileContent, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 0, "Should remove 0 aliases from empty file");
assert.strictEqual(result.notFoundCount, 1, "Should report 1 alias not found");
assert.strictEqual(
result.removedCount,
0,
"Should remove 0 aliases from empty file"
);
assert.strictEqual(
result.notFoundCount,
1,
"Should report 1 alias not found"
);
// Cleanup
fs.rmSync(filePath, { force: true });
});
@ -149,14 +218,24 @@ describe("teardown", () => {
it("should handle file with only whitespace", () => {
const aliases = ["alias npm='aikido-npm'"];
const fileContent = `${EOL}${EOL} ${EOL}`;
const filePath = `${tmpdir()}/test-${Math.random().toString(36).substring(2, 15)}.bashrc`;
const filePath = `${tmpdir()}/test-${Math.random()
.toString(36)
.substring(2, 15)}.bashrc`;
fs.writeFileSync(filePath, fileContent, "utf-8");
const result = removeAliasesFromFile(aliases, fileContent, filePath);
assert.strictEqual(result.removedCount, 0, "Should remove 0 aliases from whitespace-only file");
assert.strictEqual(result.notFoundCount, 1, "Should report 1 alias not found");
assert.strictEqual(
result.removedCount,
0,
"Should remove 0 aliases from whitespace-only file"
);
assert.strictEqual(
result.notFoundCount,
1,
"Should report 1 alias not found"
);
// Cleanup
fs.rmSync(filePath, { force: true });
});
@ -174,4 +253,4 @@ function readAndDeleteFile(filePath) {
const fileContent = fs.readFileSync(filePath, "utf-8");
fs.rmSync(filePath, { force: true });
return fileContent.split(EOL);
}
}