Merge branch 'dev' of https://github.com/MaibornWolff/SecObserve into stackable

Author: dervoeti

.github/workflows/publish_docs.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: 3.x
-      - uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+      - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
         with:
           key: ${{ github.ref }}
           path: .cache

.github/workflows/scorecard.yml

@@ -64,6 +64,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/upload-sarif@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
         with:
           sarif_file: results.sarif

backend/application/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.49.0"
+__version__ = "1.50.0"
 
 import pymysql
 

backend/application/core/api/filters.py

@@ -289,6 +289,7 @@ class Meta:  # pylint: disable=duplicate-code
             "title",
             "current_severity",
             "current_status",
+            "current_priority",
             "parser",
             "scanner",
             "upload_filename",

backend/application/core/api/serializers_product.py

@@ -135,6 +135,7 @@ def to_internal_value(self, data: dict) -> dict:
             statuses = validated_data["observation_notification_status_list"]
             if isinstance(statuses, list):
                 validated_data["observation_notification_statuses"] = ",".join(statuses)
+            validated_data.pop("observation_notification_status_list")
 
         return validated_data
 
@@ -277,6 +278,7 @@ class ProductSerializer(ProductListSerializer):  # pylint: disable=too-many-publ
     has_api_configurations = SerializerMethodField()
     has_branch_osv_linux_distribution = SerializerMethodField()
     has_concluded_comments = SerializerMethodField()
+    has_priorities = SerializerMethodField()
 
     class Meta:
         model = Product
@@ -360,6 +362,9 @@ def get_has_branch_osv_linux_distribution(self, obj: Product) -> bool:
     def get_has_concluded_comments(self, obj: Product) -> bool:
         return License_Component.objects.filter(product=obj).exclude(manual_concluded_comment="").exists()
 
+    def get_has_priorities(self, obj: Product) -> bool:
+        return Observation.objects.filter(product=obj).filter(current_priority__isnull=False).exists()
+
     def validate(self, attrs: dict) -> dict:  # pylint: disable=too-many-branches
         # There are quite a lot of branches, but at least they are not nested too much
         if attrs.get("issue_tracker_type") == Issue_Tracker.ISSUE_TRACKER_GITHUB:

backend/application/core/migrations/0083_alter_observation_assessment_status_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 6.0.3 on 2026-03-23 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0082_merge_20260313'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='observation',
+            name='assessment_status',
+            field=models.CharField(blank=True, choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='current_status',
+            field=models.CharField(choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='parser_status',
+            field=models.CharField(blank=True, choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='rule_status',
+            field=models.CharField(blank=True, choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='observation',
+            name='vex_status',
+            field=models.CharField(blank=True, choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+        migrations.AlterField(
+            model_name='observation_log',
+            name='status',
+            field=models.CharField(blank=True, choices=[('Open', 'Open'), ('Affected', 'Affected'), ('Resolved', 'Resolved'), ('Duplicate', 'Duplicate'), ('False positive', 'False positive'), ('In review', 'In review'), ('Not affected', 'Not affected'), ('Not security', 'Not security'), ('Risk accepted', 'Risk accepted')], max_length=16),
+        ),
+    ]

backend/application/core/services/assessment.py

@@ -186,7 +186,7 @@ def _get_assessments_need_approval(product: Product) -> bool:
 
 
 def remove_assessment(observation: Observation, comment: str) -> bool:
-    if observation.assessment_severity or observation.assessment_status:
+    if observation.assessment_severity or observation.assessment_status or observation.assessment_priority:
         observation.assessment_severity = ""
         observation.assessment_status = ""
         observation.assessment_priority = None

backend/application/core/services/export_observations.py

@@ -66,6 +66,7 @@ def _get_excludes() -> list[str]:
         "STATUS_NOT_SECURITY",
         "STATUS_AFFECTED",
         "origin_service",
+        "observation_notified",
     ]
 
 

backend/application/core/services/observation_log.py

@@ -51,6 +51,7 @@ def create_observation_log(  # pylint: disable=too-many-arguments
     if assessment_status in (
         Assessment_Status.ASSESSMENT_STATUS_APPROVED,
         Assessment_Status.ASSESSMENT_STATUS_AUTO_APPROVED,
+        Assessment_Status.ASSESSMENT_STATUS_REMOVED,
     ):
         send_observation_notification(observation)
         send_observation_title_notification(observation)

backend/application/notifications/services/send_notifications_observation_title.py

@@ -89,19 +89,6 @@ def send_observation_title_notification(observation: Observation) -> None:
             observation_title_notified.status = observation.current_status
             observation_title_notified.priority = observation.current_priority
             observation_title_notified.save()
-    else:
-        try:
-            observation_title_notified = Observation_Title_Notified.objects.get(title=observation.title)
-        except Observation_Title_Notified.DoesNotExist:
-            return
-
-        first_line = f'Observation title "{observation.title}" fell out of notifications'
-
-        url = get_base_url_frontend() + '#/observations?filter={"title":"' + observation.title + '"}'
-
-        _send_observation_title_notifications(settings, observation, first_line, url)
-
-        observation_title_notified.delete()
 
 
 def _send_observation_title_notifications(