Changeset 159

Timestamp:

11/08/08 00:25:08

Author:

thejimmyg

Message:

Applied most of ticket 59

Files:

• AuthKit/trunk/AuthKit.egg-info/PKG-INFO (modified) (1 diff)
• AuthKit/trunk/CHANGELOG.txt (modified) (1 diff)
• AuthKit/trunk/authkit/authenticate/cookie.py (modified) (1 diff)
• AuthKit/trunk/authkit/authenticate/open_id.py (modified) (4 diffs)

AuthKit/trunk/AuthKit.egg-info/PKG-INFO

@@ -1 +1 @@
-Metadata-Version: 1.0
-Name: AuthKit
-7
+8
-Summary: An authentication and authorization toolkit for WSGI applications and frameworks
-Home-page: http://authkit.org/

AuthKit/trunk/CHANGELOG.txt

@@ -4 +4 @@
-0.4.2
-
+* Applied most of #59 and tested the two OpenID examples
-* Added support for WebOb HTTPExceptions to remove a deprecation warning in 
-  Pylons 0.9.7

AuthKit/trunk/authkit/authenticate/cookie.py

@@ -374 +374 @@
-            if environ.get('REMOTE_USER_TOKENS'):
-                # We want to add tokens/roles to what's there:
-environ['REMOTE_USER_TOKENS'] + ',' + tokens
+str(environ['REMOTE_USER_TOKENS']) + ',' + str(tokens)
-            environ['REMOTE_USER_TOKENS'] = tokens
-            environ['REMOTE_USER_DATA'] = user_data

AuthKit/trunk/authkit/authenticate/open_id.py

@@ -373 +373 @@
-            if info.endpoint.canonicalID:
-                username = cgi.escape(info.endpoint.canonicalID)
-
+
+
+
+
+
-            # Set the cookie
-            if self.urltouser:
@@ -465 +469 @@
-            sreg_optional=options['sreg_optional'],
-            sreg_policyurl=options['sreg_policyurl'],
+            session_middleware=options['session_middleware']
-        )
-        self.app = app
@@ -503 +508 @@
-        'sreg_optional': auth_conf.get('sreg.optional'),
-        'sreg_policyurl': auth_conf.get('sreg.policyurl'),
-'beaker.session'
+auth_conf.get('session.middleware','beaker.session')
-    }
-    auth_handler_params={
@@ -511 +516 @@
-        'charset':user_setter_params['charset'],
-    }
+    # The following lines were suggested in #59 but I don't know
+    # why they are needed because you shouldn't be using the 
+    # user management API.
+    # authenticate_conf = strip_base(auth_conf, 'authenticate.')
+    # app, authfunc, users = get_authenticate_function(
+    #     app, 
+    #     authenticate_conf, 
+    #     prefix=prefix+'authenticate.', 
+    #     format='basic'
+    # )
-    return app, auth_handler_params, user_setter_params
-