Skip to content

Commit e158169

Browse files
authored
Merge pull request #583 from EndPositive/cascading-scans-bugfixing
Cascading Scans bugfixing
2 parents 95d8b24 + 5896910 commit e158169

2 files changed

Lines changed: 85 additions & 9 deletions

File tree

‎hooks/cascading-scans/hook/hook.test.js‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,16 @@ test("should properly parse template values in scanLabels and scanAnnotations",
659659
}
660660

661661
const findings = [
662+
{
663+
name: "Port 8443 is open",
664+
category: "Open Port",
665+
attributes: {
666+
state: "open",
667+
hostname: "foobar.com",
668+
port: 8443,
669+
service: "https"
670+
}
671+
},
662672
{
663673
name: "Port 443 is open",
664674
category: "Open Port",
@@ -678,6 +688,8 @@ test("should properly parse template values in scanLabels and scanAnnotations",
678688
sslyzeCascadingRules[0]
679689
);
680690

691+
expect(sslyzeCascadingRules[0].spec.scanSpec.parameters).toEqual(["--regular", "{{$.hostOrIP}}:{{attributes.port}}"])
692+
681693
const { labels, annotations } = cascadedScans[0].metadata;
682694

683695
// No snapshots as scanLabels/scanAnnotations can be in any order
@@ -1181,3 +1193,71 @@ test("should not copy cascaded scan spec from parent scan if inheritance is unde
11811193
expect(secondCascadedScan.spec.volumeMounts).toMatchInlineSnapshot(`Array []`)
11821194

11831195
});
1196+
1197+
1198+
test("should append cascading rule to further cascading scan chains", () => {
1199+
const findings = [
1200+
{
1201+
name: "Port 443 is open",
1202+
category: "Open Port",
1203+
attributes: {
1204+
state: "open",
1205+
hostname: "foobar.com",
1206+
port: 443,
1207+
service: "https"
1208+
}
1209+
}
1210+
];
1211+
1212+
const cascadedScans = getCascadingScans(
1213+
parentScan,
1214+
findings,
1215+
sslyzeCascadingRules
1216+
);
1217+
1218+
const cascadedScan = cascadedScans[0]
1219+
// Create a second cascading rule
1220+
sslyzeCascadingRules[1] = {
1221+
apiVersion: "cascading.securecodebox.io/v1",
1222+
kind: "CascadingRule",
1223+
metadata: {
1224+
name: "tls-scans-second"
1225+
},
1226+
spec: {
1227+
matches: {
1228+
anyOf: [
1229+
{
1230+
category: "Open Port",
1231+
attributes: {
1232+
port: 443,
1233+
service: "https"
1234+
}
1235+
},
1236+
{
1237+
category: "Open Port",
1238+
attributes: {
1239+
service: "https"
1240+
}
1241+
}
1242+
]
1243+
},
1244+
scanSpec: {
1245+
scanType: "sslyze",
1246+
parameters: ["--regular", "{{$.hostOrIP}}:{{attributes.port}}"]
1247+
}
1248+
}
1249+
}
1250+
1251+
cascadedScan.metadata.name = cascadedScan.metadata.generateName
1252+
1253+
const secondCascadedScans = getCascadingScans(
1254+
cascadedScan,
1255+
findings,
1256+
sslyzeCascadingRules,
1257+
sslyzeCascadingRules[0] // cascaded rule on parent
1258+
);
1259+
1260+
const secondCascadedScan = secondCascadedScans[0];
1261+
1262+
expect(secondCascadedScan.metadata.annotations["cascading.securecodebox.io/chain"]).toEqual("tls-scans,tls-scans-second")
1263+
});

‎hooks/cascading-scans/hook/hook.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
import { isMatch, isMatchWith, isString, mapValues } from "lodash";
5+
import { isMatch, isMatchWith, isString, mapValues, cloneDeep } from "lodash";
66
import { isMatch as wildcardIsMatch } from "matcher";
77
import * as Mustache from "mustache";
88

@@ -105,18 +105,14 @@ function getCascadingScan(
105105
finding: Finding,
106106
cascadingRule: CascadingRule
107107
) {
108-
cascadingRule = templateCascadingRule(parentScan, finding, cascadingRule);
108+
// Make a deep copy of the original cascading rule so that we can template it again with different findings.
109+
cascadingRule = templateCascadingRule(parentScan, finding, cloneDeep(cascadingRule));
109110

110111
let { scanType, parameters } = cascadingRule.spec.scanSpec;
111112

112113
let { annotations, labels, env, volumes, volumeMounts } = mergeCascadingRuleWithScan(parentScan, cascadingRule);
113114

114-
let cascadingChain: Array<string> = [];
115-
if (parentScan.metadata.annotations && parentScan.metadata.annotations["cascading.securecodebox.io/chain"]) {
116-
cascadingChain = parentScan.metadata.annotations[
117-
"cascading.securecodebox.io/chain"
118-
].split(",");
119-
}
115+
let cascadingChain = getScanChain(parentScan);
120116

121117
return {
122118
apiVersion: "execution.securecodebox.io/v1",
@@ -125,14 +121,14 @@ function getCascadingScan(
125121
generateName: `${generateCascadingScanName(parentScan, cascadingRule)}-`,
126122
labels,
127123
annotations: {
124+
...annotations,
128125
"securecodebox.io/hook": "cascading-scans",
129126
"cascading.securecodebox.io/parent-scan": parentScan.metadata.name,
130127
"cascading.securecodebox.io/matched-finding": finding.id,
131128
"cascading.securecodebox.io/chain": [
132129
...cascadingChain,
133130
cascadingRule.metadata.name
134131
].join(","),
135-
...annotations,
136132
},
137133
ownerReferences: [
138134
{

0 commit comments

Comments
 (0)