Update the API so it returns an empty list if no filter

Make sure to use api_v3
Fix a css width for rule_metadat and rule text

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

vulnerabilities/api_v2.py

@@ -852,36 +852,3 @@ def get_view_name(self):
         if self.detail:
             return "Pipeline Instance"
         return "Pipeline Jobs"
-
-
-class DetectionRuleFilter(filters.FilterSet):
-    advisory_avid = filters.CharFilter(field_name="related_advisories__avid", lookup_expr="exact")
-
-    rule_text_contains = filters.CharFilter(field_name="rule_text", lookup_expr="icontains")
-
-    class Meta:
-        model = DetectionRule
-        fields = ["rule_type"]
-
-
-class DetectionRuleSerializer(serializers.ModelSerializer):
-    advisory_avid = serializers.SerializerMethodField()
-
-    class Meta:
-        model = DetectionRule
-        fields = ["rule_type", "source_url", "rule_metadata", "rule_text", "advisory_avid"]
-
-    def get_advisory_avid(self, obj):
-        avids = set(advisory.avid for advisory in obj.related_advisories.all())
-        return sorted(list(avids))
-
-
-class DetectionRuleViewSet(viewsets.ReadOnlyModelViewSet):
-    advisories_prefetch = Prefetch(
-        "related_advisories", queryset=AdvisoryV2.objects.only("id", "avid").distinct()
-    )
-    queryset = DetectionRule.objects.prefetch_related(advisories_prefetch)
-    serializer_class = DetectionRuleSerializer
-    throttle_classes = [AnonRateThrottle, PermissionBasedUserRateThrottle]
-    filter_backends = [filters.DjangoFilterBackend]
-    filterset_class = DetectionRuleFilter

vulnerabilities/api_v3.py

@@ -30,6 +30,7 @@
 from vulnerabilities.models import AdvisorySeverity
 from vulnerabilities.models import AdvisoryV2
 from vulnerabilities.models import AdvisoryWeakness
+from vulnerabilities.models import DetectionRule
 from vulnerabilities.models import Group
 from vulnerabilities.models import GroupedAdvisory
 from vulnerabilities.models import ImpactedPackageAffecting
@@ -704,3 +705,47 @@ def get_fixing_advisories_bulk(packages):
         result[package.id] = grouped
 
     return result
+
+
+class DetectionRuleFilter(filters.FilterSet):
+    advisory_avid = filters.CharFilter(field_name="related_advisories__avid", lookup_expr="exact")
+
+    rule_text_contains = filters.CharFilter(field_name="rule_text", lookup_expr="icontains")
+
+    class Meta:
+        model = DetectionRule
+        fields = ["rule_type"]
+
+
+class DetectionRuleSerializer(serializers.ModelSerializer):
+    advisory_avid = serializers.SerializerMethodField()
+
+    class Meta:
+        model = DetectionRule
+        fields = ["rule_type", "source_url", "rule_metadata", "rule_text", "advisory_avid"]
+
+    def get_advisory_avid(self, obj):
+        avids = {advisory.avid for advisory in obj.related_advisories.all()}
+        return sorted(avids)
+
+
+class DetectionRuleViewSet(viewsets.ReadOnlyModelViewSet):
+    advisories_prefetch = Prefetch(
+        "related_advisories", queryset=AdvisoryV2.objects.only("id", "avid").distinct()
+    )
+    queryset = DetectionRule.objects.prefetch_related(advisories_prefetch)
+    serializer_class = DetectionRuleSerializer
+    throttle_classes = [AnonRateThrottle, PermissionBasedUserRateThrottle]
+    filter_backends = [filters.DjangoFilterBackend]
+    filterset_class = DetectionRuleFilter
+
+    def get_queryset(self):
+        queryset = super().get_queryset()
+        query_params = ["advisory_avid", "rule_text_contains", "rule_type"]
+        has_query_params = any(
+            query_param in self.request.query_params for query_param in query_params
+        )
+        if not has_query_params:
+            return queryset.none()
+
+        return queryset

vulnerabilities/templates/detection_rules.html

@@ -30,8 +30,8 @@
                 <thead>
                     <tr>
                         <th>Type</th>
-                        <th>Metadata</th>
-                        <th>Text</th>
+                        <th colspan="width: 200px;">Metadata</th>
+                        <th colspan="width: 100px;">Text</th>
                         <th>Source URL</th>
                         <th>Advisory IDs</th>
                     </tr>

vulnerablecode/urls.py

@@ -22,12 +22,12 @@
 from vulnerabilities.api import VulnerabilityViewSet
 from vulnerabilities.api_v2 import CodeFixV2ViewSet
 from vulnerabilities.api_v2 import CodeFixViewSet
-from vulnerabilities.api_v2 import DetectionRuleViewSet
 from vulnerabilities.api_v2 import PackageV2ViewSet
 from vulnerabilities.api_v2 import PipelineScheduleV2ViewSet
 from vulnerabilities.api_v2 import VulnerabilityV2ViewSet
 from vulnerabilities.api_v3 import AdvisoryV3ViewSet
 from vulnerabilities.api_v3 import AffectedByAdvisoriesViewSet
+from vulnerabilities.api_v3 import DetectionRuleViewSet
 from vulnerabilities.api_v3 import FixingAdvisoriesViewSet
 from vulnerabilities.api_v3 import PackageV3ViewSet
 from vulnerabilities.views import AdminLoginView