Fix bugs

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/api_v3.py

@@ -31,13 +31,10 @@
 from vulnerabilities.models import AdvisoryAlias
 from vulnerabilities.models import AdvisoryReference
 from vulnerabilities.models import AdvisorySet
-from vulnerabilities.models import AdvisorySetMember
 from vulnerabilities.models import AdvisorySeverity
 from vulnerabilities.models import AdvisoryV2
 from vulnerabilities.models import AdvisoryWeakness
-from vulnerabilities.models import GroupedAdvisory
 from vulnerabilities.models import ImpactedPackageAffecting
-from vulnerabilities.models import ImpactedPackageFixedBy
 from vulnerabilities.models import PackageV2
 from vulnerabilities.throttling import PermissionBasedUserRateThrottle
 from vulnerabilities.utils import TYPES_WITH_MULTIPLE_IMPORTERS
@@ -46,8 +43,7 @@
 class PackageQuerySerializer(serializers.Serializer):
     purls = serializers.ListField(
         child=serializers.CharField(),
-        required=False,
-        default=list,
+        required=True,
     )
     details = serializers.BooleanField(default=False)
     ignore_qualifiers_subpath = serializers.BooleanField(default=False)
@@ -61,6 +57,14 @@ def validate(self, data):
                 )
         return data
 
+    def to_internal_value(self, data):
+        unknown = set(data.keys()) - set(self.fields.keys())
+
+        if unknown:
+            raise serializers.ValidationError({field: ["Unknown field."] for field in unknown})
+
+        return super().to_internal_value(data)
+
 
 class AdvisoryQuerySerializer(serializers.Serializer):
     purls = serializers.ListField(
@@ -397,8 +401,26 @@ def create(self, request, *args, **kwargs):
             ),
             "weaknesses",
             "aliases",
-            "related_ssvcs__source_advisory",
-            "source_ssvcs__source_advisory",
+            Prefetch(
+                "related_ssvcs",
+                queryset=SSVC.objects.only(
+                    "id",
+                    "vector",
+                    "decision",
+                    "options",
+                    "source_advisory__url",
+                ),
+            ),
+            Prefetch(
+                "source_ssvcs",
+                queryset=SSVC.objects.only(
+                    "id",
+                    "vector",
+                    "decision",
+                    "options",
+                    "source_advisory__url",
+                ),
+            ),
         )
 
         page = self.paginate_queryset(latest_advisories)

vulnerabilities/models.py

@@ -2944,83 +2944,72 @@ def latest_for_avids_completely_imported_advisories(self, avids):
         return self.get(avid__in=avids, is_latest=True, _all_impacts_unfurled_at__isnull=False)
 
     def latest_affecting_advisories_for_purl(self, purl):
-        adv_ids = ImpactedPackage.objects.filter(
-            affecting_packages__package_url=purl,
-            advisory__is_latest=True,
-            advisory___all_impacts_unfurled_at__isnull=False,
-        ).values_list("advisory_id", flat=True)
+        adv_ids = ImpactedPackageAffecting.objects.filter(
+            package__package_url=purl,
+            impacted_package__advisory__is_latest=True,
+            impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
+        ).values_list("impacted_package__advisory_id", flat=True)
 
         return self.filter(id__in=Subquery(adv_ids))
 
     def latest_affecting_advisories_for_purls(self, purls):
-        adv_ids = ImpactedPackage.objects.filter(
-            affecting_packages__package_url__in=purls,
-            advisory__is_latest=True,
-            advisory___all_impacts_unfurled_at__isnull=False,
+        adv_ids = ImpactedPackageAffecting.objects.filter(
+            package__package_url__in=purls,
+            impacted_package__advisory__is_latest=True,
+            impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
         ).values_list(
-            "advisory_id",
+            "impacted_package__advisory_id",
             flat=True,
         )
         return self.filter(id__in=Subquery(adv_ids))
 
     def latest_affecting_advisory_purls_pairs(self, purls):
         return (
-            ImpactedPackage.objects.filter(
-                affecting_packages__package_url__in=purls,
-                advisory__is_latest=True,
-                advisory___all_impacts_unfurled_at__isnull=False,
+            ImpactedPackageAffecting.objects.filter(
+                package__package_url__in=purls,
+                impacted_package__advisory__is_latest=True,
+                impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
             )
             .values_list(
-                "affecting_packages__package_url",
-                "advisory_id",
+                "package__package_url",
+                "impacted_package__advisory_id",
             )
             .distinct()
         )
 
-    def latest_affecting_advisories_for_packages(self, packages):
-        adv_ids = ImpactedPackage.objects.filter(
-            affecting_packages__in=packages,
-            advisory__is_latest=True,
-            advisory___all_impacts_unfurled_at__isnull=False,
-        ).values_list(
-            "advisory_id",
-            flat=True,
-        )
-        return self.filter(id__in=Subquery(adv_ids))
-
     def latest_fixed_by_advisories_for_purl(self, purl):
-        adv_ids = ImpactedPackage.objects.filter(
-            fixed_by_packages__package_url=purl,
-            advisory__is_latest=True,
-            advisory___all_impacts_unfurled_at__isnull=False,
+        adv_ids = ImpactedPackageFixedBy.objects.filter(
+            package__package_url=purl,
+            impacted_package__advisory__is_latest=True,
+            impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
         ).values_list(
-            "advisory_id",
+            "impacted_package__advisory_id",
             flat=True,
         )
         return self.filter(id__in=Subquery(adv_ids))
 
     def latest_fixed_by_advisories_for_purls(self, purls):
-        adv_ids = ImpactedPackage.objects.filter(
-            fixed_by_packages__package_url__in=purls,
-            advisory__is_latest=True,
-            advisory___all_impacts_unfurled_at__isnull=False,
+        adv_ids = ImpactedPackageFixedBy.objects.filter(
+            package_url__in=purls,
+            impacted_package__advisory__is_latest=True,
+            impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
         ).values_list(
-            "advisory_id",
+            "impacted_package__advisory_id",
             flat=True,
         )
 
         return self.filter(id__in=Subquery(adv_ids))
 
     def latest_fixed_by_advisory_purls_pairs(self, purls):
         return (
-            ImpactedPackage.objects.filter(
-                fixed_by_packages__package_url__in=purls,
-                advisory__is_latest=True,
-                advisory___all_impacts_unfurled_at__isnull=False,
+            ImpactedPackageFixedBy.objects.filter(
+                package__package_url__in=purls,
+                impacted_package__advisory__is_latest=True,
+                impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
             )
             .values_list(
-                "fixed_by_packages__package_url",
-                "advisory_id",
+                "package__package_url",
+                "impacted_package__advisory_id",
             )
             .distinct()
         )
@@ -3621,10 +3610,10 @@ def with_is_vulnerable(self):
         """
         return self.annotate(
             is_vulnerable=Exists(
-                ImpactedPackage.objects.filter(
-                    affecting_packages__pk=OuterRef("pk"),
-                    advisory__is_latest=True,
-                    advisory___all_impacts_unfurled_at__isnull=False,
+                ImpactedPackageAffecting.objects.filter(
+                    package__pk=OuterRef("pk"),
+                    impacted_package__advisory__is_latest=True,
+                    impacted_package__advisory___all_impacts_unfurled_at__isnull=False,
                 )
             )
         )