Refs #31040, Refs #31224 -- Prevented cycles in exceptions chain.

felixxm · web-flow · commit d94a9aa0557a · 2020-05-28T13:05:15.000+02:00
Async exception handling was raising an exception that was creating a
cycle in the exception chain (by re-raising an exception in
sync_to_async that was already being handled).

Thanks Chris Jerdonek for detailed analysis.
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
@@ -179,6 +179,8 @@ def _get_response(self, request):
                 response = wrapped_callback(request, *callback_args, **callback_kwargs)
             except Exception as e:
                 response = self.process_exception_by_middleware(e, request)
+                if response is None:
+                    raise
 
         # Complain if the view returned None (a common error).
         self.check_response(response, callback)
@@ -200,6 +202,8 @@ def _get_response(self, request):
                 response = response.render()
             except Exception as e:
                 response = self.process_exception_by_middleware(e, request)
+                if response is None:
+                    raise
 
         return response
 
@@ -230,6 +234,8 @@ async def _get_response_async(self, request):
                     self.process_exception_by_middleware,
                     thread_sensitive=True,
                 )(e, request)
+                if response is None:
+                    raise
 
         # Complain if the view returned None or an uncalled coroutine.
         self.check_response(response, callback)
@@ -258,6 +264,8 @@ async def _get_response_async(self, request):
                     self.process_exception_by_middleware,
                     thread_sensitive=True,
                 )(e, request)
+                if response is None:
+                    raise
 
         # Make sure the response is not a coroutine
         if asyncio.iscoroutine(response):
@@ -323,13 +331,13 @@ def make_view_atomic(self, view):
     def process_exception_by_middleware(self, exception, request):
         """
         Pass the exception to the exception middleware. If no middleware
-        return a response for this exception, raise it.
+        return a response for this exception, return None.
         """
         for middleware_method in self._exception_middleware:
             response = middleware_method(request, exception)
             if response:
                 return response
-        raise
+        return None
 
 
 def reset_urlconf(sender, **kwargs):
