Skip to content
This repository was archived by the owner on Oct 14, 2020. It is now read-only.

Commit 12bd9d4

Browse files
J12934J12934
committed
Move integrated scanner to new api group
1 parent a81df32 commit 12bd9d4

9 files changed

+66
-66
lines changed

integrations/amass/amass-parsejob-definition.yaml renamed to integrations/amass/amass-parse-definition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
apiVersion: 'scans.experimental.securecodebox.io/v1'
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
22
kind: ParseDefinition
33
metadata:
4-
name: 'amass-jsonl'
4+
name: "amass-jsonl"
55
spec:
66
handlesResultsType: amass-jsonl
77
image: scbexperimental/parser-amass

integrations/amass/amass-scanjob-definition.yaml renamed to integrations/amass/amass-scan-type.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
apiVersion: 'scans.experimental.securecodebox.io/v1'
2-
kind: ScanTemplate
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
2+
kind: ScanType
33
metadata:
4-
name: 'amass'
4+
name: "amass"
55
spec:
66
extractResults:
77
# amass saves it's result now in json but in "json lines" format
88
# http://jsonlines.org/
99
type: amass-jsonl
10-
location: '/home/securecodebox/amass-results.jsonl'
10+
location: "/home/securecodebox/amass-results.jsonl"
1111
jobTemplate:
1212
spec:
1313
ttlSecondsAfterFinished: 10
@@ -18,18 +18,18 @@ spec:
1818
- name: amass
1919
image: caffix/amass:v3.5.1
2020
command:
21-
- 'amass'
22-
- 'enum'
23-
- '-json'
24-
- '/home/securecodebox/amass-results.jsonl'
21+
- "amass"
22+
- "enum"
23+
- "-json"
24+
- "/home/securecodebox/amass-results.jsonl"
2525
volumeMounts:
26-
- name: 'amass-config'
27-
mountPath: '/amass/output/config.ini'
28-
subPath: 'config.ini'
26+
- name: "amass-config"
27+
mountPath: "/amass/output/config.ini"
28+
subPath: "config.ini"
2929
volumes:
30-
- name: 'amass-config'
30+
- name: "amass-config"
3131
configMap:
32-
name: 'amass-config'
32+
name: "amass-config"
3333
---
3434
apiVersion: v1
3535
kind: ConfigMap

integrations/nmap/nmap-parsejob-definition.yaml renamed to integrations/nmap/nmap-parse-definition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "scans.experimental.securecodebox.io/v1"
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
22
kind: ParseDefinition
33
metadata:
44
name: "nmap-xml"

integrations/nmap/nmap-scanjob-definition.yaml renamed to integrations/nmap/nmap-scan-type.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
apiVersion: "scans.experimental.securecodebox.io/v1"
2-
kind: ScanTemplate
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
2+
kind: ScanType
33
metadata:
44
name: "nmap"
55
spec:

integrations/ssh_scan/ssh-scan-parsejob-definition.yaml renamed to integrations/ssh_scan/ssh-scan-parse-definition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "scans.experimental.securecodebox.io/v1"
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
22
kind: ParseDefinition
33
metadata:
44
name: "ssh-scan-json"

‎integrations/ssh_scan/ssh-scan-scan-type.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
2+
kind: ScanType
3+
metadata:
4+
name: "ssh-scan"
5+
spec:
6+
name: "ssh-scan"
7+
extractResults:
8+
type: ssh-scan-json
9+
location: "/home/securecodebox/ssh-scan-results.json"
10+
jobTemplate:
11+
spec:
12+
ttlSecondsAfterFinished: 10
13+
template:
14+
spec:
15+
restartPolicy: OnFailure
16+
containers:
17+
- name: ssh-scan
18+
image: mozilla/ssh_scan
19+
command:
20+
- "/app/bin/ssh_scan"
21+
- "--output"
22+
- "/home/securecodebox/ssh-scan-results.json"

‎integrations/ssh_scan/ssh-scan-scanjob-definition.yaml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

integrations/zap/zap-parsejob-definition.yaml renamed to integrations/zap/zap-parse-definition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: "scans.experimental.securecodebox.io/v1"
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
22
kind: ParseDefinition
33
metadata:
44
name: "zap-json"

