Setup default validated_hook.

src/ZPublisher/WSGIPublisher.py

@@ -18,6 +18,7 @@ import sys
 from thread import allocate_lock
 import time
 
+from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 import transaction
 from zExceptions import (
@@ -78,6 +79,10 @@ def missing_name(name, request):
     request.response.badRequestError(name)
 
 
+def validate_user(request, user):
+    newSecurityManager(request, user)
+
+
 def set_default_debug_mode(debug_mode):
     global _DEFAULT_DEBUG_MODE
     _DEFAULT_DEBUG_MODE = debug_mode
@@ -107,7 +112,8 @@ def get_module_info(module_name='Zope2'):
         bobo_before = getattr(module, '__bobo_before__', None)
         bobo_after = getattr(module, '__bobo_after__', None)
         error_hook = getattr(module, 'zpublisher_exception_hook', None)
-        validated_hook = getattr(module, 'zpublisher_validated_hook', None)
+        validated_hook = getattr(
+            module, 'zpublisher_validated_hook', validate_user)
         transactions_manager = getattr(
             module, 'zpublisher_transactions_manager', transaction.manager)
 
@@ -115,7 +121,7 @@ def get_module_info(module_name='Zope2'):
                 error_hook, validated_hook, transactions_manager)
 
         _MODULES[module_name] = info
-        return info
+    return info
 
 
 class WSGIResponse(HTTPResponse):

src/Zope2/App/startup.py

@@ -41,6 +41,11 @@ deprecated(
     ZPublisherExceptionHook='ZServer.ZPublisher.exceptionhook:ExceptionHook',
 )
 
+deprecated(
+    'Please import from ZPublisher.WSGIPublisher.',
+    validated_hook='ZPublisher.WSGIPublisher:validate_user',
+)
+
 app = None
 startup_time = asctime()
 _patched = False
@@ -149,8 +154,3 @@ def startup():
     notify(DatabaseOpenedWithRoot(DB))
 
     Zope2.zpublisher_transactions_manager = transaction.manager
-    Zope2.zpublisher_validated_hook = validated_hook
-
-
-def validated_hook(request, user):
-    newSecurityManager(request, user)