Skip to content

Commit 3ce285b

Browse files
committed
Merge branch 'dev' of https://github.com/MaibornWolff/SecObserve into stackable
2 parents 0c2a922 + b83983d commit 3ce285b

File tree

105 files changed

+1870
-745
lines changed

Some content is hidden

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

105 files changed

+1870
-745
lines changed

.github/workflows/build_push_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ jobs:
9898
ref: 'v${{ github.event.inputs.release }}'
9999
-
100100
name: Run vulnerability scanners for images
101-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
101+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
102102
with:
103103
so_configuration: 'so_configuration_sca_current.yml'
104104
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}
105105
-
106106
name: Run vulnerability scanners for endpoints
107-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
107+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
108108
with:
109109
so_configuration: 'so_configuration_endpoints.yml'
110110
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}

.github/workflows/check_backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
with:
8989
name: coverage-report
9090
- name: Run SonarQube scan for backend
91-
uses: SonarSource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
91+
uses: SonarSource/sonarqube-scan-action@8c71dc039c2dd71d3821e89a2b58ecc7fee6ced9 # v5.3.0
9292
env:
9393
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9494
with:

.github/workflows/check_frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
fetch-depth: 0
5353
-
5454
name: Run SonarQube scan for frontend
55-
uses: SonarSource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
55+
uses: SonarSource/sonarqube-scan-action@8c71dc039c2dd71d3821e89a2b58ecc7fee6ced9 # v5.3.0
5656
env:
5757
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FRONTEND }}
5858
with:

.github/workflows/check_licenses_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
40+
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@0ddd05df5a723a3e38cc2cff23c8653519289f13 # 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@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
49+
uses: MaibornWolff/secobserve_actions_templates/actions/upload_sbom@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
5050
with:
5151
so_product_name: 'SecObserve'
5252
so_file_name: 'sbom_frontend_application.json'

.github/workflows/check_vulnerabilities.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515
-
1616
name: Run vulnerability scanners for code
17-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
17+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
1818
with:
1919
so_configuration: 'so_configuration_code.yml'
2020
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}

.github/workflows/scan_sca_current.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ jobs:
1616
name: Checkout
1717
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818
with:
19-
ref: 'v1.34.1'
19+
ref: 'v1.35.0'
2020
-
2121
name: Run SCA vulnerability scanners
22-
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
22+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # 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@cb3b9f31138f41824db1bd738bfbbf22bc491144 # main
28+
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@0ddd05df5a723a3e38cc2cff23c8653519289f13 # main
2929
with:
3030
so_configuration: 'so_configuration_endpoints.yml'
3131
SO_API_TOKEN: ${{ secrets.SO_API_TOKEN }}

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
70+
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
7171
with:
7272
sarif_file: results.sarif

backend/application/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.34.1"
1+
__version__ = "1.35.0"
22

33
import pymysql
44

backend/application/background_tasks/__init__.py

Whitespace-only changes.

backend/application/background_tasks/api/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)