Address Ziad review: reference_type, cpeUri refs, specific exceptions

Signed-off-by: Anmol Vats <anmolvats2003@gmail.com>

Author: NucleiAv

vulnerabilities/pipelines/v2_importers/alpine_security_importer.py

@@ -48,7 +48,7 @@ def get_branches() -> list:
         data = resp.json()
         # Branch entries have dict values; scalar values indicate non-branch keys.
         active = [k for k, v in data.items() if isinstance(v, dict)]
-    except Exception as e:
+    except (requests.RequestException, ValueError) as e:
         logger.error("Failed to discover branches from root API: %s", e)
         active = []
 
@@ -76,7 +76,7 @@ def advisories_count(self) -> int:
                 resp = requests.get(url, headers=ADVISORY_HEADERS, timeout=30)
                 resp.raise_for_status()
                 data = resp.json()
-            except Exception as e:
+            except (requests.RequestException, ValueError) as e:
                 logger.error("Failed to fetch branch %s: %s", branch, e)
                 continue
             count += len(data.get("items") or [])
@@ -89,7 +89,7 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
                 resp = requests.get(url, headers=ADVISORY_HEADERS, timeout=30)
                 resp.raise_for_status()
                 data = resp.json()
-            except Exception as e:
+            except (requests.RequestException, ValueError) as e:
                 logger.error("Failed to fetch branch %s: %s", branch, e)
                 continue
             for item in data.get("items") or []:
@@ -111,7 +111,17 @@ def parse_advisory(data: dict):
     for ref in data.get("ref") or []:
         ref_url = ref.get("rel") or ""
         if ref_url:
-            references.append(ReferenceV2(url=ref_url))
+            references.append(
+                ReferenceV2(
+                    url=ref_url,
+                    reference_type=ref.get("referenceType") or "",
+                )
+            )
+    for cpe_match in data.get("cpeMatch") or []:
+        cpe_uri = cpe_match.get("cpeUri") or ""
+        cpe_id = cpe_match.get("id") or ""
+        if cpe_uri and cpe_id:
+            references.append(ReferenceV2(url=cpe_id, reference_id=cpe_uri))
 
     severities = []
     cvss3 = data.get("cvss3") or {}

vulnerabilities/tests/test_alpine_security_importer.py

@@ -12,6 +12,8 @@
 from unittest.mock import MagicMock
 from unittest.mock import patch
 
+import requests
+
 from vulnerabilities.pipelines.v2_importers.alpine_security_importer import (
     AlpineSecurityImporterPipeline,
 )
@@ -107,7 +109,7 @@ def test_collect_advisories_yields_advisory(self, mock_get, mock_branches):
     @patch("vulnerabilities.pipelines.v2_importers.alpine_security_importer.requests.get")
     def test_collect_advisories_http_error_logs_and_continues(self, mock_get, mock_branches):
         mock_branches.return_value = ["3.19-main"]
-        mock_get.side_effect = Exception("timeout")
+        mock_get.side_effect = requests.RequestException("timeout")
         logger_name = "vulnerabilities.pipelines.v2_importers.alpine_security_importer"
         with self.assertLogs(logger_name, level="ERROR") as cm:
             advisories = list(AlpineSecurityImporterPipeline().collect_advisories())

vulnerabilities/tests/test_data/alpine_security/alpine_security_mock1.json

