Skip to content

Make trailing slash optional in apis #350

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
sbs2001 merged 2 commits into from
Feb 14, 2021
Merged

Make trailing slash optional in apis #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
531c8fc
Make trailing slash optional in apis
sbs2001 Feb 14, 2021
8ce911a
Fix tests for api
sbs2001 Feb 14, 2021
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
16 changes: 8 additions & 8 deletions vulnerabilities/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
}
Expand All @@ -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"),
]
)
Expand All @@ -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"),
]
),
Expand Down
10 changes: 9 additions & 1 deletion vulnerablecode/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down