integrations/zap/zap-scanjob-definitions.yaml renamed to integrations/zap/zap-scan-type.yaml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
apiVersion: 'scans.experimental.securecodebox.io/v1'
2-
kind: ScanTemplate
1+
apiVersion: "execution.experimental.securecodebox.io/v1"
2+
kind: ScanType
33
metadata:
4-
name: 'zap-baseline'
4+
name: "zap-baseline"
55
spec:
66
extractResults:
77
type: zap-json
8-
location: '/home/securecodebox/zap-results.json'
8+
location: "/home/securecodebox/zap-results.json"
99
jobTemplate:
1010
spec:
1111
ttlSecondsAfterFinished: 10
@@ -16,28 +16,28 @@ spec:
1616
- name: zap-baseline
1717
image: owasp/zap2docker-stable:2.9.0
1818
command:
19-
- 'zap-baseline.py'
19+
- "zap-baseline.py"
2020
# Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
21-
- '-I'
22-
- '-J'
21+
- "-I"
22+
- "-J"
2323
# ZAP Baseline Script doesn't allow absolute paths...
2424
# Hacky workaround: specify a relative path to the `/zap/wrk` base dir.
25-
- '../../home/securecodebox/zap-results.json'
25+
- "../../home/securecodebox/zap-results.json"
2626
volumeMounts:
2727
- mountPath: /zap/wrk
2828
name: zap-workdir
2929
volumes:
3030
- name: zap-workdir
3131
emptyDir: {}
3232
---
33-
apiVersion: 'scans.experimental.securecodebox.io/v1'
34-
kind: ScanTemplate
33+
apiVersion: "execution.experimental.securecodebox.io/v1"
34+
kind: ScanType
3535
metadata:
36-
name: 'zap-api-scan'
36+
name: "zap-api-scan"
3737
spec:
3838
extractResults:
3939
type: zap-json
40-
location: '/home/securecodebox/zap-results.json'
40+
location: "/home/securecodebox/zap-results.json"
4141
jobTemplate:
4242
spec:
4343
ttlSecondsAfterFinished: 10
@@ -48,28 +48,28 @@ spec:
4848
- name: zap-api-scan
4949
image: owasp/zap2docker-stable:2.9.0
5050
command:
51-
- 'zap-api-scan.py'
51+
- "zap-api-scan.py"
5252
# Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
53-
- '-I'
54-
- '-J'
53+
- "-I"
54+
- "-J"
5555
# ZAP Baseline Script doesn't allow absolute paths...
5656
# Hacky workaround: specify a relative path to the `/zap/wrk` base dir.
57-
- '../../home/securecodebox/zap-results.json'
57+
- "../../home/securecodebox/zap-results.json"
5858
volumeMounts:
5959
- mountPath: /zap/wrk
6060
name: zap-workdir
6161
volumes:
6262
- name: zap-workdir
6363
emptyDir: {}
6464
---
65-
apiVersion: 'scans.experimental.securecodebox.io/v1'
66-
kind: ScanTemplate
65+
apiVersion: "execution.experimental.securecodebox.io/v1"
66+
kind: ScanType
6767
metadata:
68-
name: 'zap-full-scan'
68+
name: "zap-full-scan"
6969
spec:
7070
extractResults:
7171
type: zap-json
72-
location: '/home/securecodebox/zap-results.json'
72+
location: "/home/securecodebox/zap-results.json"
7373
jobTemplate:
7474
spec:
7575
ttlSecondsAfterFinished: 10
@@ -80,13 +80,13 @@ spec:
8080
- name: zap-full-scan
8181
image: owasp/zap2docker-stable:2.9.0
8282
command:
83-
- 'zap-full-scan.py'
83+
- "zap-full-scan.py"
8484
# Force Zap to always return a zero exit code. k8s would otherwise try to restart zap.
85-
- '-I'
86-
- '-J'
85+
- "-I"
86+
- "-J"
8787
# ZAP Baseline Script doesn't allow absolute paths...
8888
# Hacky workaround: specify a relative path to the `/zap/wrk` base dir.
89-
- '../../home/securecodebox/zap-results.json'
89+
- "../../home/securecodebox/zap-results.json"
9090
volumeMounts:
9191
- mountPath: /zap/wrk
9292
name: zap-workdir

0 commit comments

Comments
 (0)