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

Don't remove empty lines in shell startup scripts. Fixes #58

Browse source
This commit is contained in:
Sander Declerck 2025-09-17 16:42:10 +02:00
parent 846c62e4e0
commit 57ce17e7f5
No known key found for this signature in database
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/safe-chain/src/shell-integration/helpers.js
View file

@ -28,7 +28,7 @@ export function removeLinesMatchingPattern(filePath, pattern) {
} }
const fileContent = fs.readFileSync(filePath, "utf-8"); const fileContent = fs.readFileSync(filePath, "utf-8");
const lines = fileContent.split(/[\r\n\u2028\u2029]+/); const lines = fileContent.split(/[\r\n\u2028\u2029]/);
const updatedLines = lines.filter((line) => !shouldRemoveLine(line, pattern)); const updatedLines = lines.filter((line) => !shouldRemoveLine(line, pattern));
fs.writeFileSync(filePath, updatedLines.join(os.EOL), "utf-8"); fs.writeFileSync(filePath, updatedLines.join(os.EOL), "utf-8");
} }
@ -43,12 +43,17 @@ function shouldRemoveLine(line, pattern) {
if (line.length > maxLineLength) { if (line.length > maxLineLength) {
// safe-chain only adds lines shorter than maxLineLength // safe-chain only adds lines shorter than maxLineLength
// so if the line is longer, it must be from a different // so if the line is longer, it must be from a different
// source and could be dangerous to remove // source and could be dangerous to remove
return false; return false;
} }
if (line.includes("\n") || line.includes("\r") || line.includes("\u2028") || line.includes("\u2029")) { if (
line.includes("\n") ||
line.includes("\r") ||
line.includes("\u2028") ||
line.includes("\u2029")
) {
// If the line contains newlines, something has gone wrong in splitting // If the line contains newlines, something has gone wrong in splitting
// \u2028 and \u2029 are Unicode line separator characters (line and paragraph separators) // \u2028 and \u2029 are Unicode line separator characters (line and paragraph separators)
return false; return false;

19
packages/safe-chain/src/shell-integration/supported-shells/zsh.spec.js
View file

@ -222,5 +222,24 @@ describe("Zsh shell integration", () => {
); );
assert.ok(content.includes("alias ls=")); assert.ok(content.includes("alias ls="));
}); });
it("should respect empty lines and comments", () => {
const initialContent = [
"#!/bin/zsh",
"",
"# Some comment",
"",
"",
"",
"# Another comment",
].join("\n");
fs.writeFileSync(mockStartupFile, initialContent, "utf-8");
zsh.teardown(knownAikidoTools);
const content = fs.readFileSync(mockStartupFile, "utf-8");
assert.strictEqual(content, initialContent);
});
}); });
}); });