Skip to content

Commit 85287f7

Browse files
dervoetidervoeti
committed
Merge branch 'dev' of https://github.com/MaibornWolff/SecObserve into stackable
2 parents 91b89d6 + 8b78886 commit 85287f7

File tree

301 files changed

+17641
-3733
lines changed

Some content is hidden

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

301 files changed

+17641
-3733
lines changed

‎.github/workflows/build_push_dev.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
-
1616
name: Checkout
17-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
-
1919
name: Set up QEMU
2020
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
@@ -23,7 +23,7 @@ jobs:
2323
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
2424
-
2525
name: Login to Stackable Harbor
26-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
26+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2727
with:
2828
registry: oci.stackable.tech
2929
username: robot$stackable+github-action-build
@@ -41,6 +41,7 @@ jobs:
4141
with:
4242
context: .
4343
file: ./docker/backend/prod/django/Dockerfile
44+
platforms: linux/amd64,linux/arm64
4445
push: true
4546
tags: oci.stackable.tech/stackable/secobserve-backend:dev
4647
build-args: |
@@ -56,7 +57,7 @@ jobs:
5657
steps:
5758
-
5859
name: Checkout
59-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
60+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6061
-
6162
name: Set up QEMU
6263
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
@@ -65,7 +66,7 @@ jobs:
6566
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
6667
-
6768
name: Login to Stackable Harbor
68-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
69+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
6970
with:
7071
registry: oci.stackable.tech
7172
username: robot$stackable+github-action-build
@@ -82,6 +83,7 @@ jobs:
8283
with:
8384
context: .
8485
file: ./docker/frontend/prod/Dockerfile
86+
platforms: linux/amd64,linux/arm64
8587
push: true
8688
tags: oci.stackable.tech/stackable/secobserve-frontend:dev
8789
build-args: |

‎.github/workflows/build_push_release.yml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
-
1818
name: Checkout
19-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
with:
2121
ref: 'v${{ github.event.inputs.release }}'
2222
-
@@ -27,7 +27,7 @@ jobs:
2727
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
2828
-
2929
name: Login to Docker Hub
30-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
30+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
3131
with:
3232
username: ${{ secrets.DOCKERHUB_USERNAME }}
3333
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -40,6 +40,7 @@ jobs:
4040
with:
4141
context: .
4242
file: ./docker/backend/prod/django/Dockerfile
43+
platforms: linux/amd64,linux/arm64
4344
push: true
4445
tags: |
4546
maibornwolff/secobserve-backend:${{ github.event.inputs.release }}
@@ -54,7 +55,7 @@ jobs:
5455
steps:
5556
-
5657
name: Checkout
57-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5859
with:
5960
ref: 'v${{ github.event.inputs.release }}'
6061
-
@@ -65,7 +66,7 @@ jobs:
6566
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
6667
-
6768
name: Login to Docker Hub
68-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
69+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
6970
with:
7071
username: ${{ secrets.DOCKERHUB_USERNAME }}
7172
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -78,6 +79,7 @@ jobs:
7879
with:
7980
context: .
8081
file: ./docker/frontend/prod/Dockerfile
82+
platforms: linux/amd64,linux/arm64
8183
push: true
8284
tags: |
8385
maibornwolff/secobserve-frontend:${{ github.event.inputs.release }}
@@ -93,18 +95,18 @@ jobs:
9395
steps:
9496
-
9597
name: Checkout
96-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
98+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9799
with:
98100
ref: 'v${{ github.event.inputs.release }}'
99101
-
100102
name: Run vulnerability scanners for images
101-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
103+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main
102104
with:
103105
so_configuration: 'so_configuration_sca_current.yml'
104106
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}
105107
-
106108
name: Run vulnerability scanners for endpoints
107-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
109+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main
108110
with:
109111
so_configuration: 'so_configuration_endpoints.yml'
110112
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}
@@ -115,21 +117,21 @@ jobs:
115117
permissions:
116118
contents: write
117119
steps:
118-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
120+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
119121
with:
120122
node-version: 24
121123
-
122124
name: Checkout
123-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
125+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
124126
with:
125127
ref: 'v${{ github.event.inputs.release }}'
126128
-
127129
name: Install programs
128130
env:
129-
CDXGEN_VERSION: 11.2.3
130-
TRIVY_VERSION: 0.61.0
131-
SBOM_UTILITY_VERSION: 0.17.0
132-
CYCLONE_DX_CLI_VERSION: 0.27.2
131+
CDXGEN_VERSION: 11.9.0
132+
TRIVY_VERSION: 0.67.0
133+
SBOM_UTILITY_VERSION: 0.18.1
134+
CYCLONE_DX_CLI_VERSION: 0.29.1
133135
run: |
134136
npm install -g @cyclonedx/cdxgen@"$CDXGEN_VERSION"
135137
cd /usr/local/bin
@@ -254,7 +256,7 @@ jobs:
254256
# }
255257
-
256258
name: Add SBOMs to GitHub Release
257-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
259+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
258260
env:
259261
VERSION: ${{ github.event.inputs.release }}
260262
with:

‎.github/workflows/check_backend.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
code_quality:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1616
- name: Set up Python
17-
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
17+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
1818
with:
19-
python-version: 3.12
19+
python-version: 3.13
2020

