Add support for v2 fields in AdvisoryData.to_dict()

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

Author: keshav-space

vulnerabilities/importer.py

@@ -458,6 +458,22 @@ def clean_summary(self, summary):
         return summary
 
     def to_dict(self):
+        is_adv_v2 = (
+            self.severities
+            or self.references_v2
+            or (self.affected_packages and isinstance(self.affected_packages[0], AffectedPackageV2))
+        )
+        if is_adv_v2:
+            return {
+                "aliases": self.aliases,
+                "summary": self.summary,
+                "affected_packages": [pkg.to_dict() for pkg in self.affected_packages],
+                "references_v2": [ref.to_dict() for ref in self.references_v2],
+                "severities": [sev.to_dict() for sev in self.severities],
+                "date_published": self.date_published.isoformat() if self.date_published else None,
+                "weaknesses": self.weaknesses,
+                "url": self.url if self.url else "",
+            }
         return {
             "aliases": self.aliases,
             "summary": self.summary,

vulnerabilities/tests/test_data/archlinux/archlinux_advisoryv2-expected.json

@@ -18,7 +18,14 @@
         "fixed_version_range": "vers:alpm/2.4.0-1"
       }
     ],
-    "references": [],
+    "references_v2": [
+      {
+        "reference_id": "AVG-2781",
+        "reference_type": "",
+        "url": "https://security.archlinux.org/AVG-2781"
+      }
+    ],
+    "severities": [],
     "date_published": null,
     "weaknesses": [],
     "url": "https://security.archlinux.org/AVG-2781.json"
@@ -44,7 +51,14 @@
         "fixed_version_range": "vers:alpm/2.36.4-1"
       }
     ],
-    "references": [],
+    "references_v2": [
+      {
+        "reference_id": "AVG-2780",
+        "reference_type": "",
+        "url": "https://security.archlinux.org/AVG-2780"
+      }
+    ],
+    "severities": [],
     "date_published": null,
     "weaknesses": [],
     "url": "https://security.archlinux.org/AVG-2780.json"
@@ -69,7 +83,19 @@
         "fixed_version_range": "vers:alpm/1.0.6-6"
       }
     ],
-    "references": [],
+    "references_v2": [
+      {
+        "reference_id": "AVG-4",
+        "reference_type": "",
+        "url": "https://security.archlinux.org/AVG-4"
+      },
+      {
+        "reference_id": "ASA-201702-19",
+        "reference_type": "",
+        "url": "https://security.archlinux.org/ASA-201702-19"
+      }
+    ],
+    "severities": [],
     "date_published": null,
     "weaknesses": [],
     "url": "https://security.archlinux.org/AVG-4.json"