Skip to content

Commit 937a249

Browse files
sbs2001sbs2001
committed
Change VulnerabilityReferenceUnit to Reference
Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>
1 parent 116c3fe commit 937a249

24 files changed

Lines changed: 82 additions & 82 deletions

‎vulnerabilities/data_source.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545

4646
@dataclasses.dataclass
47-
class VulnerabilityReferenceUnit:
47+
class Reference:
4848

4949
url: str = ''
5050
reference_id: str = ''
@@ -68,7 +68,7 @@ class Advisory:
6868
summary: str
6969
impacted_package_urls: Iterable[PackageURL]
7070
resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list)
71-
vuln_references: List[VulnerabilityReferenceUnit] = dataclasses.field(default_factory=list)
71+
vuln_references: List[Reference] = dataclasses.field(default_factory=list)
7272
cve_id: Optional[str] = None
7373

7474
def __hash__(self):
@@ -481,7 +481,7 @@ def get_data_from_xml_doc(self, xml_doc: ET.ElementTree, pkg_metadata={}) -> Lis
481481
description = definition_data['description']
482482
affected_purls = set()
483483
safe_purls = set()
484-
references = [VulnerabilityReferenceUnit(url=url)
484+
references = [Reference(url=url)
485485
for url in definition_data['reference_urls']]
486486

487487
for test_data in definition_data['test_data']:

‎vulnerabilities/importers/alpine_linux.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
from vulnerabilities.data_source import Advisory
3636
from vulnerabilities.data_source import GitDataSource
37-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
37+
from vulnerabilities.data_source import Reference
3838

3939

4040
def validate_schema(advisory_dict):
@@ -135,23 +135,23 @@ def _load_advisories(
135135
if reference_id.startswith("XSA"):
136136
xsa_id = reference_id.split("-")[-1]
137137
references.append(
138-
VulnerabilityReferenceUnit(
138+
Reference(
139139
reference_id=reference_id,
140140
url="https://xenbits.xen.org/xsa/advisory-{}.html".format(xsa_id),
141141
)
142142
)
143143

144144
elif reference_id.startswith("ZBX"):
145145
references.append(
146-
VulnerabilityReferenceUnit(
146+
Reference(
147147
reference_id=reference_id,
148148
url="https://support.zabbix.com/browse/{}".format(reference_id),
149149
)
150150
)
151151

152152
elif reference_id.startswith("wnpa-sec"):
153153
references.append(
154-
VulnerabilityReferenceUnit(
154+
Reference(
155155
reference_id=reference_id,
156156
url="https://www.wireshark.org/security/{}.html".format(
157157
reference_id

‎vulnerabilities/importers/archlinux.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from vulnerabilities.data_source import Advisory
3535
from vulnerabilities.data_source import DataSource
3636
from vulnerabilities.data_source import DataSourceConfiguration
37-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
37+
from vulnerabilities.data_source import Reference
3838

3939

4040
def validate_schema(advisory_dict):
@@ -105,15 +105,15 @@ def _parse(self, record) -> List[Advisory]:
105105

106106
vuln_references = []
107107
vuln_references.append(
108-
VulnerabilityReferenceUnit(
108+
Reference(
109109
reference_id=record["name"],
110110
url="https://security.archlinux.org/{}".format(record["name"]),
111111
)
112112
)
113113

114114
for ref in record["advisories"]:
115115
vuln_references.append(
116-
VulnerabilityReferenceUnit(
116+
Reference(
117117
reference_id=ref,
118118
url="https://security.archlinux.org/{}".format(ref),
119119
)

‎vulnerabilities/importers/debian.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from vulnerabilities.data_source import Advisory
3838
from vulnerabilities.data_source import DataSource
3939
from vulnerabilities.data_source import DataSourceConfiguration
40-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
40+
from vulnerabilities.data_source import Reference
4141

4242

4343
def validate_schema(advisory_dict):
@@ -136,7 +136,7 @@ def _parse(self, pkg_name: str, records: Mapping[str, Any]) -> List[Advisory]:
136136
debianbug = record.get('debianbug')
137137
if debianbug:
138138
bug_url = f'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug={debianbug}'
139-
references.append(VulnerabilityReferenceUnit(
139+
references.append(Reference(
140140
url=bug_url,
141141
reference_id=debianbug
142142
))

‎vulnerabilities/importers/gentoo.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from vulnerabilities.data_source import GitDataSource
3030
from vulnerabilities.data_source import Advisory
31-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
31+
from vulnerabilities.data_source import Reference
3232

3333

3434
class GentooDataSource(GitDataSource):
@@ -53,7 +53,7 @@ def process_file(self, file):
5353
xml_root = ET.parse(file).getroot()
5454
glsa = "GLSA-" + xml_root.attrib["id"]
5555
vuln_reference = [
56-
VulnerabilityReferenceUnit(
56+
Reference(
5757
reference_id=glsa,
5858
url="https://security.gentoo.org/glsa/{}".format(xml_root.attrib["id"]),
5959
)

‎vulnerabilities/importers/github.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from vulnerabilities.data_source import Advisory
3939
from vulnerabilities.data_source import DataSource
4040
from vulnerabilities.data_source import DataSourceConfiguration
41-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
41+
from vulnerabilities.data_source import Reference
4242

4343

4444
# set of all possible values of first '%s' = {'MAVEN','COMPOSER', 'NUGET'}
@@ -190,7 +190,7 @@ def process_response(self) -> List[Advisory]:
190190

191191
elif vuln["type"] == "GHSA":
192192
ghsa = vuln['value']
193-
vuln_references.append(VulnerabilityReferenceUnit(
193+
vuln_references.append(Reference(
194194
reference_id=ghsa,
195195
url="https://github.com/advisories/{}".format(
196196
ghsa)

‎vulnerabilities/importers/npm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
from vulnerabilities.data_source import Advisory
3939
from vulnerabilities.data_source import DataSource
40-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
40+
from vulnerabilities.data_source import Reference
4141

4242
NPM_URL = "https://registry.npmjs.org{}"
4343
PAGE = "/-/npm/v1/security/advisories?perPage=100&page=0"
@@ -108,7 +108,7 @@ def _parse(self, records: List[Mapping[str, Any]]) -> List[Advisory]:
108108
impacted_purls = _versions_to_purls(package_name, impacted_versions)
109109
resolved_purls = _versions_to_purls(package_name, resolved_versions)
110110
vuln_reference = [
111-
VulnerabilityReferenceUnit(
111+
Reference(
112112
url=NPM_URL.format(f'/-/npm/v1/advisories/{record["id"]}'),
113113
reference_id=record["id"],
114114
)

‎vulnerabilities/importers/openssl.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from vulnerabilities.data_source import Advisory
3030
from vulnerabilities.data_source import DataSource
31-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
31+
from vulnerabilities.data_source import Reference
3232

3333
import xml.etree.ElementTree as ET
3434

@@ -71,7 +71,7 @@ def to_advisories(xml_response: str) -> Set[Advisory]:
7171
if info:
7272
commit_hash = info[0].attrib["hash"]
7373
ref_urls.append(
74-
VulnerabilityReferenceUnit(
74+
Reference(
7575
url="https://github.com/openssl/openssl/commit/" + commit_hash
7676
)
7777
)

‎vulnerabilities/importers/redhat.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from vulnerabilities.data_source import Advisory
2828
from vulnerabilities.data_source import DataSource
2929
from vulnerabilities.data_source import DataSourceConfiguration
30-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
30+
from vulnerabilities.data_source import Reference
3131

3232

3333
class RedhatDataSource(DataSource):
@@ -76,20 +76,20 @@ def to_advisory(advisory_data):
7676
if advisory_data.get("bugzilla"):
7777
bugzilla = advisory_data.get("bugzilla")
7878
references.append(
79-
VulnerabilityReferenceUnit(
79+
Reference(
8080
url="https://bugzilla.redhat.com/show_bug.cgi?id={}".format(bugzilla),
8181
reference_id=bugzilla,
8282
)
8383
)
8484

8585
for rhsa in advisory_data["advisories"]:
8686
references.append(
87-
VulnerabilityReferenceUnit(
87+
Reference(
8888
url="https://access.redhat.com/errata/{}".format(rhsa), reference_id=rhsa,
8989
)
9090
)
9191

92-
references.append(VulnerabilityReferenceUnit(url=advisory_data["resource_url"]))
92+
references.append(Reference(url=advisory_data["resource_url"]))
9393

9494
return Advisory(
9595
summary=advisory_data["bugzilla_description"],

‎vulnerabilities/importers/retiredotnet.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from vulnerabilities.data_source import GitDataSource
3131
from vulnerabilities.data_source import GitDataSourceConfiguration
3232
from vulnerabilities.data_source import Advisory
33-
from vulnerabilities.data_source import VulnerabilityReferenceUnit
33+
from vulnerabilities.data_source import Reference
3434

3535

3636
class RetireDotnetDataSource(GitDataSource):
@@ -91,7 +91,7 @@ def process_file(self, path) -> List[Advisory]:
9191
version=pkg['fix'],
9292
type='nuget'))
9393

94-
vuln_reference = [VulnerabilityReferenceUnit(
94+
vuln_reference = [Reference(
9595
url=json_doc['link'],
9696
)]
9797

0 commit comments

Comments
 (0)