Skip to content

Commit 96c1ff8

Browse files
author
Jop Zitman
committed
Merge remote-tracking branch 'upstream/main' into hook-priorities
Signed-off-by: Jop Zitman <jop.zitman@secura.com> # Conflicts: # hooks/cascading-scans/values.yaml # hooks/finding-post-processing/values.yaml # hooks/generic-webhook/values.yaml # hooks/notification/values.yaml # hooks/persistence-defectdojo/values.yaml # hooks/persistence-elastic/values.yaml # hooks/update-field/values.yaml # operator/controllers/execution/scans/hook_reconciler.go
2 parents ab00c6c + f1a4ee4 commit 96c1ff8

119 files changed

Lines changed: 13266 additions & 175770 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ jobs:
290290
- nmap
291291
- nuclei
292292
- screenshooter
293+
- semgrep
293294
- ssh-scan
294295
- sslyze
295296
- trivy

‎.github/workflows/release-build.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
- nmap
280280
- nuclei
281281
- screenshooter
282+
- semgrep
282283
- ssh-scan
283284
- sslyze
284285
- test-scan

‎.github/workflows/scb-bot.yaml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
name: Check outdated scanners
2-
on:
3-
push:
2+
on:
43
schedule:
5-
- cron: "15 9 * * *" # Daily at 9:15 (avoids the beginning of the hour congestion)
4+
- cron: "15 9 * * *" # Daily at 9:15 (avoids the beginning of the hour congestion)
65
jobs:
76
version-compare:
87
runs-on: ubuntu-latest
98
strategy:
109
matrix:
1110
scanner:
12-
- amass # Scanner that needs to be updated
13-
- angularjs-csti-scanner # Scanner that does not need to be updated
14-
# - gitleaks
15-
# - kube-hunter
16-
# - kubeaudit
17-
# - ncrack
18-
# - nuclei
19-
# - ssh-scan
20-
# - sslyze
21-
# - trivy
22-
# - whatweb
23-
# - wpscan
24-
# - zap
25-
# - zap-advanced
26-
# These are commented out for the moment to avoid accidental multiple erroneous PRs
11+
- amass
12+
- angularjs-csti-scanner
13+
- cmseek
14+
- gitleaks
15+
- kube-hunter
16+
- kubeaudit
17+
- ncrack
18+
- nuclei
19+
- semgrep
20+
- ssh-scan
21+
- sslyze
22+
- trivy
23+
- whatweb
24+
- wpscan
25+
- zap
26+
- zap-advanced
2727
# missing scanners are : nmap, nikto, typo3scan
2828
steps:
2929
- uses: actions/checkout@v2
30-
30+
3131
- name: Import GPG key
3232
uses: crazy-max/ghaction-import-gpg@v3
3333
with:
@@ -39,11 +39,11 @@ jobs:
3939
- name: Fetch scanner's version API
4040
uses: mikefarah/yq@v4.4.1
4141
with:
42-
cmd: echo versionApi=$(yq e .versionApi scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV
42+
cmd: echo versionApi=$(yq e .versionApi scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV
4343

4444
- name: Fetch latest release scanner version
4545
run: echo release=$((curl -sL ${{env.versionApi}} ) | jq -r ".tag_name") | tr -d "v" >> $GITHUB_ENV
46-
46+
4747
- name: Fetch local scanner version
4848
uses: mikefarah/yq@v4.4.1
4949
with:
@@ -58,20 +58,20 @@ jobs:
5858
echo pullRequest=$pullRequestTitle >> $GITHUB_ENV
5959
6060
echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
61-
echo prExists=$(gh pr list --state open --limit 100 | grep -F "$pullRequestTitle" -c) >> $GITHUB_ENV
61+
echo prExists=$(gh pr list --state open --limit 100 | grep -F "$pullRequestTitle" -c) >> $GITHUB_ENV
6262
63-
- name : Upgrade Scanner
64-
if: ${{ env.release != env.local && env.prExists == 0 }}
63+
- name: Upgrade Scanner
64+
if: ${{ env.release != env.local && env.prExists == 0 }}
6565
uses: mikefarah/yq@v4.4.1
6666
with:
67-
# appVersion value in chart is replaced with release value. Empty lines are deleted in the process
67+
# appVersion value in chart is replaced with release value. Empty lines are deleted in the process
6868
cmd: yq e --inplace '.appVersion = "v${{env.release}}"' ./scanners/${{ matrix.scanner }}/Chart.yaml
6969

70-
- name : Create Pull Request
71-
if: ${{ env.release != env.local && env.prExists == 0 }}
70+
- name: Create Pull Request
71+
if: ${{ env.release != env.local && env.prExists == 0 }}
7272
uses: peter-evans/create-pull-request@v3
7373
with:
74-
token: ${{ secrets.GITHUB_TOKEN }}
74+
token: ${{ secrets.SCB_BOT_USER_TOKEN }}
7575
committer: secureCodeBoxBot <securecodebox@iteratec.com>
7676
author: secureCodeBoxBot <securecodebox@iteratec.com>
7777
title: ${{ env.pullRequest }}

‎CONTRIBUTORS.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ Committing with `git commit -s` will add the sign-off at the end of the commit m
3131
- Johannes Zahn <johannes.zahn@iteratec.com>
3232
- Jop Zitman <jop.zitman@secura.com>
3333
- Florian Buchmeier <florian.buchmeier@audi.de>
34-
- Max Maass <max.maass@iteratec.com>
34+
- Max Maass <max.maass@iteratec.com>
35+
- Chuck McAuley <nobletrout@gmail.com>
36+
- Ilyes Ben Dlala <ilyes.bendlala@iteratec.com>

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
LICENSES/Apache-2.0.txt

‎hook-sdk/nodejs/package-lock.json‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hook-sdk/nodejs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "Apache-2.0",
1212
"dependencies": {
1313
"@kubernetes/client-node": "^0.15.1",
14-
"axios": "^0.21.4",
14+
"axios": "^0.22.0",
1515
"ws": "^7.5.5"
1616
}
1717
}

0 commit comments

Comments
 (0)