Resolve merge conflict

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/migrations/0130_detectionrule.py

@@ -0,0 +1,65 @@
+# Generated by Django 5.2.11 on 2026-05-15 11:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("vulnerabilities", "0129_advisorypoc"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DetectionRule",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
+                    ),
+                ),
+                (
+                    "rule_type",
+                    models.CharField(
+                        choices=[
+                            ("yara", "Yara"),
+                            ("yara-x", "Yara-X"),
+                            ("sigma", "Sigma"),
+                            ("clamav", "ClamAV"),
+                            ("suricata", "Suricata"),
+                        ],
+                        help_text="The type of the detection rule content (e.g., YARA, Sigma).",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "source_url",
+                    models.URLField(
+                        help_text="URL to the original source or reference for this rule.",
+                        max_length=1024,
+                    ),
+                ),
+                (
+                    "rule_metadata",
+                    models.JSONField(
+                        blank=True,
+                        help_text="Additional structured data such as tags, or author information.",
+                        null=True,
+                    ),
+                ),
+                (
+                    "rule_text",
+                    models.TextField(help_text="The content of the detection signature."),
+                ),
+                (
+                    "related_advisories",
+                    models.ManyToManyField(
+                        help_text="Advisories associated with this DetectionRule.",
+                        related_name="detection_rules",
+                        to="vulnerabilities.advisoryv2",
+                    ),
+                ),
+            ],
+        ),
+    ]

vulnerabilities/pipelines/v2_improvers/detection_rules.py

@@ -1,12 +1,3 @@
-#
-# Copyright (c) nexB Inc. and others. All rights reserved.
-# VulnerableCode is a trademark of nexB Inc.
-# SPDX-License-Identifier: Apache-2.0
-# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
-# See https://github.com/aboutcode-org/vulnerablecode for support or download.
-# See https://aboutcode.org for more information about nexB OSS projects.
-#
-
 import json
 from pathlib import Path
 
@@ -42,8 +33,7 @@ def clone(self):
         self.vcs_response = fetch_via_vcs(self.repo_url)
 
     def advisories_count(self):
-        root = Path(self.vcs_response.dest_dir)
-        return sum(1 for _ in root.rglob("*.json"))
+        return 0
 
     def collect_detection_rules(self):
         base_path = Path(self.vcs_response.dest_dir) / "data"
@@ -65,20 +55,8 @@ def collect_detection_rules(self):
 
                 source_url = json_data.get("source_url")
                 for rule in json_data.get("rules", []):
-                    advisories = set()
-                    for vulnerability_id in rule.get("vulnerabilities", []):
-                        try:
-                            if alias := AdvisoryAlias.objects.get(alias=vulnerability_id):
-                                for adv in alias.advisories.all():
-                                    advisories.add(adv)
-                            else:
-                                advs = AdvisoryV2.objects.filter(
-                                    advisory_id=vulnerability_id
-                                ).latest_per_avid()
-                                for adv in advs:
-                                    advisories.add(adv)
-                        except AdvisoryAlias.DoesNotExist:
-                            self.log(f"No advisory found for aliases {vulnerability_id}")
+                    vulns_id = rule.get("vulnerabilities", [])
+                    advisories = get_related_advisories(vulns_id)
 
                     raw_text = rule.get("rule_text")
                     rule_metadata = rule.get("rule_metadata")
@@ -102,3 +80,26 @@ def clean_downloads(self):
     def on_failure(self):
         """Ensure cleanup is always performed on failure."""
         self.clean_downloads()
+
+
+def get_related_advisories(vulnerability_ids, logger=print):
+    """
+    Fetches related advisories for a list of vulnerability IDs.
+    """
+    advisories = set()
+
+    for vulnerability_id in vulnerability_ids:
+        try:
+            alias = AdvisoryAlias.objects.get(alias=vulnerability_id)
+            advs = alias.advisories.all()
+            advisories.update(advs)
+
+        except AdvisoryAlias.DoesNotExist:
+            advs = AdvisoryV2.objects.filter(advisory_id=vulnerability_id).latest_per_avid()
+
+            if advs:
+                advisories.update(advs)
+            else:
+                logger(f"No advisory found for ID/alias: {vulnerability_id}")
+
+    return advisories