File tree Expand file tree Collapse file tree 2 files changed +18
-12
lines changed Expand file tree Collapse file tree 2 files changed +18
-12
lines changed Original file line number Diff line number Diff line change @@ -195,7 +195,8 @@ def load_advisories(
195
195
level = logging .DEBUG ,
196
196
)
197
197
continue
198
-
198
+ # fixed_vulns is a list of strings and each string is a space-separated
199
+ # list of aliases and CVES
199
200
for vuln_ids in fixed_vulns :
200
201
if not isinstance (vuln_ids , str ):
201
202
if logger :
@@ -204,15 +205,16 @@ def load_advisories(
204
205
level = logging .DEBUG ,
205
206
)
206
207
continue
207
- vuln_ids = vuln_ids .split ()
208
- aliases = []
209
- vuln_id = vuln_ids [0 ]
210
- # check for valid vuln ID, if there is valid vuln ID then iterate over
211
- # the remaining elements of the list else iterate over the whole list
212
- # and also check if the initial element is a reference or not
213
- if is_cve (vuln_id ):
214
- aliases = [vuln_id ]
215
- vuln_ids = vuln_ids [1 :]
208
+ vuln_ids = vuln_ids .strip ().split ()
209
+ if not vuln_ids :
210
+ if logger :
211
+ logger (
212
+ f"{ vuln_ids !r} is empty" ,
213
+ level = logging .DEBUG ,
214
+ )
215
+ continue
216
+ aliases = vuln_ids
217
+
216
218
references = []
217
219
for reference_id in vuln_ids :
218
220
@@ -225,6 +227,10 @@ def load_advisories(
225
227
elif reference_id .startswith ("wnpa-sec" ):
226
228
references .append (WireSharkReference .from_id (wnpa_sec_id = reference_id ))
227
229
230
+ elif not reference_id .startswith ("CVE" ):
231
+ if logger :
232
+ logger (f"Unknown reference id { reference_id !r} " , level = logging .DEBUG )
233
+
228
234
qualifiers = {
229
235
"distroversion" : distroversion ,
230
236
"reponame" : reponame ,
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ def test_process_record():
31
31
logger = TestLogger ()
32
32
expected_advisories = [
33
33
AdvisoryData (
34
- aliases = [],
34
+ aliases = ["XSA-248" ],
35
35
summary = "" ,
36
36
affected_packages = [
37
37
AffectedPackage (
@@ -138,7 +138,7 @@ def test_process_record():
138
138
url = "https://secdb.alpinelinux.org/v3.11/" ,
139
139
),
140
140
AdvisoryData (
141
- aliases = ["CVE-2018-7540" ],
141
+ aliases = ["CVE-2018-7540" , "XSA-252" ],
142
142
summary = "" ,
143
143
affected_packages = [
144
144
AffectedPackage (
You can’t perform that action at this time.
0 commit comments