Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix strict_slashes bug when route has slash

Browse Source
This commit is contained in:
r0fls 2018-01-01 02:21:57 -08:00
parent 5b051f0891
commit 8c28ce7d79
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sanic/router.py
View File

@ -129,18 +129,22 @@ class Router:
# Add versions with and without trailing / # Add versions with and without trailing /
slashed_methods = self.routes_all.get(uri + '/', frozenset({})) slashed_methods = self.routes_all.get(uri + '/', frozenset({}))
unslashed_methods = self.routes_all.get(uri[:-1], frozenset({}))
if isinstance(methods, Iterable): if isinstance(methods, Iterable):
_slash_is_missing = all(method in slashed_methods for _slash_is_missing = all(method in slashed_methods for
method in methods) method in methods)
_without_slash_is_missing = all(method in unslashed_methods for
method in methods)
else: else:
_slash_is_missing = methods in slashed_methods _slash_is_missing = methods in slashed_methods
_without_slash_is_missing = methods in unslashed_methods
slash_is_missing = ( slash_is_missing = (
not uri[-1] == '/' and not _slash_is_missing not uri[-1] == '/' and not _slash_is_missing
) )
without_slash_is_missing = ( without_slash_is_missing = (
uri[-1] == '/' and not uri[-1] == '/' and not
self.routes_all.get(uri[:-1], False) and not _without_slash_is_missing and not
uri == '/' uri == '/'
) )
# add version with trailing slash # add version with trailing slash

8
tests/test_routes.py
View File

@ -141,16 +141,16 @@ def test_route_slashes_overload():
return text('OK') return text('OK')
request, response = app.test_client.get('/get') request, response = app.test_client.get('/hello')
assert response.text == 'OK' assert response.text == 'OK'
request, response = app.test_client.get('/get/') request, response = app.test_client.get('/hello/')
assert response.text == 'OK' assert response.text == 'OK'
request, response = app.test_client.post('/get') request, response = app.test_client.post('/hello')
assert response.text == 'OK' assert response.text == 'OK'
request, response = app.test_client.post('/get/') request, response = app.test_client.post('/hello/')
assert response.text == 'OK' assert response.text == 'OK'
def test_route_optional_slash(): def test_route_optional_slash():