Skip to content

Commit 2dbbd38

Browse files
authored
Merge pull request #2196 from aboutcode-org/review_v2_pipelines
Review all v2 pipelines
2 parents 65d7a58 + 3757ec7 commit 2dbbd38

19 files changed

+144
-5
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ Version v37.0.0
1313
- We have added new models AdvisoryV2, AdvisoryAlias, AdvisoryReference, AdvisorySeverity, AdvisoryWeakness, PackageV2 and CodeFixV2.
1414
- We are using ``avid`` as an internal advisory ID for uniquely identifying advisories.
1515
- We have a new route ``/v2`` which only support package search which has information on packages that are reported to be affected or fixing by advisories.
16-
- This version introduces ``/api/v2/advisories-packages`` which has information on packages that are reported to be affected or fixing by advisories.
16+
- This version introduces ``/api/v3/packages`` which has information on packages that are reported to be affected or fixing by advisories.
1717
- Pipeline Dashboard improvements #1920.
1818
- Throttle API requests based on user permissions #1909.
1919
- Add pipeline to compute Advisory ToDos #1764
20+
- Use related advisory severity to calculate exploitibility, weighted severity and risk scores
21+
- Migrate all importers to use the new advisory models. All new advisories have a unique AVID and all importers will use this AVID as the unique identifier for advisories instead of CVE ID or other identifiers used by the data sources #1881.
22+
- Handle advisories with same and related data https://github.com/aboutcode-org/vulnerablecode/issues/2099.
23+
- Add a pipeline for exporting VulnerableCode data to FederatedCode #2110.
24+
- Plan storing of exploits and EPSS based advisories #2069.
25+
2026

2127
Version v36.1.3
2228
---------------------

PIPELINES-AVID.rst

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
.. list-table:: Pipeline AVID Mapping
2+
:header-rows: 1
3+
:widths: 35 65
4+
5+
* - pipeline name
6+
- AVID
7+
* - alpine_linux_importer_v2
8+
- {package_name}/{distroversion}/{version}/{vulnerability_id}
9+
* - aosp_dataset_fix_commits
10+
- CVE ID of the record
11+
* - apache_httpd_importer_v2
12+
- CVE ID of the record
13+
* - apache_kafka_importer_v2
14+
- CVE ID of the record
15+
* - apache_tomcat_importer_v2
16+
- {page_id}/{cve_id}
17+
* - archlinux_importer_v2
18+
- AVG ID of the record
19+
* - curl_importer_v2
20+
- CURL-CVE ID of the record
21+
* - debian_importer_v2
22+
- {package_name}/{debian_record_id}
23+
* - elixir_security_importer_v2
24+
- {package_name}/{file_id}
25+
* - epss_importer_v2
26+
- CVE ID of the record
27+
* - fireeye_importer_v2
28+
- {file_id}
29+
* - gentoo_importer_v2
30+
- GLSA ID of the record
31+
* - github_osv_importer_v2
32+
- ID of the OSV record
33+
* - gitlab_importer_v2
34+
- Identifier of the GitLab community advisory record
35+
* - istio_importer_v2
36+
- ISTIO-SECURITY-<ID>
37+
* - mattermost_importer_v2
38+
- MMSA-<ID>
39+
* - mozilla_importer_v2
40+
- MFSA-<ID>
41+
* - nginx_importer_v2
42+
- First alias of the record
43+
* - nodejs_security_wg
44+
- NPM-<ID>
45+
* - nvd_importer_v2
46+
- CVE ID of the record
47+
* - openssl_importer_v2
48+
- CVE ID of the record
49+
* - oss_fuzz_importer_v2
50+
- ID of the OSV record
51+
* - postgresql_importer_v2
52+
- CVE ID of the record
53+
* - project-kb-msr-2019_v2
54+
- Vulnerability ID of the record
55+
* - project-kb-statements_v2
56+
- Vulnerability ID of the record
57+
* - pypa_importer_v2
58+
- ID of the OSV record
59+
* - pysec_importer_v2
60+
- ID of the OSV record
61+
* - redhat_importer_v2
62+
- RHSA ID of the record
63+
* - retiredotnet_importer_v2
64+
- retiredotnet-{file_id}
65+
* - ruby_importer_v2
66+
- {file_id}
67+
* - suse_importer_v2
68+
- CVE ID of the record
69+
* - ubuntu_osv_importer_v2
70+
- ID of the OSV record
71+
* - vulnrichment_importer_v2
72+
- CVE ID of the record
73+
* - xen_importer_v2
74+
- XSA-<ID>

vulnerabilities/pipelines/v2_importers/alpine_linux_importer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10+
import json
1011
import logging
1112
from pathlib import Path
1213
from typing import Any
@@ -244,4 +245,5 @@ def load_advisories(
244245
references=references,
245246
affected_packages=affected_packages,
246247
url=url,
248+
original_advisory_text=json.dumps(pkg_infos, indent=2, ensure_ascii=False),
247249
)

vulnerabilities/pipelines/v2_importers/apache_tomcat_importer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
111111
summary=advisory_list[0].summary,
112112
affected_packages=affected_packages,
113113
url=page_url,
114+
original_advisory_text=str(content),
114115
)
115116

