Skip to content

Commit f509885

Browse files
sbs2001sbs2001
committed
Refactor tests and importers to use new data structure field names
Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>
1 parent 948325d commit f509885

4 files changed

Lines changed: 15 additions & 73 deletions

File tree

‎vulnerabilities/importers/redhat.py‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017 nexB Inc. and others. All rights reserved.
1+
# Copyright (c) nexB Inc. and others. All rights reserved.
22
# http://nexb.com and https://github.com/nexB/vulnerablecode/
33
# The VulnerableCode software is licensed under the Apache License version 2.0.
44
# Data generated with VulnerableCode require an acknowledgment.
@@ -17,7 +17,7 @@
1717
# OR CONDITIONS OF ANY KIND, either express or implied. No content created from
1818
# VulnerableCode should be considered or used as legal advice. Consult an Attorney
1919
# for any legal advice.
20-
# VulnerableCode is a free software code scanning tool from nexB Inc. and others.
20+
# VulnerableCode is a free software code from nexB Inc. and others.
2121
# Visit https://github.com/nexB/vulnerablecode/ for support and download.
2222

2323

@@ -82,8 +82,8 @@ def to_advisory(advisory_data):
8282
bugzilla_data = requests.get(f"https://bugzilla.redhat.com/rest/bug/{bugzilla}").json()
8383
bugzilla_severity_val = bugzilla_data["bugs"][0]["severity"]
8484
bugzilla_severity = VulnerabilitySeverity(
85-
severity_type="REDHAT_BUGZILLA_SEVERITY",
86-
severity_value=bugzilla_severity_val,
85+
system="REDHAT_BUGZILLA_SEVERITY",
86+
value=bugzilla_severity_val,
8787
)
8888

