Skip to content

Commit 70a443d

Browse files
committed
Merge branch 'dev' of https://github.com/MaibornWolff/SecObserve into stackable
2 parents 7b27d82 + a737565 commit 70a443d

76 files changed

Lines changed: 714 additions & 613 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/build_push_release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
permissions:
118118
contents: write
119119
steps:
120-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
120+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
121121
with:
122122
node-version: 24
123123
-
@@ -209,7 +209,7 @@ jobs:
209209
sbom-utility validate --input-file sbom_"$VERSION".json
210210
-
211211
name: Commit SBOMs
212-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5
212+
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7
213213
with:
214214
skip_fetch: true
215215
create_branch: true

.github/workflows/check_backend.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ jobs:
6868
--env-file docker/backend/unittests/envs/sqlite \
6969
secobserve_backend_unittests:latest
7070
- name: "Upload coverage report"
71-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
71+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7272
with:
7373
name: coverage-report
7474
path: backend/coverage.xml
7575
retention-days: 1
7676

7777
check_code_sonarqube_backend:
78-
if: github.repository == 'MaibornWolff/SecObserve'
78+
if: github.repository == 'MaibornWolff/SecObserve' && (github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
7979
needs: [unittests]
8080
runs-on: ubuntu-latest
8181
steps:
@@ -84,12 +84,12 @@ jobs:
8484
with:
8585
fetch-depth: 0
8686
- name: Download a single artifact
87-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
87+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
8888
with:
8989
name: coverage-report
9090
- name: Run SonarQube scan for backend
9191
uses: SonarSource/sonarqube-scan-action@fd88b7d7ccbaefd23d8f36f73b59db7a3d246602 # v6.0.0
9292
env:
93-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
93+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
9494
with:
9595
projectBaseDir: backend

.github/workflows/check_frontend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
12+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1313
with:
1414
node-version: 24
1515

@@ -42,7 +42,7 @@ jobs:
4242
docker compose -f docker-compose-playwright.yml up --abort-on-container-exit --exit-code-from playwright
4343
4444
check_code_sonarqube_frontend:
45-
if: github.repository == 'MaibornWolff/SecObserve'
45+
if: github.repository == 'MaibornWolff/SecObserve' && (github.ref == 'refs/heads/dev' || github.event_name == 'pull_request')
4646
runs-on: ubuntu-latest
4747
steps:
4848
-

.github/workflows/check_licenses_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
-
15-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
15+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
1616
with:
1717
node-version: 24
1818
-

.github/workflows/generate_sboms.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
contents: write
1818
steps:
19-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
19+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2020
with:
2121
node-version: 24
2222
-
@@ -108,7 +108,7 @@ jobs:
108108
sbom-utility validate --input-file sbom_"$VERSION".json
109109
-
110110
name: Commit SBOMs
111-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5
111+
uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3 # v7
112112
with:
113113
skip_fetch: true
114114
create_branch: true

.github/workflows/publish_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- main
7-
- chore/documentation_process_logo
7+
- chore/doc_integration
88

99
permissions: read-all
1010

.github/workflows/scan_sca_current.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Checkout
1717
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1818
with:
19-
ref: 'v1.39.2'
19+
ref: 'v1.40.0'
2020
-
2121
name: Run SCA vulnerability scanners
2222
uses: MaibornWolff/secobserve_actions_templates/actions/vulnerability_scanner@936a764a4e82cc89772941e082ba24c371c6ef90 # main

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
62+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6363
with:
6464
name: SARIF file
6565
path: results.sarif
6666
retention-days: 5
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v4.30.7
70+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
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.39.2"
1+
__version__ = "1.40.0"
22

33
import pymysql
44

backend/application/core/api/serializers_observation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
)
4343
from application.core.queries.observation import get_current_observation_log
4444
from application.core.services.observation_log import create_observation_log
45-
from application.core.services.security_gate import check_security_gate
45+
from application.core.services.security_gate import check_security_gate_observation
4646
from application.core.types import (
4747
Assessment_Status,
4848
Severity,
@@ -362,7 +362,7 @@ def update(self, instance: Observation, validated_data: dict) -> Observation:
362362
risk_acceptance_expiry_date=log_risk_acceptance_expiry_date,
363363
)
364364

365-
check_security_gate(observation.product)
365+
check_security_gate_observation(observation)
366366
push_observation_to_issue_tracker(observation, get_current_user())
367367
if observation.branch:
368368
observation.branch.last_import = timezone.now()
@@ -457,7 +457,7 @@ def create(self, validated_data: dict) -> Observation:
457457
risk_acceptance_expiry_date=observation.risk_acceptance_expiry_date,
458458
)
459459

460-
check_security_gate(observation.product)
460+
check_security_gate_observation(observation)
461461
push_observation_to_issue_tracker(observation, get_current_user())
462462
if observation.branch:
463463
observation.branch.last_import = timezone.now()

0 commit comments

Comments
 (0)