WSGIPublisher: set REMOTE_USER even in case of error

CHANGES.rst

@@ -18,6 +18,9 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 - Added image dimensions to SVG file properties
   `#1146 <https://github.com/zopefoundation/Zope/pull/1146>`_.
 
+- Fix username not in access log for error requests, see issue
+  `#1155 <https://github.com/zopefoundation/Zope/issues/1155>`_.
+
 5.8.4 (2023-09-06)
 ------------------
 

src/ZPublisher/WSGIPublisher.py

@@ -387,12 +387,13 @@ def publish_module(environ, start_response,
             try:
                 with load_app(module_info) as new_mod_info:
                     with transaction_pubevents(request, response):
-                        response = _publish(request, new_mod_info)
-
-                        user = getSecurityManager().getUser()
-                        if user is not None and \
-                           user.getUserName() != 'Anonymous User':
-                            environ['REMOTE_USER'] = user.getUserName()
+                        try:
+                            response = _publish(request, new_mod_info)
+                        finally:
+                            user = getSecurityManager().getUser()
+                            if user is not None and \
+                               user.getUserName() != 'Anonymous User':
+                                environ['REMOTE_USER'] = user.getUserName()
                 break
             except TransientError:
                 if request.supports_retry():

src/ZPublisher/tests/test_WSGIPublisher.py

@@ -820,6 +820,15 @@ def test_set_REMOTE_USER_environ(self):
         self._callFUT(environ, start_response, _publish)
         self.assertFalse('REMOTE_USER' in environ)
 
+    def test_set_REMOTE_USER_environ_error(self):
+        environ = self._makeEnviron()
+        start_response = DummyCallable()
+        _publish = DummyCallable()
+        _publish._raise = ValueError()
+        with self.assertRaises(ValueError):
+            self._callFUT(environ, start_response, _publish)
+        self.assertEqual(environ['REMOTE_USER'], user_name)
+
     def test_webdav_source_port(self):
         from ZPublisher import WSGIPublisher
         old_webdav_source_port = WSGIPublisher._WEBDAV_SOURCE_PORT