Merge pull request #618 from ziadhany/view_fix

validation for page_no and fix presentation url .

Author: pombredanne

README.rst

@@ -77,7 +77,7 @@ compromise.
 
 Recent presentations:
 
-- `Open Source Summit 2020 <docs/Why-Is-There-No-Free-Software-Vulnerability-Database-v1.0.pdf>`__
+- `Open Source Summit 2020 <docs/Presentations/Why-Is-There-No-Free-Software-Vulnerability-Database-v1.0.pdf>`__
 
 
 

vulnerabilities/tests/test_view.py

@@ -0,0 +1,20 @@
+from django.test import Client
+from django.test import TestCase
+
+
+class PackageSearchTestCase(TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def test_paginator(self):
+        """
+        Test PackageSearch paginator
+        """
+        response = self.client.get("/packages/search?type=deb&name=&page=1")
+        self.assertEqual(response.status_code, 200)
+        response = self.client.get("/packages/search?type=deb&name=&page=*")
+        self.assertEqual(response.status_code, 200)
+        response = self.client.get("/packages/search?type=deb&name=&page=")
+        self.assertEqual(response.status_code, 200)
+        response = self.client.get("/packages/search?type=&name=&page=")
+        self.assertEqual(response.status_code, 200)

vulnerabilities/views.py

@@ -19,9 +19,9 @@
 #  for any legal advice.
 #  VulnerableCode is a free software code scanning tool from nexB Inc. and others.
 #  Visit https://github.com/nexB/vulnerablecode/ for support and download.
-
 from urllib.parse import urlencode
 
+from django.core.paginator import PageNotAnInteger
 from django.core.paginator import Paginator
 from django.db.models import Count
 from django.db.models import Q
@@ -50,7 +50,11 @@ def get(self, request):
         if request.GET:
             packages = self.request_to_queryset(request)
             result_size = len(packages)
-            page_no = int(request.GET.get("page", 1))
+            try:
+                page_no = request.GET.get("page", 1)
+                packages = Paginator(packages, 50).get_page(page_no)
+            except PageNotAnInteger:
+                packages = Paginator(packages, 50).get_page(1)
             packages = Paginator(packages, 50).get_page(page_no)
             context["packages"] = packages
             context["searched_for"] = urlencode(