Merge branch 'dev' of https://github.com/MaibornWolff/SecObserve into csaf-not-affected-impact

Author: dervoeti

.github/workflows/build_push_dev.yml

@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -69,7 +69,7 @@ jobs:
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/build_push_release.yml

@@ -33,7 +33,7 @@ jobs:
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -79,7 +79,7 @@ jobs:
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       -
         name: Login to GitHub Container Registry
-        uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4.3.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -248,7 +248,7 @@ jobs:
       #       }
       -
         name: Add SBOMs to GitHub Release
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           VERSION: ${{ github.event.inputs.release }}
         with:

backend/application/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.54.0"
+__version__ = "1.55.0"
 
 import pymysql
 

backend/application/core/migrations/0093_observation_log_general_rule_rego_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 6.0.6 on 2026-07-09 06:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0092_product_propagate_branches_new_assessment_and_more"),
+        ("rules", "0021_rename_approval_remark_rule_rejection_remark"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="observation_log",
+            name="general_rule_rego",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="observation_log_general_rules_rego",
+                to="rules.rule",
+            ),
+        ),
+        migrations.AddField(
+            model_name="observation_log",
+            name="product_rule_rego",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="observation_log_product_rules_rego",
+                to="rules.rule",
+            ),
+        ),
+    ]

backend/application/core/models.py

@@ -506,6 +506,20 @@ class Observation_Log(Model):
         null=True,
         on_delete=SET_NULL,
     )
+    general_rule_rego = ForeignKey(
+        "rules.Rule",
+        related_name="observation_log_general_rules_rego",
+        blank=True,
+        null=True,
+        on_delete=SET_NULL,
+    )
+    product_rule_rego = ForeignKey(
+        "rules.Rule",
+        related_name="observation_log_product_rules_rego",
+        blank=True,
+        null=True,
+        on_delete=SET_NULL,
+    )
     vex_statement = ForeignKey(
         "vex.VEX_Statement",
         related_name="observation_log_vex_statements",

backend/application/core/services/assessment.py

@@ -497,7 +497,9 @@ def set_propagated_assessment_for_new_observation(observation: Observation) -> N
             observation__branch__isnull=False,
             propagated_from__isnull=True,
             general_rule__isnull=True,
+            general_rule_rego__isnull=True,
             product_rule__isnull=True,
+            product_rule_rego__isnull=True,
             vex_statement__isnull=True,
             assessment_status__in=(
                 Assessment_Status.ASSESSMENT_STATUS_APPROVED,

backend/application/core/services/observation_log.py

@@ -37,7 +37,9 @@ def create_observation_log(  # pylint: disable=too-many-arguments
         vex_remediations=vex_remediations,
         assessment_status=assessment_status,
         general_rule=observation.general_rule,
+        general_rule_rego=observation.general_rule_rego,
         product_rule=observation.product_rule,
+        product_rule_rego=observation.product_rule_rego,
         vex_statement=observation.vex_statement,
         risk_acceptance_expiry_date=risk_acceptance_expiry_date,
         propagated_from=propagated_from,

backend/application/rules/api/serializers.py

@@ -1,4 +1,3 @@
-import platform
 from typing import Any, Optional
 
 from rest_framework.serializers import (
@@ -52,12 +51,6 @@ def validate_description(self, value: str) -> str:
 
         return value
 
-    def validate_type(self, value: str) -> str:
-        if value == Rule_Type.RULE_TYPE_REGO and platform.machine() not in ["x86_64", "AMD64"]:
-            raise ValidationError("Rego rules are only supported on 'x86_64' or 'AMD64' architectures")
-
-        return value
-
     def validate_new_vex_remediations(self, value: Any) -> Optional[list[dict]]:
         return validate_vex_remediations(value)