8989
references.append(
@@ -102,11 +102,13 @@ def to_advisory(advisory_data):
102102
# See https://access.redhat.com/articles/2130961 for more details.
103103

104104
if "RHSA" in rh_adv:
105-
rhsa_data = requests.get(f"https://access.redhat.com/hydra/rest/securitydata/cvrf/{rh_adv}.json").json() # nopep8
106-
severity_value = rhsa_data["cvrfdoc"]["aggregate_severity"]
105+
rhsa_data = requests.get(
106+
f"https://access.redhat.com/hydra/rest/securitydata/cvrf/{rh_adv}.json"
107+
).json() # nopep8
108+
value = rhsa_data["cvrfdoc"]["aggregate_severity"]
107109
rhsa_aggregate_severity = VulnerabilitySeverity(
108-
severity_type="RHSA_AGGREGATE_SEVERITY",
109-
severity_value=severity_value,
110+
system="RHSA_AGGREGATE_SEVERITY",
111+
value=value,
110112
)
111113

112114
references.append(
@@ -123,8 +125,8 @@ def to_advisory(advisory_data):
123125
redhat_cve_entry = requests.get(advisory_data["resource_url"]).json()
124126
redhat_cvss = redhat_cve_entry["cvss3"]["cvss3_base_score"]
125127
redhat_cvss3 = VulnerabilitySeverity(
126-
severity_type="REDHAT_CVSS3",
127-
severity_value=redhat_cvss,
128+
system="REDHAT_CVSS3",
129+
value=redhat_cvss,
128130
)
129131

130132
references.append(Reference(severities=[redhat_cvss3], url=advisory_data["resource_url"]))
@@ -148,4 +150,4 @@ def rpm_to_purl(rpm_string):
148150
name, version = components
149151

150152
if version[0].isdigit():
151-
return PackageURL(name=name, type="rpm", version=version, namespace="redhat")
153+
return PackageURL(name=name, type="rpm", version=version, namespace="redhat")

‎vulnerabilities/models.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,8 @@ class VulnerabilitySeverity(models.Model):
206206

207207
vulnerability = models.ForeignKey(Vulnerability, on_delete=models.CASCADE)
208208
value = models.CharField(max_length=50, help_text="Example: 9.0, Important, High")
209-
scoring_system_identifier = models.CharField(
210-
max_length=50, help_text="Example: cvssv2"
211-
)
209+
scoring_system_identifier = models.CharField(max_length=50, help_text="Example: cvssv2")
212210
reference = models.ForeignKey(VulnerabilityReference, on_delete=models.CASCADE)
213-
214211

215212
class Meta:
216213
# TBD

‎vulnerabilities/tests/test_nvd.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,23 +140,14 @@ def test_to_advisories(self):
140140
[
141141
Reference(
142142
url="http://code.google.com/p/gperftools/source/browse/tags/perftools-0.4/ChangeLog", # nopep8
143-
scores=[],
144143
),
145144
Reference(
146145
url="http://kqueue.org/blog/2012/03/05/memory-allocator-security-revisited/", # nopep8
147-
scores=[],
148-
),
149-
Reference(
150-
url="https://nvd.nist.gov/vuln/detail/CVE-2005-4895", # nopep8
151-
scores=[
152-
VulnerabilitySeverity(system="cvssV2", value="5.0")
153-
],
154-
reference_id="CVE-2005-4895",
155146
),
156147
Reference(
157148
url="https://nvd.nist.gov/vuln/detail/CVE-2005-4895", # nopep8
158149
severities=[
159-
VulnerabilitySeverity(severity_type="cvssV2", severity_value="5.0")
150+
VulnerabilitySeverity(system="cvssV2", value="5.0")
160151
],
161152
reference_id="CVE-2005-4895",
162153
),

‎vulnerabilities/tests/test_redhat_importer.py‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,7 @@ def test_to_advisory(self):
8484
Reference(
8585
url="https://bugzilla.redhat.com/show_bug.cgi?id=1396383",
8686
reference_id="1396383",
87-
<<<<<<< HEAD
8887
severities=[
89-
=======
90-
scores=[
91-
>>>>>>> Store severity scores given by RedHat
9288
VulnerabilitySeverity(
9389
system="REDHAT_BUGZILLA_SEVERITY", value=2.0
9490
)
@@ -97,11 +93,7 @@ def test_to_advisory(self):
9793
Reference(
9894
url="https://access.redhat.com/errata/RHSA-2017:1931",
9995
reference_id="RHSA-2017:1931",
100-
<<<<<<< HEAD
10196
severities=[
102-
=======
103-
scores=[
104-
>>>>>>> Store severity scores given by RedHat
10597
VulnerabilitySeverity(
10698
system="RHSA_AGGREGATE_SEVERITY", value=2.2
10799
)
@@ -110,11 +102,7 @@ def test_to_advisory(self):
110102
Reference(
111103
url="https://access.redhat.com/errata/RHSA-2017:0725",
112104
reference_id="RHSA-2017:0725",
113-
<<<<<<< HEAD
114105
severities=[
115-
=======
116-
scores=[
117-
>>>>>>> Store severity scores given by RedHat
118106
VulnerabilitySeverity(
119107
system="RHSA_AGGREGATE_SEVERITY", value=2.2
120108
)
@@ -123,11 +111,7 @@ def test_to_advisory(self):
123111
Reference(
124112
url="https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-9401.json", # nopep8
125113
reference_id="",
126-
<<<<<<< HEAD
127114
severities=[
128-
=======
129-
scores=[
130-
>>>>>>> Store severity scores given by RedHat
131115
VulnerabilitySeverity(
132116
system="REDHAT_CVSS3", value=6.0
133117
)
@@ -175,11 +159,7 @@ def test_to_advisory(self):
175159
Reference(
176160
url="https://bugzilla.redhat.com/show_bug.cgi?id=1430347",
177161
reference_id="1430347",
178-
<<<<<<< HEAD
179162
severities=[
180-
=======
181-
scores=[
182-
>>>>>>> Store severity scores given by RedHat
183163
VulnerabilitySeverity(
184164
system="REDHAT_BUGZILLA_SEVERITY", value=2.0
185165
)
@@ -188,11 +168,7 @@ def test_to_advisory(self):
188168
Reference(
189169
url="https://access.redhat.com/errata/RHSA-2017:1842",
190170
reference_id="RHSA-2017:1842",
191-
<<<<<<< HEAD
192171
severities=[
193-
=======
194-
scores=[
195-
>>>>>>> Store severity scores given by RedHat
196172
VulnerabilitySeverity(
197173
system="RHSA_AGGREGATE_SEVERITY", value=2.2
198174
)
@@ -201,11 +177,7 @@ def test_to_advisory(self):
201177
Reference(
202178
url="https://access.redhat.com/errata/RHSA-2017:2437",
203179
reference_id="RHSA-2017:2437",
204-
<<<<<<< HEAD
205180
severities=[
206-
=======
207-
scores=[
208-
>>>>>>> Store severity scores given by RedHat
209181
VulnerabilitySeverity(
210182
system="RHSA_AGGREGATE_SEVERITY", value=2.2
211183
)
@@ -214,11 +186,7 @@ def test_to_advisory(self):
214186
Reference(
215187
url="https://access.redhat.com/errata/RHSA-2017:2077",
216188
reference_id="RHSA-2017:2077",
217-
<<<<<<< HEAD
218189
severities=[
219-
=======
220-
scores=[
221-
>>>>>>> Store severity scores given by RedHat
222190
VulnerabilitySeverity(
223191
system="RHSA_AGGREGATE_SEVERITY", value=2.2
224192
)
@@ -227,11 +195,7 @@ def test_to_advisory(self):
227195
Reference(
228196
url="https://access.redhat.com/errata/RHSA-2017:2444",
229197
reference_id="RHSA-2017:2444",
230-
<<<<<<< HEAD
231198
severities=[
232-
=======
233-
scores=[
234-
>>>>>>> Store severity scores given by RedHat
235199
VulnerabilitySeverity(
236200
system="RHSA_AGGREGATE_SEVERITY", value=2.2
237201
)
@@ -240,11 +204,7 @@ def test_to_advisory(self):
240204
Reference(
241205
url="https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2016-10200.json", # nopep8
242206
reference_id="",
243-
<<<<<<< HEAD
244207
severities=[
245-
=======
246-
scores=[
247-
>>>>>>> Store severity scores given by RedHat
248208
VulnerabilitySeverity(
249209
system="REDHAT_CVSS3", value=6.0
250210
)
@@ -267,11 +227,7 @@ def test_to_advisory(self):
267227
Reference(
268228
url="https://bugzilla.redhat.com/show_bug.cgi?id=1492984",
269229
reference_id="1492984",
270-
<<<<<<< HEAD
271230
severities=[
272-
=======
273-
scores=[
274-
>>>>>>> Store severity scores given by RedHat
275231
VulnerabilitySeverity(
276232
system="REDHAT_BUGZILLA_SEVERITY", value=2.0
277233
)
@@ -280,11 +236,7 @@ def test_to_advisory(self):
280236
Reference(
281237
url="https://access.redhat.com/hydra/rest/securitydata/cve/CVE-2017-12168.json", # nopep8
282238
reference_id="",
283-
<<<<<<< HEAD
284239
severities=[
285-
=======
286-
scores=[
287-
>>>>>>> Store severity scores given by RedHat
288240
VulnerabilitySeverity(
289241
system="REDHAT_CVSS3", value=6.0
290242
)

0 commit comments

Comments
 (0)