@@ -49,12 +49,17 @@ def collect_advisories(self) -> Iterable[AdvisoryData]:
4949 advisory_directory_links = fetch_advisory_directory_links (
5050 page_response_content , self .url , self .log
5151 )
52- advisory_links = []
52+ advisory_links = set ()
53+ visited_directories = set ()
5354 for advisory_directory_link in advisory_directory_links :
55+ if advisory_directory_link in visited_directories :
56+ continue
57+
5458 advisory_directory_page = fetch_response (advisory_directory_link ).content
55- advisory_links .extend (
59+ advisory_links .update (
5660 fetch_advisory_links (advisory_directory_page , advisory_directory_link , self .log )
5761 )
62+
5863 for link in advisory_links :
5964 record = fetch_response (link ).json ()
6065 if not record ["packages" ]:
@@ -241,11 +246,10 @@ def load_advisories(
241246 try :
242247 fixed_version_range = AlpineLinuxVersionRange .from_versions ([version ])
243248 except InvalidVersion as e :
244- if logger :
245- logger (
246- f"{ version !r} is not a valid AlpineVersion { e !r} " ,
247- level = logging .DEBUG ,
248- )
249+ logger (
250+ f"{ version !r} is not a valid AlpineVersion { e !r} " ,
251+ level = logging .DEBUG ,
252+ )
249253
250254 if not isinstance (archs , List ):
251255 if logger :
@@ -258,33 +262,36 @@ def load_advisories(
258262 if archs and fixed_version_range :
259263 for arch in archs :
260264 qualifiers ["arch" ] = arch
265+ purl = PackageURL (
266+ type = "apk" ,
267+ namespace = "alpine" ,
268+ name = pkg_infos ["name" ],
269+ qualifiers = qualifiers ,
270+ )
261271 affected_packages .append (
262272 AffectedPackageV2 (
263- package = PackageURL (
264- type = "apk" ,
265- namespace = "alpine" ,
266- name = pkg_infos ["name" ],
267- qualifiers = qualifiers ,
268- ),
273+ package = purl ,
269274 fixed_version_range = fixed_version_range ,
270275 )
271276 )
272277
273278 if not archs and fixed_version_range :
274279 # there is no arch, this is not an arch-specific package
280+ purl = PackageURL (
281+ type = "apk" ,
282+ namespace = "alpine" ,
283+ name = pkg_infos ["name" ],
284+ qualifiers = qualifiers ,
285+ )
275286 affected_packages .append (
276287 AffectedPackageV2 (
277- package = PackageURL (
278- type = "apk" ,
279- namespace = "alpine" ,
280- name = pkg_infos ["name" ],
281- qualifiers = qualifiers ,
282- ),
288+ package = purl ,
283289 fixed_version_range = fixed_version_range ,
284290 )
285291 )
286292
287- for advisory_id in aliases :
293+ for cve in aliases :
294+ advisory_id = f"{ pkg_infos ['name' ]} /{ qualifiers ['distroversion' ]} /{ cve } "
288295 yield AdvisoryData (
289296 advisory_id = advisory_id ,
290297 aliases = [],
0 commit comments