Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

fix(security): validate cache exceptions from raw report

Rahman84b22af780bf
diff --git a/.github/workflows/dast.yml b/.github/workflows/dast.yml
index 0046ee9e..2766bdab 100644
--- a/.github/workflows/dast.yml
+++ b/.github/workflows/dast.yml
@@ -51,7 +51,6 @@ jobs:
- name: Require only reviewed passive findings
if: ${{ always() }}
- run: node scripts/check-zap-report.mjs report_json.json
+ run: node scripts/check-zap-report.mjs report_json.json "${{ steps.zap.outcome }}"
env:
MSO_DAST_URL: ${{ vars.MSO_DAST_URL }}
- MSO_ZAP_STEP_OUTCOME: ${{ steps.zap.outcome }}
diff --git a/lib/security/security-scanner-supply-chain.test.ts b/lib/security/security-scanner-supply-chain.test.ts
index e6ee8145..cab3b1b6 100644
--- a/lib/security/security-scanner-supply-chain.test.ts
+++ b/lib/security/security-scanner-supply-chain.test.ts
@@ -36,7 +36,7 @@ describe("security scanner supply chain", () => {
const hosted = fs.readFileSync(path.join(ROOT, ".github/workflows/dast.yml"), "utf8");
const ultimate = fs.readFileSync(ULTIMATE, "utf8");
expect(policy).not.toMatch(/^10050\t/m);
- expect(hosted).toContain("node scripts/check-zap-report.mjs report_json.json");
- expect(ultimate).toContain('node "$ROOT/scripts/check-zap-report.mjs" "$ZAP_WORK/report_json.json"');
+ expect(hosted).toContain('node scripts/check-zap-report.mjs report_json.json "${{ steps.zap.outcome }}"');
+ expect(ultimate).toContain('node "$ROOT/scripts/check-zap-report.mjs" "$ZAP_WORK/report_json.json" success');
});
});
diff --git a/scripts/check-zap-report.mjs b/scripts/check-zap-report.mjs
index 9d226509..e8e773f0 100644
--- a/scripts/check-zap-report.mjs
+++ b/scripts/check-zap-report.mjs
@@ -110,8 +110,8 @@ export function validateZapReport(report, { target, stepOutcome = "success", pol
function main() {
const reportPath = process.argv[2] || "report_json.json";
+ const stepOutcome = process.argv[3] || "success";
const target = process.env.MSO_DAST_URL;
- const stepOutcome = process.env.MSO_ZAP_STEP_OUTCOME || "success";
try {
const report = JSON.parse(readFileSync(reportPath, "utf8"));
const policyText = readFileSync("security/zap-baseline.conf", "utf8");
diff --git a/scripts/dast-target.test.ts b/scripts/dast-target.test.ts
index bed3c7c2..dead931c 100644
--- a/scripts/dast-target.test.ts
+++ b/scripts/dast-target.test.ts
@@ -34,8 +34,7 @@ describe("passive DAST requires an explicit safe target", () => {
expect(workflow).toContain("allow_issue_writing: false");
expect(workflow).toContain("rules_file_name: security/zap-baseline.conf");
expect(workflow).toContain("cmd_options: -m 2 -c security/zap-baseline.conf");
- expect(workflow).toContain("run: node scripts/check-zap-report.mjs report_json.json");
- expect(workflow).toContain("MSO_ZAP_STEP_OUTCOME: ${{ steps.zap.outcome }}");
+ expect(workflow).toContain('run: node scripts/check-zap-report.mjs report_json.json "${{ steps.zap.outcome }}"');
const rules = readFileSync("security/zap-baseline.conf", "utf8").split("\n").filter(line => line && !line.startsWith("#"));
expect(rules.map(line => line.split("\t")[0])).toEqual(["10015", "10049", "10055", "10096", "90004"]);
expect(rules.every(line => line.split("\t")[1] === "INFO")).toBe(true);
diff --git a/scripts/security-ultimate.sh b/scripts/security-ultimate.sh
index a8a9b0bc..89a69348 100755
--- a/scripts/security-ultimate.sh
+++ b/scripts/security-ultimate.sh
@@ -144,8 +144,8 @@ if [[ "${MSO_SECURITY_SKIP_DAST:-0}" != "1" ]]; then
zap-baseline.py -t "$DAST_URL" -m 2 -c zap-baseline.conf -J report_json.json || rc=$?
# ZAP uses 1/2 for alert findings; raw report validation decides whether every finding is reviewed.
if (( rc > 2 )); then return "$rc"; fi
- MSO_DAST_URL="$DAST_URL" MSO_ZAP_STEP_OUTCOME=success \
- node "$ROOT/scripts/check-zap-report.mjs" "$ZAP_WORK/report_json.json"
+ MSO_DAST_URL="$DAST_URL" \
+ node "$ROOT/scripts/check-zap-report.mjs" "$ZAP_WORK/report_json.json" success
}
run_capture "OWASP ZAP baseline" run_reviewed_zap
chmod 700 "$ZAP_WORK"