Compute content_id from all fields of AdvisoryV2

Resolves: #2186

Signed-off-by: Keshav Priyadarshi <git@keshav.space>

Author: keshav-space

vulnerabilities/utils.py

@@ -666,53 +666,32 @@ def compute_content_id_v2(advisory_data):
     """
     Compute a unique content_id for an advisory by normalizing its data and hashing it.
 
-    :param advisory_data: An AdvisoryData object
+    :param advisory_data: An AdvisoryDataV2 or AdvisoryV2 object
     :return: SHA-256 hash digest as content_id
     """
-
-    # Normalize fields
     from vulnerabilities.importer import AdvisoryDataV2
     from vulnerabilities.models import AdvisoryV2
 
-    if isinstance(advisory_data, AdvisoryV2):
-        normalized_data = {
-            "aliases": normalize_list(advisory_data.aliases),
-            "summary": normalize_text(advisory_data.summary),
-            "impacted_packages": sorted(
-                [impact.to_dict() for impact in advisory_data.impacted_packages.all()],
-                key=lambda x: json.dumps(x, sort_keys=True),
-            ),
-            "patches": sorted(
-                [patch.to_patch_data().to_dict() for patch in advisory_data.patches.all()],
-                key=lambda x: json.dumps(x, sort_keys=True),
-            ),
-            "references": [ref for ref in normalize_list(advisory_data.references) if ref],
-            "weaknesses": normalize_list(advisory_data.weaknesses),
-        }
-        normalized_data["url"] = advisory_data.url
-
-    elif isinstance(advisory_data, AdvisoryDataV2):
-        normalized_data = {
-            "advisory_id": normalize_text(advisory_data.advisory_id),
-            "aliases": normalize_list(advisory_data.aliases),
-            "summary": normalize_text(advisory_data.summary),
-            "affected_packages": [
-                pkg.to_dict() for pkg in normalize_list(advisory_data.affected_packages) if pkg
-            ],
-            "references": [
-                ref.to_dict() for ref in normalize_list(advisory_data.references) if ref
-            ],
-            "severities": [
-                sev.to_dict() for sev in normalize_list(advisory_data.severities) if sev
-            ],
-            "weaknesses": normalize_list(advisory_data.weaknesses),
-            "patches": [patch.to_dict() for patch in normalize_list(advisory_data.patches)],
-        }
-        normalized_data["url"] = advisory_data.url
-
-    else:
+    if not isinstance(advisory_data, (AdvisoryV2, AdvisoryDataV2)):
         raise ValueError("Unsupported advisory data type for content ID computation")
 
+    if isinstance(advisory_data, AdvisoryV2):
+        advisory_data = advisory_data.to_advisory_data()
+
+    normalized_data = {
+        "advisory_id": normalize_text(advisory_data.advisory_id),
+        "aliases": normalize_list(advisory_data.aliases),
+        "summary": normalize_text(advisory_data.summary),
+        "affected_packages": [
+            pkg.to_dict() for pkg in normalize_list(advisory_data.affected_packages) if pkg
+        ],
+        "references": [ref.to_dict() for ref in normalize_list(advisory_data.references) if ref],
+        "severities": [sev.to_dict() for sev in normalize_list(advisory_data.severities) if sev],
+        "weaknesses": normalize_list(advisory_data.weaknesses),
+        "patches": [patch.to_dict() for patch in normalize_list(advisory_data.patches)],
+    }
+    normalized_data["url"] = advisory_data.url
+
     normalized_json = json.dumps(normalized_data, separators=(",", ":"), sort_keys=True)
     content_id = hashlib.sha256(normalized_json.encode("utf-8")).hexdigest()