Skip to content

Commit 8de23fe

Browse files
committed
build: change parser to error on invaid findings
Prior we introduced finding valitation for our expected findings format. This commit ensures that all parsers are throwing an error on invalid formats Previously changed make targets adding this to a specific scanner are reverted as well Signed-off-by: Yannik Fuhrmeister <yannik.fuhrmeister@iteratec.com>
1 parent f984666 commit 8de23fe

5 files changed

Lines changed: 10 additions & 26 deletions

File tree

‎scanners.mk‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,19 @@ deploy-without-scanner:
6464
@echo ".: 💾 Deploying '$(name)' $(scanner-prefix) HelmChart with the docker tag '$(IMG_TAG)' into kind namespace 'integration-tests'."
6565
helm -n integration-tests upgrade --install $(name) ./ --wait \
6666
--set="parser.image.repository=docker.io/$(IMG_NS)/$(parser-prefix)-$(name)" \
67-
--set="parser.image.tag=$(IMG_TAG)"
67+
--set="parser.image.tag=$(IMG_TAG)" \
68+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
69+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
70+
--set-string="parser.env[0].value=true"
6871

6972
deploy-with-scanner:
7073
@echo ".: 💾 Deploying '$(name)' $(scanner-prefix) HelmChart with the docker tag '$(IMG_TAG)' into kind namespace 'integration-tests'."
7174
helm -n integration-tests upgrade --install $(name) ./ --wait \
7275
--set="parser.image.repository=docker.io/$(IMG_NS)/$(parser-prefix)-$(name)" \
7376
--set="parser.image.tag=$(IMG_TAG)" \
77+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
78+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
79+
--set-string="parser.env[0].value=true" \
7480
--set="scanner.image.repository=docker.io/$(IMG_NS)/$(scanner-prefix)-$(name)" \
7581
--set="scanner.image.tag=$(IMG_TAG)"
7682

‎scanners/gitleaks/Makefile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,3 @@ custom_scanner = set
1111

1212
include ../../scanners.mk
1313

14-
deploy-with-scanner:
15-
helm -n integration-tests install gitleaks ./ \
16-
--set="scanner.image.repository=docker.io/${IMG_NS}/${scanner-prefix}-gitleaks" \
17-
--set="scanner.image.tag=${IMG_TAG}" \
18-
--set="parser.image.repository=docker.io/${IMG_NS}/${parser-prefix}-gitleaks" \
19-
--set="parser.image.tag=sha-${IMG_TAG}" \
20-
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
21-
--set-string="parser.env[0].value=true"
22-

‎scanners/nuclei/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ deploy-without-scanner:
1515
helm -n integration-tests upgrade --install $(name) ./ --wait \
1616
--set="parser.image.repository=docker.io/$(IMG_NS)/$(parser-prefix)-$(name)" \
1717
--set="parser.image.tag=$(IMG_TAG)" \
18+
--set-string="parser.env[0].value=true" \
19+
--set="scanner.image.repository=docker.io/$(IMG_NS)/$(scanner-prefix)-$(name)" \
20+
--set="scanner.image.tag=$(IMG_TAG)" \
1821
--set="nucleiTemplateCache.enabled=false"
1922

‎scanners/sslyze/Makefile‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ include ../../scanners.mk
1212

1313
deploy-test-deps: deploy-test-dep-unsafe-https
1414

15-
deploy-without-scanner:
16-
@echo ".: 💾 Deploying '$(name)' $(scanner-prefix) HelmChart with the docker tag '$(IMG_TAG)' into kind namespace 'integration-tests'."
17-
helm -n integration-tests upgrade --install $(name) ./ --wait \
18-
--set="parser.image.repository=docker.io/$(IMG_NS)/$(parser-prefix)-$(name)" \
19-
--set="parser.image.tag=$(IMG_TAG)" \
20-
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
21-
--set-string="parser.env[0].value=true"
22-
2315
integration-tests:
2416
@echo ".: 🩺 Starting integration test in kind namespace 'integration-tests'."
2517
kubectl -n integration-tests delete scans --all

‎scanners/zap/Makefile‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ include ../../scanners.mk
1212

1313
deploy-test-deps: deploy-test-dep-nginx
1414

15-
deploy-without-scanner:
16-
helm -n integration-tests install zap ./ --wait \
17-
--set="parser.image.tag=sha-$$(git rev-parse --short HEAD)" \
18-
--set="parser.image.repository=docker.io/${IMG_NS}/parser-zap" \
19-
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
20-
--set-string="parser.env[0].value=true"
21-
22-
2315
integration-tests:
2416
@echo ".: 🩺 Starting integration test in kind namespace 'integration-tests'."
2517
kubectl -n integration-tests delete scans --all

0 commit comments

Comments
 (0)