Merge pull request #350 from sbs2001/trailing-slash-api-fix

Make trailing slash optional in apis

Author: sbs2001

vulnerabilities/tests/test_api.py

@@ -203,31 +203,31 @@ def test_bulk_vulnerabilities_api(self):
                 "resolved_packages": [
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/packages/2/"),
+                            ("url", "http://testserver/api/packages/2"),
                             ("purl", "pkg:deb/debian/mimetex@1.74-1?distro=jessie"),
                         ]
                     ),
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/packages/3/"),
+                            ("url", "http://testserver/api/packages/3"),
                             ("purl", "pkg:deb/debian/mimetex@1.50-1.1?distro=jessie"),
                         ]
                     ),
                 ],
                 "unresolved_packages": [],
-                "url": "http://testserver/api/vulnerabilities/2/",
+                "url": "http://testserver/api/vulnerabilities/2",
             },
             "CVE-2014-8242": {
                 "resolved_packages": [],
                 "unresolved_packages": [
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/packages/1/"),
+                            ("url", "http://testserver/api/packages/1"),
                             ("purl", "pkg:deb/debian/librsync@0.9.7-10?distro=jessie"),
                         ]
                     )
                 ],
-                "url": "http://testserver/api/vulnerabilities/1/",
+                "url": "http://testserver/api/vulnerabilities/1",
             },
             "RANDOM-CVE": {},
         }
@@ -253,7 +253,7 @@ def test_bulk_packages_api(self):
                 "unresolved_vulnerabilities": [
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/vulnerabilities/1/"),
+                            ("url", "http://testserver/api/vulnerabilities/1"),
                             ("vulnerability_id", "CVE-2014-8242"),
                         ]
                     )
@@ -263,13 +263,13 @@ def test_bulk_packages_api(self):
                 "resolved_vulnerabilities": [
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/vulnerabilities/2/"),
+                            ("url", "http://testserver/api/vulnerabilities/2"),
                             ("vulnerability_id", "CVE-2009-1382"),
                         ]
                     ),
                     OrderedDict(
                         [
-                            ("url", "http://testserver/api/vulnerabilities/3/"),
+                            ("url", "http://testserver/api/vulnerabilities/3"),
                             ("vulnerability_id", "CVE-2009-2459"),
                         ]
                     ),

vulnerablecode/urls.py

@@ -42,7 +42,15 @@
 from vulnerabilities.views import VulnerabilityReferenceCreate
 from vulnerablecode.settings import ENABLE_CURATION
 
-api_router = DefaultRouter()
+
+# See the comment at https://stackoverflow.com/a/46163870.
+class OptionalSlashRouter(DefaultRouter):
+    def __init__(self, *args, **kwargs):
+        super(DefaultRouter, self).__init__(*args, **kwargs)
+        self.trailing_slash = '/?'
+
+
+api_router = OptionalSlashRouter()
 api_router.register(r"packages", PackageViewSet)
 # `DefaultRouter` requires `basename` when registering viewsets which don't
 # define a queryset.