Fix expect header handling for not found and not allowed routes #340

Author: fafhrd91

CHANGES.txt

@@ -6,6 +6,8 @@ CHANGES
 
 - Fix graceful shutdown handling.
 
+- Fix `Expect` header handling for not found and not allowed routes #340
+
 
 0.15.2 (04-19-2015)
 -------------------

aiohttp/web_urldispatcher.py

@@ -205,19 +205,29 @@ def __repr__(self):
             directory=self._directory)
 
 
+class SystemRoute(Route):
+
+    def __init__(self, name):
+        super().__init__(hdrs.METH_ANY, None, name)
+
+    def url(self, **kwargs):
+        return ''
+
+    def match(self, path):
+        return None
+
+
 class _NotFoundMatchInfo(UrlMappingMatchInfo):
 
+    route = SystemRoute('')
+
     def __init__(self):
         super().__init__({}, None)
 
     @property
     def handler(self):
         return self._not_found
 
-    @property
-    def route(self):
-        return None
-
     @asyncio.coroutine
     def _not_found(self, request):
         raise HTTPNotFound()
@@ -228,6 +238,8 @@ def __repr__(self):
 
 class _MethodNotAllowedMatchInfo(UrlMappingMatchInfo):
 
+    route = SystemRoute('')
+
     def __init__(self, method, allowed_methods):
         super().__init__({}, None)
         self._method = method
@@ -237,10 +249,6 @@ def __init__(self, method, allowed_methods):
     def handler(self):
         return self._not_allowed
 
-    @property
-    def route(self):
-        return None
-
     @asyncio.coroutine
     def _not_allowed(self, request):
         raise HTTPMethodNotAllowed(self._method, self._allowed_methods)

tests/test_urldispatch.py

@@ -10,7 +10,8 @@
 from aiohttp.protocol import HttpVersion, RawRequestMessage
 from aiohttp.web_urldispatcher import (_defaultExpectHandler,
                                        DynamicRoute,
-                                       PlainRoute)
+                                       PlainRoute,
+                                       SystemRoute)
 
 
 class TestUrlDispatcher(unittest.TestCase):
@@ -43,6 +44,11 @@ def handler(request):
 
         return handler
 
+    def test_system_route(self):
+        route = SystemRoute('test')
+        self.assertIsNone(route.match('any'))
+        self.assertEqual(route.url(), '')
+
     def test_register_route(self):
         handler = self.make_handler()
         route = PlainRoute('GET', handler, 'test', '/handler/to/path')
@@ -181,7 +187,7 @@ def test_raise_method_not_allowed(self):
         req = self.make_request('PUT', '/')
 
         match_info = self.loop.run_until_complete(self.router.resolve(req))
-        self.assertIsNone(match_info.route)
+        self.assertIsInstance(match_info.route, SystemRoute)
         self.assertEqual({}, match_info)
 
         with self.assertRaises(HTTPMethodNotAllowed) as ctx:
@@ -198,7 +204,7 @@ def test_raise_method_not_found(self):
         req = self.make_request('GET', '/b')
 
         match_info = self.loop.run_until_complete(self.router.resolve(req))
-        self.assertIsNone(match_info.route)
+        self.assertIsInstance(match_info.route, SystemRoute)
         self.assertEqual({}, match_info)
 
         with self.assertRaises(HTTPNotFound) as ctx:
@@ -359,7 +365,7 @@ def test_add_route_with_re_not_match(self):
 
         req = self.make_request('GET', '/handler/tail')
         match_info = self.loop.run_until_complete(self.router.resolve(req))
-        self.assertIsNone(match_info.route)
+        self.assertIsInstance(match_info.route, SystemRoute)
         self.assertEqual({}, match_info)
         with self.assertRaises(HTTPNotFound):
             self.loop.run_until_complete(match_info.handler(req))

tests/test_web_functional.py

@@ -469,6 +469,54 @@ def go():
 
         self.loop.run_until_complete(go())
 
+    def test_100_continue_for_not_found(self):
+
+        @asyncio.coroutine
+        def handler(request):
+            return web.Response()
+
+        @asyncio.coroutine
+        def go():
+            app, _, url = yield from self.create_server('POST', '/')
+            app.router.add_route('POST', '/', handler)
+
+            form = FormData()
+            form.add_field('name', b'123',
+                           content_transfer_encoding='base64')
+
+            resp = yield from request(
+                'post', url + 'not_found', data=form,
+                expect100=True,  # wait until server returns 100 continue
+                loop=self.loop)
+
+            self.assertEqual(404, resp.status)
+
+        self.loop.run_until_complete(go())
+
+    def test_100_continue_for_not_allowed(self):
+
+        @asyncio.coroutine
+        def handler(request):
+            return web.Response()
+
+        @asyncio.coroutine
+        def go():
+            app, _, url = yield from self.create_server('POST', '/')
+            app.router.add_route('POST', '/', handler)
+
+            form = FormData()
+            form.add_field('name', b'123',
+                           content_transfer_encoding='base64')
+
+            resp = yield from request(
+                'GET', url, data=form,
+                expect100=True,  # wait until server returns 100 continue
+                loop=self.loop)
+
+            self.assertEqual(405, resp.status)
+
+        self.loop.run_until_complete(go())
+
     def test_http10_keep_alive_default(self):
 
         @asyncio.coroutine