Improvement for normalize_path_middleware

CHANGES.rst

@@ -4,7 +4,8 @@ Changes
 2.3.0 (2017-xx-xx)
 ------------------
 
--
+- Improvement for `normalize_path_middleware`. Added possibility to handle
+  URLs with query string. #1995
 
 -
 

CONTRIBUTORS.txt

@@ -173,6 +173,7 @@ Vladimir Kozlovski
 Vladimir Rutsky
 Vladimir Shulyak
 Vladimir Zakharov
+Vladyslav Bondar
 W. Trevor King
 Will McGugan
 Willem de Groot

aiohttp/web_middlewares.py

@@ -54,7 +54,14 @@ def middleware(request):
 
             if isinstance(request.match_info.route, SystemRoute):
                 paths_to_check = []
-                path = request.raw_path
+                if '?' in request.raw_path:
+                    path, query = request.raw_path.split('?', 1)
+                    if query:
+                        query = '?' + query
+                else:
+                    query = ''
+                    path = request.raw_path
+
                 if merge_slashes:
                     paths_to_check.append(re.sub('//+', '/', path))
                 if append_slash and not request.path.endswith('/'):
@@ -67,7 +74,7 @@ def middleware(request):
                     resolves, request = yield from _check_request_resolves(
                         request, path)
                     if resolves:
-                        return redirect_class(request.path)
+                        return redirect_class(request.path + query)
 
             return (yield from handler(request))
 

tests/test_web_middleware.py

@@ -118,7 +118,11 @@ class TestNormalizePathMiddleware:
         ('/resource1', 200),
         ('/resource1/', 404),
         ('/resource2', 200),
-        ('/resource2/', 200)
+        ('/resource2/', 200),
+        ('/resource1?p1=1&p2=2', 200),
+        ('/resource1/?p1=1&p2=2', 404),
+        ('/resource2?p1=1&p2=2', 200),
+        ('/resource2/?p1=1&p2=2', 200)
     ])
     def test_add_trailing_when_necessary(
             self, path, status, cli):
@@ -134,7 +138,11 @@ def test_add_trailing_when_necessary(
         ('/resource1', 200),
         ('/resource1/', 404),
         ('/resource2', 404),
-        ('/resource2/', 200)
+        ('/resource2/', 200),
+        ('/resource1?p1=1&p2=2', 200),
+        ('/resource1/?p1=1&p2=2', 404),
+        ('/resource2?p1=1&p2=2', 404),
+        ('/resource2/?p1=1&p2=2', 200)
     ])
     def test_no_trailing_slash_when_disabled(
             self, path, status, cli):
@@ -153,7 +161,13 @@ def test_no_trailing_slash_when_disabled(
         ('//resource1//a//b/', 404),
         ('///resource1//a//b', 200),
         ('/////resource1/a///b', 200),
-        ('/////resource1/a//b/', 404)
+        ('/////resource1/a//b/', 404),
+        ('/resource1/a/b?p=1', 200),
+        ('//resource1//a//b?p=1', 200),
+        ('//resource1//a//b/?p=1', 404),
+        ('///resource1//a//b?p=1', 200),
+        ('/////resource1/a///b?p=1', 200),
+        ('/////resource1/a//b/?p=1', 404),
     ])
     def test_merge_slash(self, path, status, cli):
         extra_middlewares = [
@@ -179,7 +193,22 @@ def test_merge_slash(self, path, status, cli):
         ('///resource2//a//b', 200),
         ('///resource2//a//b/', 200),
         ('/////resource2/a///b', 200),
-        ('/////resource2/a///b/', 200)
+        ('/////resource2/a///b/', 200),
+        ('/resource1/a/b?p=1', 200),
+        ('/resource1/a/b/?p=1', 404),
+        ('//resource2//a//b?p=1', 200),
+        ('//resource2//a//b/?p=1', 200),
+        ('///resource1//a//b?p=1', 200),
+        ('///resource1//a//b/?p=1', 404),
+        ('/////resource1/a///b?p=1', 200),
+        ('/////resource1/a///b/?p=1', 404),
+        ('/resource2/a/b?p=1', 200),
+        ('//resource2//a//b?p=1', 200),
+        ('//resource2//a//b/?p=1', 200),
+        ('///resource2//a//b?p=1', 200),
+        ('///resource2//a//b/?p=1', 200),
+        ('/////resource2/a///b?p=1', 200),
+        ('/////resource2/a///b/?p=1', 200)
     ])
     def test_append_and_merge_slash(self, path, status, cli):
         extra_middlewares = [