Ticket #67: authkit-2.4-compat.patch

test/test.py

@@ -98 +98 @@
-        setup_intercept = "403, 702",
-    )
-    res = TestApp(app).get('/403', status=401)
-
+
+
+
+
+
-    # XXX Should this keep the original status code or not?
-    assertEqual(res.full_status, '401 Unauthorized')
-    assert 'This server could not verify that you are authorized' in res
-
-    res = TestApp(app).get('/702', status=401)
-
+
+
-    # XXX Should this keep the original status code or not?
-    assertEqual(res.full_status, '401 Unauthorized')
-    assert 'This server could not verify that you are authorized' in res
-
-    res = TestApp(app).get('/500', status=500)
-
+
+
-    assertEqual(res.full_status, '500 Error')
-    assert 'Error' in res
-    
-    res = TestApp(app).get('/401', status=401)
-
+
+
-    assertEqual(res.full_status, '401 Unauth')
-    assert 'Not Authed' in res
-    
-def test_fail():
-    for app in [basic_app, digest_app, config_app]:
-        res = TestApp(app).get('/private', status=401)
-
+
+
-        assertEqual(res.full_status, '401 Unauthorized')
-        #raise Exception(res)
-        assert 'This server could not verify that you are' in res

authkit/permissions.py

@@ -27 +27 @@
-import logging
-log = logging.getLogger('authkit.permissions')
-
+# will be True for Python 2.5+
+newstyle_exceptions = issubclass(Exception, object)
+
-class AuthKitConfigError(Exception): 
-    """
-    Raised when there is a problem with the
@@ -171 +174 @@
-
-    def check(self, app, environ, start_response):
-        if 'REMOTE_USER' not in environ:
-
+
+
+
+
+
-        elif self.accept_empty==False and not environ['REMOTE_USER']:
-
+
+
+
+
+
-        return app(environ, start_response)
-
-#

authkit/authenticate/__init__.py

@@ -45 +45 @@
-from multi import MultiHandler, status_checker
-from pkg_resources import iter_entry_points, load_entry_point
-from paste.deploy.converters import asbool
-from paste.httpexceptions import HTTPExceptionHandler
-
+import paste.httpexceptions
+import webob.exc
+
-from authkit.authorize import authorize_request
-from authkit.permissions import RemoteUser, no_authkit_users_in_environ, \
-    AuthKitConfigError
@@ -371 +373 @@
-        merged[key.replace('_','.')] = value
-    return merged
-
+class HTTPExceptionHandler(object):
+    """
+    catches exceptions and turns them into proper HTTP responses
+
+    Attributes:
+
+       ``warning_level``
+           This attribute determines for what exceptions a stack
+           trace is kept for lower level reporting; by default, it
+           only keeps stack trace for 5xx, HTTPServerError exceptions.
+           To keep a stack trace for 4xx, HTTPClientError exceptions,
+           set this to 400.
+
+    This middleware catches any exceptions (which are subclasses of
+    ``HTTPException``) and turns them into proper HTTP responses.
+    Note if the headers have already been sent, the stack trace is
+    always maintained as this indicates a programming error.
+
+    Note that you must raise the exception before returning the
+    app_iter, and you cannot use this with generator apps that don't
+    raise an exception until after their app_iter is iterated over.
+    
+    .. note::
+        
+        This originally came from paste.httpexceptions.HTTPExceptionHandler
+        and is patched with comments below for compatibility with 
+        webob + Python 2.4
+    
+    """
+
+    def __init__(self, application, warning_level=None):
+        assert not warning_level or ( warning_level > 99 and
+                                      warning_level < 600)
+        self.warning_level = warning_level or 500
+        self.application = application
+
+    def __call__(self, environ, start_response):
+                    
+        # Note that catching the webob exception is for Python 2.4 support.
+        # In the brave new world of new-style exceptions (derived from object)
+        # multiple inheritance works like you'd expect: the NotAuthenticatedError 
+        # is caught because it descends from the past and webob exceptions.
+        # In the old world (2.4-), the webob exception needs to be in the catch list
+            
+        environ['paste.httpexceptions'] = self
+        environ.setdefault('paste.expected_exceptions',
+                           []).extend([paste.httpexceptions.HTTPException,
+                                       webob.exc.HTTPException])
+        try:
+            return self.application(environ, start_response)        
+        except (paste.httpexceptions.HTTPException, 
+                webob.exc.HTTPException), exc:        
+            return exc(environ, start_response)
+
-def middleware(app, app_conf=None, global_conf=None, prefix='authkit.', 
-               handle_httpexception=True, middleware=None, **options):   
-    """