2121
- name: Install dependencies
2222
working-directory: ./backend
@@ -58,7 +58,7 @@ jobs:
5858
unittests:
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6262
- name: Unittests
6363
run: |
6464
docker build -f docker/backend/unittests/django/Dockerfile -t secobserve_backend_unittests:latest .
@@ -80,15 +80,15 @@ jobs:
8080
runs-on: ubuntu-latest
8181
steps:
8282
- name: Checkout code
83-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
83+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8484
with:
8585
fetch-depth: 0
8686
- name: Download a single artifact
87-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
87+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
8888
with:
8989
name: coverage-report
9090
- name: Run SonarQube scan for backend
91-
uses: SonarSource/sonarqube-scan-action@8c71dc039c2dd71d3821e89a2b58ecc7fee6ced9 # v5.3.0
91+
uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602 # v6.0.0
9292
env:
9393
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9494
with:

‎.github/workflows/check_frontend.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
code_quality:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
12-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
11+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
1313
with:
1414
node-version: 24
1515

@@ -31,7 +31,7 @@ jobs:
3131
end_to_end_tests:
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535
- name: End-to-end tests
3636
working-directory: .
3737
run: |
@@ -47,12 +47,12 @@ jobs:
4747
steps:
4848
-
4949
name: Checkout code
50-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
50+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5151
with:
5252
fetch-depth: 0
5353
-
5454
name: Run SonarQube scan for frontend
55-
uses: SonarSource/sonarqube-scan-action@8c71dc039c2dd71d3821e89a2b58ecc7fee6ced9 # v5.3.0
55+
uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602 # v6.0.0
5656
env:
5757
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FRONTEND }}
5858
with:

‎.github/workflows/check_licenses_dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
-
15-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
15+
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
1616
with:
1717
node-version: 24
1818
-
19-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
-
2121
name: Install programs
2222
env:
@@ -37,7 +37,7 @@ jobs:
3737
cdxgen ./frontend --type npm --no-babel --required-only --profile license-compliance --no-auto-compositions --project-name secobserve --output sbom_frontend_application.json
3838
-
3939
name: Import backend SBOM
40-
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
40+
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@936a764a4e82cc89772941e082ba24c371c6ef90 # main
4141
with:
4242
so_product_name: 'SecObserve'
4343
so_file_name: 'sbom_backend_application.json'
@@ -46,7 +46,7 @@ jobs:
4646
so_api_token: ${{ secrets.SO_API_TOKEN }}
4747
-
4848
name: Import frontend SBOM
49-
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
49+
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@936a764a4e82cc89772941e082ba24c371c6ef90 # main
5050
with:
5151
so_product_name: 'SecObserve'
5252
so_file_name: 'sbom_frontend_application.json'

‎.github/workflows/check_vulnerabilities.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
steps:
1212
-
1313
name: Checkout code
14-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1515
-
1616
name: Run vulnerability scanners for code
17-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
17+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main
1818
with:
1919
so_configuration: 'so_configuration_code.yml'
2020
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}

‎.github/workflows/generate_sboms.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ jobs:
1616
permissions:
1717
contents: write
1818
steps:
19-
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
19+
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
2020
with:
2121
node-version: 24
2222
-
2323
name: Checkout
24-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525
with:
2626
ref: 'v${{ github.event.inputs.release }}'
2727
-
2828
name: Install programs
2929
env:
30-
CDXGEN_VERSION: 11.2.3
31-
TRIVY_VERSION: 0.61.0
32-
SBOM_UTILITY_VERSION: 0.17.0
33-
CYCLONE_DX_CLI_VERSION: 0.27.2
30+
CDXGEN_VERSION: 11.9.0
31+
TRIVY_VERSION: 0.67.0
32+
SBOM_UTILITY_VERSION: 0.18.1
33+
CYCLONE_DX_CLI_VERSION: 0.29.1
3434
run: |
3535
npm install -g @cyclonedx/cdxgen@"$CDXGEN_VERSION"
3636
cd /usr/local/bin

‎.github/workflows/publish_docs.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- chore/osv_documentation
7+
- chore/documentation_process_logo
88

99
permissions: read-all
1010

@@ -14,13 +14,17 @@ jobs:
1414
permissions:
1515
contents: write
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
18-
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
17+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
18+
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
1919
with:
2020
python-version: 3.x
21-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
21+
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2222
with:
2323
key: ${{ github.ref }}
2424
path: .cache
2525
- run: pip install -r mkdocs_requirements.txt
26-
- run: mkdocs gh-deploy --force
26+
# MkDocs does not support adding non-installed (local) plugins via configuration alone.
27+
# By setting PYTHONPATH to mkdocs_plugins, we ensure MkDocs can import custom plugins from this directory.
28+
- env:
29+
PYTHONPATH: docs/mkdocs_plugins
30+
run: mkdocs gh-deploy --force

‎.github/workflows/scan_sca_current.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ jobs:
1414
steps:
1515
-
1616
name: Checkout
17-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
19-
ref: 'v1.35.0'
19+
ref: 'v1.39.2'
2020
-
2121
name: Run SCA vulnerability scanners
22-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
22+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main
2323
with:
2424
so_configuration: 'so_configuration_sca_current.yml'
2525
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}
2626
-
2727
name: Run endpoint vulnerability scanners
28-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
28+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main
2929
with:
3030
so_configuration: 'so_configuration_endpoints.yml'
3131
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}

‎.github/workflows/scorecard.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232

3333
steps:
3434
- name: "Checkout code"
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
persist-credentials: false
3838

3939
- name: "Run analysis"
40-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
40+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
4141
with:
4242
results_file: results.sarif
4343
results_format: sarif
@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
70+
uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
7171
with:
7272
sarif_file: results.sarif

0 commit comments

Comments
 (0)