Skip to content

Commit 946dce1

Browse files
committed
Use latest impacted packages
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent fef52fe commit 946dce1

5 files changed

Lines changed: 31 additions & 23 deletions

File tree

‎vulnerabilities/api_v3.py‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
from collections import defaultdict
1111
from urllib.parse import urlencode
1212

13-
from django.db.models import Exists
1413
from django.db.models import Max
15-
from django.db.models import OuterRef
1614
from django.db.models import Prefetch
1715
from django_filters import rest_framework as filters
1816
from drf_spectacular.utils import extend_schema
@@ -450,16 +448,7 @@ def create(self, request, *args, **kwargs):
450448
max_advisories = serializer.validated_data["max_advisories"]
451449

452450
if not purls:
453-
latest_impacts = ImpactedPackageAffecting.objects.filter(
454-
package_id=OuterRef("pk"),
455-
impacted_package__is_latest=True,
456-
)
457-
458-
query = (
459-
PackageV2.objects.filter(Exists(latest_impacts))
460-
.values_list("package_url", flat=True)
461-
.order_by("package_url")
462-
)
451+
query = PackageV2.objects.all_vulnerable_purls().order_by("package_url")
463452
page = self.paginate_queryset(query)
464453
return self.get_paginated_response(page)
465454

@@ -481,13 +470,13 @@ def create(self, request, *args, **kwargs):
481470
if not details:
482471
if ignore_qualifiers_subpath:
483472
query = (
484-
PackageV2.objects.filter(plain_package_url__in=plain_purls)
473+
PackageV2.objects.filter_plain_purls(plain_purls)
485474
.values_list("plain_package_url", flat=True)
486475
.order_by("plain_package_url")
487476
)
488477
else:
489478
query = (
490-
PackageV2.objects.filter(package_url__in=purls)
479+
PackageV2.objects.filter_purls(purls)
491480
.order_by("package_url")
492481
.values_list("package_url", flat=True)
493482
)
@@ -496,11 +485,9 @@ def create(self, request, *args, **kwargs):
496485
return self.get_paginated_response(page)
497486

498487
if ignore_qualifiers_subpath:
499-
query = PackageV2.objects.filter(plain_package_url__in=plain_purls).order_by(
500-
"plain_package_url"
501-
)
488+
query = PackageV2.objects.filter_plain_purls(plain_purls).order_by("plain_package_url")
502489
else:
503-
query = PackageV2.objects.filter(package_url__in=purls).order_by("package_url")
490+
query = PackageV2.objects.filter_purls(purls).order_by("package_url")
504491

505492
page = self.paginate_queryset(query)
506493
affected_advisory_map = get_affected_advisories_bulk(page)
@@ -733,7 +720,9 @@ def get_impacts_bulk(packages):
733720
package_ids = [p.id for p in packages]
734721

735722
impacts = (
736-
ImpactedPackageAffecting.objects.filter(package_id__in=package_ids)
723+
ImpactedPackageAffecting.objects.filter(
724+
package_id__in=package_ids, impacted_package__is_latest=True
725+
)
737726
.select_related("impacted_package__advisory")
738727
.prefetch_related(
739728
Prefetch(

‎vulnerabilities/models.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,6 +3552,24 @@ def with_is_vulnerable(self):
35523552
)
35533553
)
35543554

3555+
def all_vulnerable(self):
3556+
latest_impacts = ImpactedPackageAffecting.objects.filter(
3557+
package_id=OuterRef("pk"),
3558+
impacted_package__is_latest=True,
3559+
)
3560+
3561+
query = PackageV2.objects.filter(Exists(latest_impacts))
3562+
return query
3563+
3564+
def all_vulnerable_purls(self):
3565+
return self.all_vulnerable().values_list("package_url", flat=True)
3566+
3567+
def filter_plain_purls(self, plain_purls=[]):
3568+
return PackageV2.objects.filter(plain_package_url__in=plain_purls)
3569+
3570+
def filter_purls(self, purls=[]):
3571+
return PackageV2.objects.filter(package_url__in=purls)
3572+
35553573
def from_purl(self, purl: Union[PackageURL, str]):
35563574
"""
35573575
Return a new Package given a ``purl`` PackageURL object or PURL string.

‎vulnerabilities/pipelines/v2_improvers/unfurl_version_range.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from vulnerabilities.pipelines import VulnerableCodePipeline
2929
from vulnerabilities.pipes.fetchcode_utils import get_versions
3030
from vulnerabilities.pipes.group_advisories import group_advisory_for_package
31-
from vulnerabilities.pipes.risk_score import compute_package_risk_score
3231
from vulnerabilities.pipes.risk_score import compute_package_risk_score_bulk
3332
from vulnerabilities.utils import TYPES_WITH_MULTIPLE_IMPORTERS
3433
from vulnerabilities.utils import update_purl_version

‎vulnerabilities/tests/test_api_v3.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def setUp(self):
3939

4040
self.package = PackageV2.objects.from_purl(purl="pkg:pypi/sample@1.0.0")
4141
self.impact = ImpactedPackage.objects.create(
42-
advisory=self.advisory, base_purl="pkg:pypi/sample"
42+
advisory=self.advisory, base_purl="pkg:pypi/sample", is_latest=True
4343
)
4444
self.impact.affecting_packages.add(self.package)
4545

‎vulnerabilities/views.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,9 @@ def get_fixed_package_details(package):
421421
p.id: p
422422
for p in models.PackageV2.objects.filter(id__in=pkg_ids, is_ghost=False).annotate(
423423
is_vulnerable=Exists(
424-
models.ImpactedPackage.objects.filter(affecting_packages=OuterRef("pk"))
424+
models.ImpactedPackage.objects.filter(
425+
affecting_packages=OuterRef("pk"), is_latest=True
426+
)
425427
)
426428
)
427429
}
@@ -890,7 +892,7 @@ def get_queryset(self):
890892
.prefetch_related(
891893
Prefetch(
892894
"impacted_packages",
893-
queryset=models.ImpactedPackage.objects.prefetch_related(
895+
queryset=models.ImpactedPackage.objects.filter(is_latest=True).prefetch_related(
894896
Prefetch(
895897
"affecting_packages",
896898
queryset=models.PackageV2.objects.only(

0 commit comments

Comments
 (0)