From 37fc40606facba38b08b1b403203555da2b3d1c4 Mon Sep 17 00:00:00 2001 From: Nitish Gupta Date: Sun, 14 Mar 2021 21:35:56 +0530 Subject: [PATCH] [Refactor] Rename `vuln_references` to `references` Signed-off-by: Nitish Gupta --- docs/how-to-guides/add_new_importer.rst | 2 +- vulnerabilities/data_source.py | 14 +++++++------- vulnerabilities/import_runner.py | 2 +- vulnerabilities/importers/alpine_linux.py | 2 +- vulnerabilities/importers/apache_kafka.py | 2 +- vulnerabilities/importers/apache_tomcat.py | 2 +- vulnerabilities/importers/archlinux.py | 8 ++++---- vulnerabilities/importers/debian.py | 2 +- vulnerabilities/importers/elixir_security.py | 4 ++-- vulnerabilities/importers/gentoo.py | 2 +- vulnerabilities/importers/github.py | 6 +++--- vulnerabilities/importers/kaybee.py | 2 +- vulnerabilities/importers/npm.py | 2 +- vulnerabilities/importers/nvd.py | 2 +- vulnerabilities/importers/openssl.py | 2 +- vulnerabilities/importers/postgresql.py | 2 +- vulnerabilities/importers/project_kb_msr2019.py | 2 +- vulnerabilities/importers/redhat.py | 2 +- vulnerabilities/importers/retiredotnet.py | 2 +- vulnerabilities/importers/ruby.py | 2 +- vulnerabilities/importers/rust.py | 2 +- vulnerabilities/importers/safety_db.py | 2 +- vulnerabilities/importers/suse_scores.py | 2 +- vulnerabilities/importers/ubuntu_usn.py | 2 +- vulnerabilities/tests/test_alpine.py | 12 ++++++------ vulnerabilities/tests/test_apache_kafka.py | 2 +- vulnerabilities/tests/test_apache_tomcat.py | 8 ++++---- vulnerabilities/tests/test_elixir_security.py | 2 +- vulnerabilities/tests/test_gentoo.py | 2 +- vulnerabilities/tests/test_github.py | 10 +++++----- vulnerabilities/tests/test_import_runner.py | 2 +- vulnerabilities/tests/test_nginx.py | 12 ++++++------ vulnerabilities/tests/test_nvd.py | 2 +- vulnerabilities/tests/test_openssl.py | 4 ++-- vulnerabilities/tests/test_postgresql.py | 4 ++-- vulnerabilities/tests/test_redhat_importer.py | 2 +- vulnerabilities/tests/test_retiredotnet.py | 2 +- vulnerabilities/tests/test_ruby.py | 4 ++-- vulnerabilities/tests/test_suse_scores.py | 4 ++-- vulnerabilities/tests/test_ubuntu.py | 4 ++-- vulnerabilities/tests/test_ubuntu_usn.py | 4 ++-- 41 files changed, 76 insertions(+), 76 deletions(-) diff --git a/docs/how-to-guides/add_new_importer.rst b/docs/how-to-guides/add_new_importer.rst index 5a921bd26..78cd55529 100644 --- a/docs/how-to-guides/add_new_importer.rst +++ b/docs/how-to-guides/add_new_importer.rst @@ -36,7 +36,7 @@ The Building Blocks A.K.A Prerequisites summary: str impacted_package_urls: Iterable[PackageURL] resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list) - vuln_references: List[Reference] = dataclasses.field(default_factory=list) + references: List[Reference] = dataclasses.field(default_factory=list) vulnerability_id: Optional[str] = None class Reference: diff --git a/vulnerabilities/data_source.py b/vulnerabilities/data_source.py index f1d751d46..28895a9cb 100644 --- a/vulnerabilities/data_source.py +++ b/vulnerabilities/data_source.py @@ -86,23 +86,23 @@ class Advisory: vulnerability_id: Optional[str] = None impacted_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list) resolved_package_urls: Iterable[PackageURL] = dataclasses.field(default_factory=list) - vuln_references: List[Reference] = dataclasses.field(default_factory=list) + references: List[Reference] = dataclasses.field(default_factory=list) def normalized(self): impacted_package_urls = {package_url for package_url in self.impacted_package_urls} resolved_package_urls = {package_url for package_url in self.resolved_package_urls} - vuln_references = sorted( - self.vuln_references, key=lambda reference: (reference.reference_id, reference.url) + references = sorted( + self.references, key=lambda reference: (reference.reference_id, reference.url) ) - for index, _ in enumerate(self.vuln_references): - vuln_references[index] = vuln_references[index].normalized() + for index, _ in enumerate(self.references): + references[index] = references[index].normalized() return Advisory( summary=self.summary, vulnerability_id=self.vulnerability_id, impacted_package_urls=impacted_package_urls, resolved_package_urls=resolved_package_urls, - vuln_references=vuln_references, + references=references, ) @@ -566,7 +566,7 @@ def get_data_from_xml_doc(self, xml_doc: ET.ElementTree, pkg_metadata={}) -> Lis impacted_package_urls=affected_purls, resolved_package_urls=safe_purls, vulnerability_id=vuln_id, - vuln_references=references, + references=references, ) ) return all_adv diff --git a/vulnerabilities/import_runner.py b/vulnerabilities/import_runner.py index dfd0da49b..400b16777 100644 --- a/vulnerabilities/import_runner.py +++ b/vulnerabilities/import_runner.py @@ -123,7 +123,7 @@ def process_advisories(data_source: DataSource) -> None: for advisory in batch: try: vuln, vuln_created = _get_or_create_vulnerability(advisory) - for vuln_ref in advisory.vuln_references: + for vuln_ref in advisory.references: ref, _ = models.VulnerabilityReference.objects.get_or_create( vulnerability=vuln, reference_id=vuln_ref.reference_id, url=vuln_ref.url ) diff --git a/vulnerabilities/importers/alpine_linux.py b/vulnerabilities/importers/alpine_linux.py index 2b4519a46..d3831f47c 100644 --- a/vulnerabilities/importers/alpine_linux.py +++ b/vulnerabilities/importers/alpine_linux.py @@ -192,7 +192,7 @@ def _load_advisories( summary="", impacted_package_urls=[], resolved_package_urls=resolved_purls, - vuln_references=references, + references=references, vulnerability_id=vuln_ids[0] if vuln_ids[0] != "CVE-????-?????" else "", ) ) diff --git a/vulnerabilities/importers/apache_kafka.py b/vulnerabilities/importers/apache_kafka.py index e7ffac7a2..3eb0f5771 100644 --- a/vulnerabilities/importers/apache_kafka.py +++ b/vulnerabilities/importers/apache_kafka.py @@ -86,7 +86,7 @@ def to_advisory(self, advisory_page): summary=cve_description_paragraph.text, impacted_package_urls=affected_packages, resolved_package_urls=fixed_packages, - vuln_references=[ + references=[ Reference(url=ASF_PAGE_URL), Reference( url=f"https://cve.mitre.org/cgi-bin/cvename.cgi?name={cve_id}", diff --git a/vulnerabilities/importers/apache_tomcat.py b/vulnerabilities/importers/apache_tomcat.py index 2c77c58a2..3ec166855 100644 --- a/vulnerabilities/importers/apache_tomcat.py +++ b/vulnerabilities/importers/apache_tomcat.py @@ -117,7 +117,7 @@ def to_advisories(self, apache_tomcat_advisory_html): impacted_package_urls=affected_packages, resolved_package_urls=fixed_package, vulnerability_id=cve_id, - vuln_references=references, + references=references, ) ) diff --git a/vulnerabilities/importers/archlinux.py b/vulnerabilities/importers/archlinux.py index 0d298b012..b9e4c5018 100644 --- a/vulnerabilities/importers/archlinux.py +++ b/vulnerabilities/importers/archlinux.py @@ -108,8 +108,8 @@ def _parse(self, record) -> List[Advisory]: ) ) - vuln_references = [] - vuln_references.append( + references = [] + references.append( Reference( reference_id=record["name"], url="https://security.archlinux.org/{}".format(record["name"]), @@ -122,7 +122,7 @@ def _parse(self, record) -> List[Advisory]: ) for ref in record["advisories"]: - vuln_references.append( + references.append( Reference( reference_id=ref, url="https://security.archlinux.org/{}".format(ref), @@ -135,7 +135,7 @@ def _parse(self, record) -> List[Advisory]: summary="", impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, - vuln_references=vuln_references, + references=references, ) ) diff --git a/vulnerabilities/importers/debian.py b/vulnerabilities/importers/debian.py index e4c7fe613..ae9004f37 100644 --- a/vulnerabilities/importers/debian.py +++ b/vulnerabilities/importers/debian.py @@ -155,7 +155,7 @@ def _parse(self, pkg_name: str, records: Mapping[str, Any]) -> List[Advisory]: summary=record.get("description", ""), impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, - vuln_references=references, + references=references, ) ) diff --git a/vulnerabilities/importers/elixir_security.py b/vulnerabilities/importers/elixir_security.py index 65a42e754..f10f436b1 100644 --- a/vulnerabilities/importers/elixir_security.py +++ b/vulnerabilities/importers/elixir_security.py @@ -126,7 +126,7 @@ def process_file(self, path): PackageURL(name=pkg_name, type="hex", version=version) for version in vuln_pkg_versions } - vuln_references = [ + references = [ Reference( reference_id=yaml_file["id"], ), @@ -140,5 +140,5 @@ def process_file(self, path): impacted_package_urls=vuln_purls, resolved_package_urls=safe_purls, vulnerability_id=cve_id, - vuln_references=vuln_references, + references=references, ) diff --git a/vulnerabilities/importers/gentoo.py b/vulnerabilities/importers/gentoo.py index 86698e527..d4cb85fc4 100644 --- a/vulnerabilities/importers/gentoo.py +++ b/vulnerabilities/importers/gentoo.py @@ -81,7 +81,7 @@ def process_file(self, file): summary=xml_data["description"], impacted_package_urls=xml_data["affected_purls"], resolved_package_urls=xml_data["unaffected_purls"], - vuln_references=vuln_reference, + references=vuln_reference, ) advisory_list.append(advisory) return advisory_list diff --git a/vulnerabilities/importers/github.py b/vulnerabilities/importers/github.py index f770bac98..258e83f14 100644 --- a/vulnerabilities/importers/github.py +++ b/vulnerabilities/importers/github.py @@ -216,7 +216,7 @@ def process_response(self) -> List[Advisory]: unaffected_purls = set() cve_ids = set() - vuln_references = self.extract_references(adv["node"]["advisory"]["references"]) + references = self.extract_references(adv["node"]["advisory"]["references"]) vuln_desc = adv["node"]["advisory"]["summary"] for identifier in adv["node"]["advisory"]["identifiers"]: @@ -226,7 +226,7 @@ def process_response(self) -> List[Advisory]: # attach the GHSA with severity score if identifier["type"] == "GHSA": - for ref in vuln_references: + for ref in references: if ref.reference_id == identifier["value"]: ref.severities = [ VulnerabilitySeverity( @@ -245,7 +245,7 @@ def process_response(self) -> List[Advisory]: summary=vuln_desc, impacted_package_urls=affected_purls, resolved_package_urls=unaffected_purls, - vuln_references=vuln_references, + references=references, ) ) return adv_list diff --git a/vulnerabilities/importers/kaybee.py b/vulnerabilities/importers/kaybee.py index 8ff07b18e..c25879fb5 100644 --- a/vulnerabilities/importers/kaybee.py +++ b/vulnerabilities/importers/kaybee.py @@ -70,5 +70,5 @@ def yaml_file_to_advisory(yaml_path): summary=summary, impacted_package_urls=impacted_packages, resolved_package_urls=resolved_packages, - vuln_references=references, + references=references, ) diff --git a/vulnerabilities/importers/npm.py b/vulnerabilities/importers/npm.py index c2192e223..055f3c945 100644 --- a/vulnerabilities/importers/npm.py +++ b/vulnerabilities/importers/npm.py @@ -109,7 +109,7 @@ def process_file(self, file) -> List[Advisory]: vulnerability_id=cve_id, impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, - vuln_references=vuln_reference, + references=vuln_reference, ) ) return advisories diff --git a/vulnerabilities/importers/nvd.py b/vulnerabilities/importers/nvd.py index efe6b060f..711511b30 100644 --- a/vulnerabilities/importers/nvd.py +++ b/vulnerabilities/importers/nvd.py @@ -91,7 +91,7 @@ def to_advisories(self, nvd_data): yield Advisory( vulnerability_id=cve_id, summary=summary, - vuln_references=references, + references=references, impacted_package_urls=[], # nopep8 ) diff --git a/vulnerabilities/importers/openssl.py b/vulnerabilities/importers/openssl.py index 53ca4a9e6..03d8c00a4 100644 --- a/vulnerabilities/importers/openssl.py +++ b/vulnerabilities/importers/openssl.py @@ -115,7 +115,7 @@ def to_advisories(xml_response: str) -> Set[Advisory]: summary=summary, impacted_package_urls=vuln_purls, resolved_package_urls=safe_purls, - vuln_references=ref_urls, + references=ref_urls, ) advisories.append(advisory) diff --git a/vulnerabilities/importers/postgresql.py b/vulnerabilities/importers/postgresql.py index 34358be0a..53961e994 100644 --- a/vulnerabilities/importers/postgresql.py +++ b/vulnerabilities/importers/postgresql.py @@ -107,7 +107,7 @@ def to_advisories(data): Advisory( vulnerability_id=cve_id, summary=summary, - vuln_references=references, + references=references, impacted_package_urls=affected_packages, resolved_package_urls=fixed_packages, ) diff --git a/vulnerabilities/importers/project_kb_msr2019.py b/vulnerabilities/importers/project_kb_msr2019.py index 932bd541e..156cfb82f 100644 --- a/vulnerabilities/importers/project_kb_msr2019.py +++ b/vulnerabilities/importers/project_kb_msr2019.py @@ -81,7 +81,7 @@ def to_advisories(csv_reader): Advisory( summary="", impacted_package_urls=[], - vuln_references=[reference], + references=[reference], cve_id=vuln_id, ) ) diff --git a/vulnerabilities/importers/redhat.py b/vulnerabilities/importers/redhat.py index 959fcda85..1fba1c484 100644 --- a/vulnerabilities/importers/redhat.py +++ b/vulnerabilities/importers/redhat.py @@ -154,7 +154,7 @@ def to_advisory(advisory_data): vulnerability_id=advisory_data["CVE"], summary=advisory_data["bugzilla_description"], impacted_package_urls=affected_purls, - vuln_references=references, + references=references, ) diff --git a/vulnerabilities/importers/retiredotnet.py b/vulnerabilities/importers/retiredotnet.py index 55a1228c4..dff6c3e1d 100644 --- a/vulnerabilities/importers/retiredotnet.py +++ b/vulnerabilities/importers/retiredotnet.py @@ -98,5 +98,5 @@ def process_file(self, path) -> List[Advisory]: impacted_package_urls=affected_purls, resolved_package_urls=fixed_purls, vulnerability_id=vuln_id, - vuln_references=vuln_reference, + references=vuln_reference, ) diff --git a/vulnerabilities/importers/ruby.py b/vulnerabilities/importers/ruby.py index 75d4317a0..a22006923 100644 --- a/vulnerabilities/importers/ruby.py +++ b/vulnerabilities/importers/ruby.py @@ -129,7 +129,7 @@ def process_file(self, path) -> List[Advisory]: summary=record.get("description", ""), impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, - vuln_references=references, + references=references, vulnerability_id=cve_id, ) diff --git a/vulnerabilities/importers/rust.py b/vulnerabilities/importers/rust.py index f7d120f61..13bda2407 100644 --- a/vulnerabilities/importers/rust.py +++ b/vulnerabilities/importers/rust.py @@ -136,7 +136,7 @@ def _load_advisory(self, path: str) -> Optional[Advisory]: impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, vulnerability_id=cve_id, - vuln_references=references, + references=references, ) diff --git a/vulnerabilities/importers/safety_db.py b/vulnerabilities/importers/safety_db.py index 028caa95e..2cacd9f80 100755 --- a/vulnerabilities/importers/safety_db.py +++ b/vulnerabilities/importers/safety_db.py @@ -136,7 +136,7 @@ def updated_advisories(self) -> Set[Advisory]: Advisory( vulnerability_id=cve_id, summary=advisory["advisory"], - vuln_references=reference, + references=reference, impacted_package_urls=impacted_purls, resolved_package_urls=resolved_purls, ) diff --git a/vulnerabilities/importers/suse_scores.py b/vulnerabilities/importers/suse_scores.py index 77002ba44..55f7cf304 100644 --- a/vulnerabilities/importers/suse_scores.py +++ b/vulnerabilities/importers/suse_scores.py @@ -76,7 +76,7 @@ def to_advisory(score_data): vulnerability_id=cve_id, summary="", impacted_package_urls=[], - vuln_references=[Reference(url=URL, severities=severities)], + references=[Reference(url=URL, severities=severities)], ) ) return advisories diff --git a/vulnerabilities/importers/ubuntu_usn.py b/vulnerabilities/importers/ubuntu_usn.py index 5f76254bd..5cce32d82 100644 --- a/vulnerabilities/importers/ubuntu_usn.py +++ b/vulnerabilities/importers/ubuntu_usn.py @@ -83,7 +83,7 @@ def to_advisories(usn_db): impacted_package_urls=[], resolved_package_urls=safe_purls, summary="", - vuln_references=[reference], + references=[reference], ) ) diff --git a/vulnerabilities/tests/test_alpine.py b/vulnerabilities/tests/test_alpine.py index 14ec8df69..2ebb6c5fa 100644 --- a/vulnerabilities/tests/test_alpine.py +++ b/vulnerabilities/tests/test_alpine.py @@ -56,7 +56,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2019-14904", ), Advisory( @@ -72,7 +72,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2019-14905", ), Advisory( @@ -88,7 +88,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2019-14846", ), Advisory( @@ -104,7 +104,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2019-14856", ), Advisory( @@ -120,7 +120,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2019-14858", ), Advisory( @@ -136,7 +136,7 @@ def test__process_link(self): subpath=None, ) }, - vuln_references=[ + references=[ Reference( url="https://xenbits.xen.org/xsa/advisory-295.html", reference_id="XSA-295" ) diff --git a/vulnerabilities/tests/test_apache_kafka.py b/vulnerabilities/tests/test_apache_kafka.py index eab42ed4f..2c39ee700 100644 --- a/vulnerabilities/tests/test_apache_kafka.py +++ b/vulnerabilities/tests/test_apache_kafka.py @@ -84,7 +84,7 @@ def test_to_advisory(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference(url="https://kafka.apache.org/cve-list", reference_id=""), Reference( url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17196", diff --git a/vulnerabilities/tests/test_apache_tomcat.py b/vulnerabilities/tests/test_apache_tomcat.py index 517df1d5e..8d11f45ff 100644 --- a/vulnerabilities/tests/test_apache_tomcat.py +++ b/vulnerabilities/tests/test_apache_tomcat.py @@ -78,7 +78,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0763", reference_id="", @@ -112,7 +112,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5351", reference_id="", @@ -158,7 +158,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0706", reference_id="", @@ -192,7 +192,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0714", reference_id="", diff --git a/vulnerabilities/tests/test_elixir_security.py b/vulnerabilities/tests/test_elixir_security.py index f7f07e97d..b5cfb529f 100644 --- a/vulnerabilities/tests/test_elixir_security.py +++ b/vulnerabilities/tests/test_elixir_security.py @@ -123,7 +123,7 @@ def test_process_file(self): version="0.5.2", ), }, - vuln_references=[ + references=[ Reference( reference_id="2aae6e3a-24a3-4d5f-86ff-b964eaf7c6d1", ), diff --git a/vulnerabilities/tests/test_gentoo.py b/vulnerabilities/tests/test_gentoo.py index 72a8f4b59..bae2a0ad6 100644 --- a/vulnerabilities/tests/test_gentoo.py +++ b/vulnerabilities/tests/test_gentoo.py @@ -119,7 +119,7 @@ def test_process_file(self): subpath=None, ) }, - vuln_references=[ + references=[ Reference( url="https://security.gentoo.org/glsa/201709-09", reference_id="GLSA-201709-09", diff --git a/vulnerabilities/tests/test_github.py b/vulnerabilities/tests/test_github.py index 5d104a01b..6753efd56 100644 --- a/vulnerabilities/tests/test_github.py +++ b/vulnerabilities/tests/test_github.py @@ -186,7 +186,7 @@ def test_process_response(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference( reference_id="GHSA-qcxh-w3j9-58qr", url="https://github.com/advisories/GHSA-qcxh-w3j9-58qr", @@ -227,7 +227,7 @@ def test_process_response(self): subpath=None, ) }, - vuln_references=[ + references=[ Reference( reference_id="GHSA-qcxh-w3j9-58qr", url="https://github.com/advisories/GHSA-qcxh-w3j9-58qr", @@ -267,7 +267,7 @@ def test_process_response(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference( reference_id="GHSA-c9hw-wf7x-jp9j", url="https://github.com/advisories/GHSA-c9hw-wf7x-jp9j", @@ -307,7 +307,7 @@ def test_process_response(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference( reference_id="GHSA-c9hw-wf7x-jp9j", url="https://github.com/advisories/GHSA-c9hw-wf7x-jp9j", @@ -348,7 +348,7 @@ def test_process_response(self): subpath=None, ) }, - vuln_references=[ + references=[ Reference( reference_id="GHSA-c9hw-wf7x-jp9j", url="https://github.com/advisories/GHSA-c9hw-wf7x-jp9j", diff --git a/vulnerabilities/tests/test_import_runner.py b/vulnerabilities/tests/test_import_runner.py index 36e543858..ee6da69e9 100644 --- a/vulnerabilities/tests/test_import_runner.py +++ b/vulnerabilities/tests/test_import_runner.py @@ -71,7 +71,7 @@ def save(self): Advisory( vulnerability_id="MOCK-CVE-2020-1337", summary="vulnerability description here", - vuln_references=[Reference(url="https://example.com/with/more/info/MOCK-CVE-2020-1337")], + references=[Reference(url="https://example.com/with/more/info/MOCK-CVE-2020-1337")], impacted_package_urls=[PackageURL(name="mock-webserver", type="pypi", version="1.2.33")], resolved_package_urls=[PackageURL(name="mock-webserver", type="pypi", version="1.2.34")], ) diff --git a/vulnerabilities/tests/test_nginx.py b/vulnerabilities/tests/test_nginx.py index f9dc0b1e1..a7f0f3837 100644 --- a/vulnerabilities/tests/test_nginx.py +++ b/vulnerabilities/tests/test_nginx.py @@ -72,7 +72,7 @@ def test_to_advisories(self): subpath=None, ) }, - vuln_references=[], + references=[], vulnerability_id="CVE-2013-2028", ), Advisory( @@ -121,7 +121,7 @@ def test_to_advisories(self): subpath=None, ), }, - vuln_references=[], + references=[], vulnerability_id="CVE-2011-4963", ), Advisory( @@ -137,14 +137,14 @@ def test_to_advisories(self): ) }, resolved_package_urls=set(), - vuln_references=[], + references=[], vulnerability_id="CVE-2010-2266", ), Advisory( summary="An error log data are not sanitized", impacted_package_urls=set(), resolved_package_urls={}, - vuln_references=[], + references=[], vulnerability_id="CVE-2009-4487", ), Advisory( @@ -160,7 +160,7 @@ def test_to_advisories(self): ) }, resolved_package_urls=set(), - vuln_references=[], + references=[], vulnerability_id="CVE-2009-3555", ), Advisory( @@ -176,7 +176,7 @@ def test_to_advisories(self): ) }, resolved_package_urls=set(), - vuln_references=[], + references=[], vulnerability_id="CVE-2009-3898", ), ] diff --git a/vulnerabilities/tests/test_nvd.py b/vulnerabilities/tests/test_nvd.py index fa7be79e6..4907c6970 100644 --- a/vulnerabilities/tests/test_nvd.py +++ b/vulnerabilities/tests/test_nvd.py @@ -138,7 +138,7 @@ def test_to_advisories(self): ), impacted_package_urls=[], resolved_package_urls=[], - vuln_references=[ + references=[ Reference( url="http://code.google.com/p/gperftools/source/browse/tags/perftools-0.4/ChangeLog", # nopep8 ), diff --git a/vulnerabilities/tests/test_openssl.py b/vulnerabilities/tests/test_openssl.py index ec33f0a90..c4a118e1f 100644 --- a/vulnerabilities/tests/test_openssl.py +++ b/vulnerabilities/tests/test_openssl.py @@ -94,7 +94,7 @@ def test_to_advisory(self): subpath=None, ) }, - vuln_references=[ + references=[ Reference( url="https://github.com/openssl/openssl/commit/" + "eb563247aef3e83dda7679c43f9649270462e5b1" @@ -345,7 +345,7 @@ def test_to_advisory(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference( url="https://github.com/openssl/openssl/commit/" + "419102400a2811582a7a3d4a4e317d72e5ce0a8f" diff --git a/vulnerabilities/tests/test_postgresql.py b/vulnerabilities/tests/test_postgresql.py index 9826a2d7c..c8da3c790 100644 --- a/vulnerabilities/tests/test_postgresql.py +++ b/vulnerabilities/tests/test_postgresql.py @@ -64,7 +64,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="https://www.postgresql.org/about/news/postgresql-123-118-1013-9618-and-9522-released-2038/", # nopep8 reference_id="", @@ -102,7 +102,7 @@ def test_to_advisories(self): subpath=None, ) ], - vuln_references=[ + references=[ Reference( url="https://access.redhat.com/security/cve/CVE-2020-1720", reference_id="", diff --git a/vulnerabilities/tests/test_redhat_importer.py b/vulnerabilities/tests/test_redhat_importer.py index e52de371c..ba7631399 100644 --- a/vulnerabilities/tests/test_redhat_importer.py +++ b/vulnerabilities/tests/test_redhat_importer.py @@ -81,7 +81,7 @@ def test_to_advisory(self): ), ], resolved_package_urls=[], - vuln_references=[ + references=[ Reference( reference_id="RHSA-2017:0725", url="https://access.redhat.com/errata/RHSA-2017:0725", diff --git a/vulnerabilities/tests/test_retiredotnet.py b/vulnerabilities/tests/test_retiredotnet.py index 051fbcc4f..1494635fa 100644 --- a/vulnerabilities/tests/test_retiredotnet.py +++ b/vulnerabilities/tests/test_retiredotnet.py @@ -127,7 +127,7 @@ def test_process_file(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference(url="https://github.com/aspnet/Announcements/issues/359", reference_id="") ], vulnerability_id="CVE-2019-0982", diff --git a/vulnerabilities/tests/test_ruby.py b/vulnerabilities/tests/test_ruby.py index 85e1d9277..317f9466a 100644 --- a/vulnerabilities/tests/test_ruby.py +++ b/vulnerabilities/tests/test_ruby.py @@ -94,7 +94,7 @@ def test_process_file(self, mock_write): subpath=None, ), }, - vuln_references=[Reference(url="https://github.com/sinatra/sinatra/pull/1379")], + references=[Reference(url="https://github.com/sinatra/sinatra/pull/1379")], vulnerability_id="CVE-2018-7212", ), Advisory( @@ -130,7 +130,7 @@ def test_process_file(self, mock_write): subpath=None, ) }, - vuln_references=[Reference(url="https://github.com/sinatra/sinatra/issues/1428")], + references=[Reference(url="https://github.com/sinatra/sinatra/issues/1428")], vulnerability_id="CVE-2018-11627", ), ] diff --git a/vulnerabilities/tests/test_suse_scores.py b/vulnerabilities/tests/test_suse_scores.py index c03eb8598..4340e40db 100644 --- a/vulnerabilities/tests/test_suse_scores.py +++ b/vulnerabilities/tests/test_suse_scores.py @@ -42,7 +42,7 @@ def test_to_advisory(self): summary="", impacted_package_urls=[], resolved_package_urls=[], - vuln_references=[ + references=[ Reference( reference_id="", url="https://ftp.suse.com/pub/projects/security/yaml/suse-cvss-scores.yaml", @@ -92,7 +92,7 @@ def test_to_advisory(self): summary="", impacted_package_urls=[], resolved_package_urls=[], - vuln_references=[ + references=[ Reference( reference_id="", url="https://ftp.suse.com/pub/projects/security/yaml/suse-cvss-scores.yaml", diff --git a/vulnerabilities/tests/test_ubuntu.py b/vulnerabilities/tests/test_ubuntu.py index 056a43107..3b2eff174 100644 --- a/vulnerabilities/tests/test_ubuntu.py +++ b/vulnerabilities/tests/test_ubuntu.py @@ -224,7 +224,7 @@ def test_get_data_from_xml_doc(self, mock_write): subpath=None, ), }, - vuln_references=sorted( + references=sorted( [ Reference(url="http://www.openwall.com/lists/oss-security/2016/10/18/11"), Reference( @@ -281,7 +281,7 @@ def test_get_data_from_xml_doc(self, mock_write): subpath=None, ) }, - vuln_references=sorted( + references=sorted( [ Reference( url="http://people.canonical.com/~ubuntu-security/cve/2016/CVE-2016-8703.html" diff --git a/vulnerabilities/tests/test_ubuntu_usn.py b/vulnerabilities/tests/test_ubuntu_usn.py index f83e2597b..7e2529f4f 100644 --- a/vulnerabilities/tests/test_ubuntu_usn.py +++ b/vulnerabilities/tests/test_ubuntu_usn.py @@ -154,7 +154,7 @@ def test_to_advisories(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference(url="https://usn.ubuntu.com/763-1/", reference_id="USN-763-1") ], vulnerability_id="CVE-2009-0698", @@ -180,7 +180,7 @@ def test_to_advisories(self): subpath=None, ), }, - vuln_references=[ + references=[ Reference(url="https://usn.ubuntu.com/763-1/", reference_id="USN-763-1") ], vulnerability_id="CVE-2009-1274",