Skip to content

Commit 89b2268

Browse files
authored
Merge branch 'main' into scanner/whatweb
2 parents 60f5325 + dddac0d commit 89b2268

100 files changed

Lines changed: 13791 additions & 9475 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 84 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ jobs:
7575
runs-on: ubuntu-latest
7676
steps:
7777
- uses: actions/checkout@master
78+
- uses: actions/setup-node@v2
79+
name: Setup Node
80+
with:
81+
node-version: ${{ env. NODE_VERSION }}
82+
83+
- name: Update NPM
84+
run: npm i -g npm@${{ env.NPM_VERSION }}
7885
- name: "list files and folders"
7986
run: ls
8087
- name: "Install npm dependencies in all parser sub projects"
@@ -109,6 +116,9 @@ jobs:
109116
cd -
110117
cd hooks/
111118
npm ci
119+
cd -
120+
cd parser-sdk/nodejs
121+
npm ci
112122
- name: "Compile Typescript"
113123
run: |
114124
cd hooks/cascading-scans/hook
@@ -364,7 +374,7 @@ jobs:
364374
- name: "Start kind cluster"
365375
run: |
366376
kind version
367-
kind create cluster --image kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 --wait 3m
377+
kind create cluster --wait 3m --image kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
368378
369379
- name: "Inspect kind cluster"
370380
run: |
@@ -472,12 +482,14 @@ jobs:
472482
- ncrack
473483
- nikto
474484
- nmap
485+
- nuclei
475486
- screenshooter
476487
- ssh-scan
477488
- sslyze
478489
- test-scan
479490
- trivy
480491
- whatweb
492+
- typo3scan
481493
- wpscan
482494
- zap
483495

@@ -763,10 +775,10 @@ jobs:
763775
strategy:
764776
matrix:
765777
k8sVersion:
778+
- v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047
766779
- v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
767780
- v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9
768781
- v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729
769-
- v1.18.19@sha256:7af1492e19b3192a79f606e43c35fb741e520d195f96399284515f077b3b622c
770782
steps:
771783
- uses: actions/checkout@master
772784
- name: "Start kind cluster"
@@ -817,6 +829,23 @@ jobs:
817829

818830
# This steps should include Integration tests which are not related to a Specific Scanner
819831

832+
# ---- Gerneral Testing | Findings Validation ----
833+
834+
- name: "Parser should fail on invalid Findings"
835+
run: |
836+
helm -n integration-tests install test-scan ./scanners/test-scan/ \
837+
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-test-scan" \
838+
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
839+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
840+
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
841+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
842+
--set-string="parser.env[0].value=true" \
843+
--set="parser.env[1].name=PRODUCE_INVALID_FINDINGS" \
844+
--set-string="parser.env[1].value=true"
845+
cd tests/integration/
846+
npx jest --ci --color generic/findings-validation.test.js
847+
helm -n integration-tests uninstall test-scan
848+
820849
# ---- General Testing | ReadAndWrite Hook ----
821850