116117
except Exception as e:

vulnerabilities/pipelines/v2_importers/archlinux_importer.py

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
from packageurl import PackageURL
1515
from univers.version_range import ArchLinuxVersionRange
1616

17+
from vulnerabilities import severity_systems
1718
from vulnerabilities.importer import AdvisoryDataV2
1819
from vulnerabilities.importer import AffectedPackageV2
1920
from vulnerabilities.importer import ReferenceV2
21+
from vulnerabilities.importer import VulnerabilitySeverity
2022
from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipelineV2
23+
from vulnerabilities.severity_systems import SCORING_SYSTEMS
2124
from vulnerabilities.utils import fetch_response
2225

2326

@@ -53,7 +56,9 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
5356
def parse_advisory(self, record) -> AdvisoryDataV2:
5457
affected_packages = []
5558
references = []
59+
severities = []
5660
avg_name = record.get("name")
61+
severity = record.get("severity")
5762
aliases = record.get("issues", [])
5863
aliases.extend(record.get("advisories", []))
5964
summary = record.get("type", "")
@@ -92,13 +97,26 @@ def parse_advisory(self, record) -> AdvisoryDataV2:
9297
)
9398
)
9499

100+
if severity not in severity_systems.ARCHLINUX.choices:
101+
self.log(f"Unknown severity {severity} for {avg_name}")
102+
severity = None
103+
if severity:
104+
severities = [
105+
VulnerabilitySeverity(
106+
system=severity_systems.ARCHLINUX,
107+
value=severity,
108+
url="https://security.archlinux.org/{avg_name}.json",
109+
)
110+
]
111+
95112
return AdvisoryDataV2(
96113
advisory_id=avg_name,
97114
aliases=aliases,
98115
summary=summary,
99116
references=references,
100117
affected_packages=affected_packages,
118+
severities=severities,
101119
weaknesses=[],
102120
url=f"https://security.archlinux.org/{avg_name}.json",
103-
original_advisory_text=json.dumps(record),
121+
original_advisory_text=json.dumps(record, indent=2, ensure_ascii=False),
104122
)

vulnerabilities/pipelines/v2_importers/debian_importer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10+
import json
1011
import re
1112
from typing import Any
1213
from typing import Iterable
@@ -171,6 +172,7 @@ def parse(self, pkg_name: str, records: Mapping[str, Any]) -> Iterable[AdvisoryD
171172
references=references,
172173
weaknesses=weaknesses,
173174
url=f"https://security-tracker.debian.org/tracker/{record_identifier}",
175+
original_advisory_text=json.dumps(record, indent=2, ensure_ascii=False),
174176
)
175177

176178

vulnerabilities/pipelines/v2_importers/epss_importer_v2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,5 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
8383
severities=[severity],
8484
references=[references],
8585
url=self.advisory_url,
86+
original_advisory_text=",".join(epss_row),
8687
)

vulnerabilities/pipelines/v2_importers/istio_importer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class IstioImporterPipeline(VulnerableCodeBaseImporterPipelineV2):
4242
spdx_license_expression = "Apache-2.0"
4343
license_url = "https://github.com/istio/istio.io/blob/master/LICENSE"
4444
repo_url = "git+https://github.com/istio/istio.io"
45+
run_once = True
4546

4647
precedence = 200
4748

vulnerabilities/pipelines/v2_importers/mattermost_importer.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# See https://aboutcode.org for more information about nexB OSS projects.
88
#
99

10+
import json
1011
from typing import Iterable
1112

1213
from packageurl import PackageURL
@@ -122,5 +123,7 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
122123
summary=details,
123124
references=[reference],
124125
affected_packages=affected_packages,
126+
severities=severities,
125127
url=self.url,
128+
original_advisory_text=json.dumps(advisory, indent=2, ensure_ascii=False),
126129
)

vulnerabilities/pipelines/v2_importers/nginx_importer.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def collect_advisories(self):
6262
vulnerability_list = soup.select("li p")
6363
for vulnerability_info in vulnerability_list:
6464
ngnix_advisory = parse_advisory_data_from_paragraph(vulnerability_info)
65-
yield to_advisory_data(ngnix_advisory)
65+
yield to_advisory_data(ngnix_advisory, vulnerability_info)
6666

6767

6868
class NginxAdvisory(NamedTuple):
@@ -79,7 +79,7 @@ def to_dict(self):
7979
return self._asdict()
8080

8181

82-
def to_advisory_data(nginx_adv: NginxAdvisory) -> AdvisoryDataV2:
82+
def to_advisory_data(nginx_adv: NginxAdvisory, vulnerability_info) -> AdvisoryDataV2:
8383
"""
8484
Return AdvisoryDataV2 from an NginxAdvisory tuple.
8585
"""
@@ -150,6 +150,7 @@ def to_advisory_data(nginx_adv: NginxAdvisory) -> AdvisoryDataV2:
150150
references=nginx_adv.references,
151151
patches=nginx_adv.patches,
152152
url="https://nginx.org/en/security_advisories.html",
153+
original_advisory_text=str(vulnerability_info),
153154
)
154155

155156

0 commit comments

Comments
 (0)