@@ -1 +1,103 @@
-{"@context":"https://security.alpinelinux.org/static/context.jsonld","cpeMatch":[{"@context":"https://security.alpinelinux.org/static/context.jsonld","cpeUri":"","id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#cpeMatch/940449","maximumVersion":"2.10","maximumVersionOp":"<=","minimumVersion":"0","minimumVersionOp":">=","package":"https://security.alpinelinux.org/srcpkg/net-tools","type":"CPEMatch","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"}],"cvss3":{"score":6.6,"vector":"CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:L/I:L/A:H"},"description":"net-tools is a collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system. Inn versions up to and including 2.10, the Linux network utilities (like ifconfig) from the net-tools package do not properly validate the structure of /proc files when showing interfaces. `get_name()` in `interface.c` copies interface labels from `/proc/net/dev` into a fixed 16-byte stack buffer without bounds checking, leading to possible arbitrary code execution or crash. The known attack path does not require privilege but also does not provide privilege escalation in this scenario. A patch is available and expected to be part of version 2.20.","id":"https://security.alpinelinux.org/vuln/CVE-2025-46836","ref":[{"@context":"https://security.alpinelinux.org/static/context.jsonld","id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/588613","referenceType":"MISC","rel":"https://github.com/ecki/net-tools/commit/7a8f42fb20013a1493d8cae1c43436f85e656f2d","type":"Reference"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/588614","referenceType":"CONFIRM","rel":"https://github.com/ecki/net-tools/security/advisories/GHSA-pfwf-h6m3-63wf","type":"Reference"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/593944","referenceType":"af854a3a-2127-422b-91ae-364da2661108","rel":"https://lists.debian.org/debian-lts-announce/2025/05/msg00053.html","type":"Reference"}],"state":[{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/108203","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"edge-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/415014","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"3.23-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/125956","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"3.22-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/127510","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"3.21-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/127996","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"3.20-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"},{"@context":"https://security.alpinelinux.org/static/context.jsonld","fixed":false,"id":"https://security.alpinelinux.org/vuln/CVE-2025-46836#state/128449","packageVersion":"https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3","repo":"3.19-main","type":"VulnerabilityState","vuln":"https://security.alpinelinux.org/vuln/CVE-2025-46836"}],"type":"Vulnerability"}
+{
+  "@context": "https://security.alpinelinux.org/static/context.jsonld",
+  "cpeMatch": [
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "cpeUri": "",
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#cpeMatch/940449",
+      "maximumVersion": "2.10",
+      "maximumVersionOp": "<=",
+      "minimumVersion": "0",
+      "minimumVersionOp": ">=",
+      "package": "https://security.alpinelinux.org/srcpkg/net-tools",
+      "type": "CPEMatch",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    }
+  ],
+  "cvss3": {
+    "score": 6.6,
+    "vector": "CVSS:3.1/AV:L/AC:L/PR:L/UI:N/S:U/C:L/I:L/A:H"
+  },
+  "description": "net-tools is a collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system. Inn versions up to and including 2.10, the Linux network utilities (like ifconfig) from the net-tools package do not properly validate the structure of /proc files when showing interfaces. `get_name()` in `interface.c` copies interface labels from `/proc/net/dev` into a fixed 16-byte stack buffer without bounds checking, leading to possible arbitrary code execution or crash. The known attack path does not require privilege but also does not provide privilege escalation in this scenario. A patch is available and expected to be part of version 2.20.",
+  "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836",
+  "ref": [
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/588613",
+      "referenceType": "MISC",
+      "rel": "https://github.com/ecki/net-tools/commit/7a8f42fb20013a1493d8cae1c43436f85e656f2d",
+      "type": "Reference"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/588614",
+      "referenceType": "CONFIRM",
+      "rel": "https://github.com/ecki/net-tools/security/advisories/GHSA-pfwf-h6m3-63wf",
+      "type": "Reference"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#ref/593944",
+      "referenceType": "af854a3a-2127-422b-91ae-364da2661108",
+      "rel": "https://lists.debian.org/debian-lts-announce/2025/05/msg00053.html",
+      "type": "Reference"
+    }
+  ],
+  "state": [
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/108203",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "edge-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/415014",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "3.23-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/125956",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "3.22-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/127510",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "3.21-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/127996",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "3.20-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    },
+    {
+      "@context": "https://security.alpinelinux.org/static/context.jsonld",
+      "fixed": false,
+      "id": "https://security.alpinelinux.org/vuln/CVE-2025-46836#state/128449",
+      "packageVersion": "https://security.alpinelinux.org/srcpkg/net-tools/2.10-r3",
+      "repo": "3.19-main",
+      "type": "VulnerabilityState",
+      "vuln": "https://security.alpinelinux.org/vuln/CVE-2025-46836"
+    }
+  ],
+  "type": "Vulnerability"
+}