Skip to content

Commit ff08fd6

Browse files
authored
Merge pull request #377 from imnitishng/rename_vuln
[Refactor] Rename `vuln_references` to `references`
2 parents a3e98c2 + 37fc406 commit ff08fd6

41 files changed

Lines changed: 76 additions & 76 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/how-to-guides/add_new_importer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The Building Blocks A.K.A Prerequisites
3636
summary: str
3737
impacted_package_urls: Iterable[PackageURL]
3838
resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list)
39-
vuln_references: List[Reference] = dataclasses.field(default_factory=list)
39+
references: List[Reference] = dataclasses.field(default_factory=list)
4040
vulnerability_id: Optional[str] = None
4141
4242
class Reference:

vulnerabilities/data_source.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,23 @@ class Advisory:
8686
vulnerability_id: Optional[str] = None
8787
impacted_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list)
8888
resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list)
89-
vuln_references: List[Reference] = dataclasses.field(default_factory=list)
89+
references: List[Reference] = dataclasses.field(default_factory=list)
9090

9191
def normalized(self):
9292
impacted_package_urls = {package_url for package_url in self.impacted_package_urls}
9393
resolved_package_urls = {package_url for package_url in self.resolved_package_urls}
94-
vuln_references = sorted(
95-
self.vuln_references, key=lambda reference: (reference.reference_id, reference.url)
94+
references = sorted(
95+
self.references, key=lambda reference: (reference.reference_id, reference.url)
9696
)
97-
for index, _ in enumerate(self.vuln_references):
98-
vuln_references[index] = vuln_references[index].normalized()
97+
for index, _ in enumerate(self.references):
98+
references[index] = references[index].normalized()
9999

100100
return Advisory(
101101
summary=self.summary,
102102
vulnerability_id=self.vulnerability_id,
103103
impacted_package_urls=impacted_package_urls,
104104
resolved_package_urls=resolved_package_urls,
105-
vuln_references=vuln_references,
105+
references=references,
106106
)
107107

108108

@@ -566,7 +566,7 @@ def get_data_from_xml_doc(self, xml_doc: ET.ElementTree, pkg_metadata={}) -> Lis
566566
impacted_package_urls=affected_purls,
567567
resolved_package_urls=safe_purls,
568568
vulnerability_id=vuln_id,
569-
vuln_references=references,
569+
references=references,
570570
)
571571
)
572572
return all_adv

vulnerabilities/import_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def process_advisories(data_source: DataSource) -> None:
123123
for advisory in batch:
124124
try:
125125
vuln, vuln_created = _get_or_create_vulnerability(advisory)
126-
for vuln_ref in advisory.vuln_references:
126+
for vuln_ref in advisory.references:
127127
ref, _ = models.VulnerabilityReference.objects.get_or_create(
128128
vulnerability=vuln, reference_id=vuln_ref.reference_id, url=vuln_ref.url
129129
)

vulnerabilities/importers/alpine_linux.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def _load_advisories(
192192
summary="",
193193
impacted_package_urls=[],
194194
resolved_package_urls=resolved_purls,
195-
vuln_references=references,
195+
references=references,
196196
vulnerability_id=vuln_ids[0] if vuln_ids[0] != "CVE-????-?????" else "",
197197
)
198198
)

vulnerabilities/importers/apache_kafka.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def to_advisory(self, advisory_page):
8686
summary=cve_description_paragraph.text,
8787
impacted_package_urls=affected_packages,
8888
resolved_package_urls=fixed_packages,
89-
vuln_references=[
89+
references=[
9090
Reference(url=ASF_PAGE_URL),
9191
Reference(
9292
url=f"https://cve.mitre.org/cgi-bin/cvename.cgi?name={cve_id}",

vulnerabilities/importers/apache_tomcat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def to_advisories(self, apache_tomcat_advisory_html):
117117
impacted_package_urls=affected_packages,
118118
resolved_package_urls=fixed_package,
119119
vulnerability_id=cve_id,
120-
vuln_references=references,
120+
references=references,
121121
)
122122
)
123123

vulnerabilities/importers/archlinux.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ def _parse(self, record) -> List[Advisory]:
108108
)
109109
)
110110

111-
vuln_references = []
112-
vuln_references.append(
111+
references = []
112+
references.append(
113113
Reference(
114114
reference_id=record["name"],
115115
url="https://security.archlinux.org/{}".format(record["name"]),
@@ -122,7 +122,7 @@ def _parse(self, record) -> List[Advisory]:
122122
)
123123

124124
for ref in record["advisories"]:
125-
vuln_references.append(
125+
references.append(
126126
Reference(
127127
reference_id=ref,
128128
url="https://security.archlinux.org/{}".format(ref),
@@ -135,7 +135,7 @@ def _parse(self, record) -> List[Advisory]:
135135
summary="",
136136
impacted_package_urls=impacted_purls,
137137
resolved_package_urls=resolved_purls,
138-
vuln_references=vuln_references,
138+
references=references,
139139
)
140140
)
141141

vulnerabilities/importers/debian.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def _parse(self, pkg_name: str, records: Mapping[str, Any]) -> List[Advisory]:
155155
summary=record.get("description", ""),
156156
impacted_package_urls=impacted_purls,
157157
resolved_package_urls=resolved_purls,
158-
vuln_references=references,
158+
references=references,
159159
)
160160
)
161161

vulnerabilities/importers/elixir_security.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def process_file(self, path):
126126
PackageURL(name=pkg_name, type="hex", version=version) for version in vuln_pkg_versions
127127
}
128128

129-
vuln_references = [
129+
references = [
130130
Reference(
131131
reference_id=yaml_file["id"],
132132
),
@@ -140,5 +140,5 @@ def process_file(self, path):
140140
impacted_package_urls=vuln_purls,
141141
resolved_package_urls=safe_purls,
142142
vulnerability_id=cve_id,
143-
vuln_references=vuln_references,
143+
references=references,
144144
)

vulnerabilities/importers/gentoo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def process_file(self, file):
8181
summary=xml_data["description"],
8282
impacted_package_urls=xml_data["affected_purls"],
8383
resolved_package_urls=xml_data["unaffected_purls"],
84-
vuln_references=vuln_reference,
84+
references=vuln_reference,
8585
)
8686
advisory_list.append(advisory)
8787
return advisory_list

0 commit comments

Comments
 (0)