822851
- name: "Throws NoScanDefinition Error Integration Tests"
@@ -839,7 +868,9 @@ jobs:
839868
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-test-scan" \
840869
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
841870
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
842-
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
871+
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
872+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
873+
--set-string="parser.env[0].value=true"
843874
cd tests/integration/
844875
npx jest --ci --color generic/read-write-hook.test.js
845876
helm -n integration-tests uninstall test-scan update-category update-severity
@@ -852,7 +883,9 @@ jobs:
852883
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-test-scan" \
853884
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
854885
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
855-
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
886+
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
887+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
888+
--set-string="parser.env[0].value=true"
856889
helm -n integration-tests install http-webhook ./demo-targets/http-webhook
857890
helm -n integration-tests install ro-hook ./hooks/generic-webhook/ \
858891
--set="hook.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/hook-generic-webhook" \
@@ -891,7 +924,9 @@ jobs:
891924
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-gitleaks" \
892925
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
893926
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-gitleaks" \
894-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
927+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
928+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
929+
--set-string="parser.env[0].value=true"
895930
cd tests/integration/
896931
npx jest --ci --color scanner/gitleaks.test.js
897932
@@ -903,7 +938,9 @@ jobs:
903938
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-kube-hunter" \
904939
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
905940
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-kube-hunter" \
906-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
941+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
942+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
943+
--set-string="parser.env[0].value=true"
907944
cd tests/integration/
908945
npx jest --ci --color scanner/kube-hunter.test.js
909946
@@ -918,7 +955,9 @@ jobs:
918955
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
919956
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-kubeaudit" \
920957
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
921-
--set="kubeauditScope=cluster"
958+
--set="kubeauditScope=cluster" \
959+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
960+
--set-string="parser.env[0].value=true"
922961
cd tests/integration/
923962
npx jest --ci --color scanner/kubeaudit.test.js
924963
kubectl delete namespace kubeaudit-tests
@@ -932,7 +971,9 @@ jobs:
932971
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-ncrack" \
933972
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
934973
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-ncrack" \
935-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
974+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
975+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
976+
--set-string="parser.env[0].value=true"
936977
cd tests/integration/
937978
npx jest --ci --color scanner/ncrack.test.js
938979
@@ -945,7 +986,9 @@ jobs:
945986
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-nikto" \
946987
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
947988
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-nikto" \
948-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
989+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
990+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
991+
--set-string="parser.env[0].value=true"
949992
cd tests/integration/
950993
npx jest --ci --color scanner/nikto.test.js
951994
@@ -958,7 +1001,9 @@ jobs:
9581001
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-nmap" \
9591002
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
9601003
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-nmap" \
961-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
1004+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1005+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1006+
--set-string="parser.env[0].value=true"
9621007
cd tests/integration/
9631008
npx jest --ci --color scanner/nmap.test.js
9641009
@@ -970,7 +1015,9 @@ jobs:
9701015
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-test-scan" \
9711016
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-test-scan" \
9721017
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
973-
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
1018+
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
1019+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1020+
--set-string="parser.env[0].value=true"
9741021
helm -n integration-tests install http-webhook ./demo-targets/http-webhook --wait
9751022
9761023
helm -n integration-tests install notification-hook ./hooks/notification --values tests/integration/hooks/__testFiles__/notification-values.yaml \
@@ -988,7 +1035,9 @@ jobs:
9881035
kubectl -n integration-tests delete scans --all
9891036
helm -n integration-tests install ssh-scan ./scanners/ssh-scan/ \
9901037
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
991-
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-ssh-scan"
1038+
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-ssh-scan" \
1039+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1040+
--set-string="parser.env[0].value=true"
9921041
cd tests/integration/
9931042
npx jest --ci --color scanner/ssh-scan.test.js
9941043
@@ -999,7 +1048,9 @@ jobs:
9991048
kubectl -n integration-tests delete scans --all
10001049
helm -n integration-tests install sslyze ./scanners/sslyze/ \
10011050
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1002-
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-sslyze"
1051+
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-sslyze" \
1052+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1053+
--set-string="parser.env[0].value=true"
10031054
cd tests/integration/
10041055
npx jest --ci --color scanner/sslyze.test.js
10051056
@@ -1021,7 +1072,9 @@ jobs:
10211072
kubectl -n integration-tests delete scans --all
10221073
helm -n integration-tests install wpscan ./scanners/wpscan/ \
10231074
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-wpscan" \
1024-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
1075+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1076+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1077+
--set-string="parser.env[0].value=true"
10251078
cd tests/integration/
10261079
npx jest --ci --color scanner/wpscan.test.js
10271080
@@ -1032,7 +1085,9 @@ jobs:
10321085
kubectl -n integration-tests delete scans --all
10331086
helm -n integration-tests install zap ./scanners/zap/ \
10341087
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1035-
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-zap"
1088+
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-zap" \
1089+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1090+
--set-string="parser.env[0].value=true"
10361091
cd tests/integration/
10371092
npx jest --ci --color scanner/zap.test.js
10381093
@@ -1047,7 +1102,9 @@ jobs:
10471102
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-zap" \
10481103
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
10491104
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-zap-advanced" \
1050-
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)"
1105+
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
1106+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1107+
--set-string="parser.env[0].value=true"
10511108
kubectl apply -f ./scanners/zap-advanced/examples/integration-tests/scantype-configMap.yaml -n integration-tests
10521109
cd tests/integration/
10531110
npx jest --ci --color scanner/zap-advanced.test.js
@@ -1068,7 +1125,9 @@ jobs:
10681125
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-nmap" \
10691126
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
10701127
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-nmap" \
1071-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
1128+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1129+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1130+
--set-string="parser.env[0].value=true"
10721131
# Install ncrack
10731132
printf "root\nadmin\n" > users.txt
10741133
printf "THEPASSWORDYOUCREATED\n123456\npassword\n" > passwords.txt
@@ -1078,6 +1137,8 @@ jobs:
10781137
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
10791138
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-ncrack" \
10801139
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1140+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1141+
--set-string="parser.env[0].value=true" \
10811142
--values -
10821143
scanner:
10831144
extraVolumes:
@@ -1113,11 +1174,15 @@ jobs:
11131174
--set="scanner.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/scanner-nmap" \
11141175
--set="scanner.image.tag=sha-$(git rev-parse --short HEAD)" \
11151176
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-nmap" \
1116-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
1177+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1178+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1179+
--set-string="parser.env[0].value=true"
11171180
# Install sslyze
11181181
helm -n cascading-tests install sslyze ./scanners/sslyze/ --wait \
11191182
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-sslyze" \
1120-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
1183+
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
1184+
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
1185+
--set-string="parser.env[0].value=true"
11211186
# Actually run the tests
11221187
cd tests/integration/
11231188
npx jest --ci --color scanner/cascade-nmap-sslyze.test.js

‎CONTRIBUTORS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ Committing with `git commit -s` will add the sign-off at the end of the commit m
2929
- Sebastian Franz <sebastian.franz@iteratec.com>
3030
- Jannik Hollenbach <jannik.hollenbach@iteratec.com>
3131
- Johannes Zahn <johannes.zahn@iteratec.com>
32+
- Jop Zitman <jop.zitman@secura.com>

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Please have a look at [Contributing](./CONTRIBUTING.md)
108108
<p align="left">
109109
<a href="https://sda-se.com/?lang=en"><img alt="SDA SE Logo" src="./docs/resources/sponsors/Logo_sda-se.png" width="200px"></a>
110110
<a href="https://pagel.pro/en/"><img alt="Timo Pagel IT Consulting Logo" src="./docs/resources/sponsors/Logo_timo-pagel-it-consulting.png" width="200px"></a>
111+
<a href="https://www.secura.com/en/"><img alt="Secura Logo" src="./docs/resources/sponsors/Logo_secura.svg" width="200px"></a>
111112
</p>
112113

113114
## Author Information

0 commit comments

Comments
 (0)