Changeset 137

Timestamp:

11/06/07 00:39:11

Author:

thejimmyg

Message:

Added an SQLAlchemy 0.4 driver which uses the (as yet unreleased) SQLAlchemyManager middleware

Files:

• AuthKit/trunk/authkit/users/sqlalchemy_04_driver.py (added)
• AuthKit/trunk/examples/user/database/README.txt (modified) (1 diff)
• AuthKit/trunk/examples/user/database/app.py (modified) (2 diffs)
• AuthKit/trunk/examples/user/database/create.py (deleted)
• AuthKit/trunk/examples/user/database/model.py (deleted)
• AuthKit/trunk/test/model.py (deleted)
• AuthKit/trunk/test/test.py (modified) (4 diffs)

AuthKit/trunk/examples/user/database/README.txt

@@ -1 +1 @@
-To use this example do the following:
-
-model
+app
-   The default should be fine but you will need ``pysqlite`` installed.
-   
-
-
-
-
-
+
+
-
-        python app.py
-        
-
+
+
+
+
+

AuthKit/trunk/examples/user/database/app.py

@@ -16 +16 @@
-from authkit.authenticate import middleware
-from authkit.authorize import authorize
-from authkit.users.sqlalchemy_driver import UsersFromDatabase
-from authkit.permissions import ValidAuthKitUser, HasAuthKitRole, HasAuthKitGroup
-
@@ -71 +70 @@
-        return self._access_granted(start_response, "You are in the <tt>pylons</tt> group.")
-
+from jimmyg.database.sa import SQLAlchemyManager
+import authkit.users.sqlalchemy_04_driver
+import os
+# os.remove('test.db')
+
-app = SampleApp()
-# Not needed, included by the authenticate middleware
-#app = HTTPExceptionHandler(app)
-app = middleware(
-    app,
-    setup_method='form,cookie',
-    cookie_secret='secret encryption string',
-
-
+
-    cookie_signoutpath = '/signout',
-    # setup_intercept = "401, 403",
-)
+app = SQLAlchemyManager(app, {'sqlalchemy.url':'sqlite:///test.db'}, [authkit.users.sqlalchemy_04_driver.setup_model])
+app.create_all()
+connection = app.engine.connect()
+session = app.session_maker(bind=connection)
+try:
+    environ = {}
+    environ['sqlalchemy.session'] = session
+    environ['sqlalchemy.model'] = app.model
+    users = authkit.users.sqlalchemy_04_driver.UsersFromDatabase(environ)
+    users.group_create("pylons")
+    users.role_create("admin")
+    users.user_create("james", password="password1", group="pylons")
+    users.user_create("ben", password="password2")
+    users.user_add_role("ben", role="admin")
+    session.flush()
+    session.commit()
+finally:
+    session.close()
+    connection.close()
+
-app = HTTPExceptionHandler(app)
-if __name__ == '__main__':

AuthKit/trunk/test/test.py

@@ -89 +89 @@
-    app = middleware(
-        sample_app,
-form,cookie
-cookie_secret='secret encryption string
-form
+digest
+digest_realm='test
+digest
-            Username1:password1
-            username2:password2
@@ -99 +99 @@
-    )
-    res = TestApp(app).get('/403', status=401)
-html
+plain
-    # XXX Should this keep the original status code or not?
-    assertEqual(res.full_status, '401 Unauthorized')
-Please Sign In
+This server could not verify that you are authorized
-
-    res = TestApp(app).get('/702', status=401)
-html
+plain
-    # XXX Should this keep the original status code or not?
-    assertEqual(res.full_status, '401 Unauthorized')
-Please Sign In
+This server could not verify that you are authorized
-
-    res = TestApp(app).get('/500', status=500)
@@ -129 +129 @@
-
-def test_form_fail():
-401
+200
-    assertEqual(res.header('content-type'),'text/html; charset=UTF-8')
-401 Unauthorized
+200 OK
-    assert 'Please Sign In' in res
-
@@ -155 +155 @@
-def test_users_api_database():
-    try: 
-driver import UsersFromDatabase
+04_driver import UsersFromDatabase, setup_model
-    except ImportError:
-        raise Exception("Could not run the SQLAlchemy tests, not installed")
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+