Skip to content

Correct logic for non vuln versions #2335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TG1999 merged 2 commits into from
Jun 11, 2026
Merged

Correct logic for non vuln versions #2335

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80fdcf1
Correct logic got non vuln versions
TG1999 Jun 11, 2026
9eaf6b2
Remove ghost packages from non vuln versions
TG1999 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions vulnerabilities/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3583,9 +3583,6 @@ def bulk_get_or_create_from_purls(self, purls: List[Union[PackageURL, str]]):
def only_vulnerable(self):
return self._vulnerable()

def only_non_vulnerable(self):
return self._not_vulnerable().filter(is_ghost=False)

def for_purl(self, purl):
"""
Return a queryset matching the ``purl`` Package URL.
Expand Down Expand Up @@ -3624,20 +3621,6 @@ def with_is_vulnerable(self):
)
)

def with_is_not_vulnerable(self):
"""
Annotate Package with ``is_not_vulnerable`` boolean attribute.
"""
return self.annotate(
is_not_vulnerable=Exists(
ImpactedPackageFixedBy.objects.filter(
package__pk=OuterRef("pk"),
impacted_package__advisory__is_latest=True,
impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
)
)
)

def all_vulnerable(self):
latest_unfurled_impacts = ImpactedPackageAffecting.objects.filter(
package_id=OuterRef("pk"),
Expand Down Expand Up @@ -3790,9 +3773,25 @@ def get_non_vulnerable_versions(self):
if self.version_rank == 0:
self.calculate_version_rank

evaluated = Exists(
ImpactedPackageFixedBy.objects.filter(
package_id=OuterRef("pk"),
impacted_package__advisory__is_latest=True,
impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
)
)
vulnerable = Exists(
ImpactedPackageAffecting.objects.filter(
package_id=OuterRef("pk"),
impacted_package__advisory__is_latest=True,
impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
)
)

qs = (
PackageV2.objects.get_fixed_by_package_versions(self, fix=False)
.only_non_vulnerable()
.annotate(evaluated=evaluated, vulnerable=vulnerable)
.filter(evaluated=True, vulnerable=False, is_ghost=False)
.filter(version_rank__gt=self.version_rank)
.order_by("version_rank")
)
Expand Down