Remove leading slashes in 404 redirections

When reaching http://server//page/ the server should not redirect to ``/page`` instead of ``//page``.
mozilla · Feb 26, 2021 · 6db74a4 · 6db74a4
1 parent 78539af
commit 6db74a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pollbot/middlewares.py b/pollbot/middlewares.py
@@ -61,7 +61,7 @@ async def handle_any(request, response):
 async def handle_404(request, response):
     if 'json' not in response.headers['Content-Type']:
         if request.path.endswith('/'):
-            return web.HTTPFound(request.path.rstrip('/'))
+            return web.HTTPFound('/' + request.path.strip('/'))
         return web.json_response({
             "status": 404,
             "message": "Page '{}' not found".format(request.path)

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -61,6 +61,11 @@ async def test_redirects_trailing_slashes(cli):
     assert resp.headers['Location'] == "/v1/firefox/54.0"
 
 
+async def test_redirects_strip_leading_slashes(cli):
+    resp = await check_response(cli, "//page/", status=302, allow_redirects=False)
+    assert resp.headers['Location'] == "/page"
+
+
 async def check_yaml_resource(cli, url, filename, **kwargs):
     with open(os.path.join(HERE, "..", "pollbot", filename)) as stream:
         content = yaml.safe_load(stream)