Changeset 61

Timestamp:

03/13/07 00:36:57

Author:

thejimmyg

Message:

Fixed some bugs and introduced a basic test suite

Files:

• AuthKit/branches/0.4/AuthKit.egg-info/SOURCES.txt (modified) (1 diff)
• AuthKit/branches/0.4/AuthKit.egg-info/requires.txt (modified) (3 diffs)
• AuthKit/branches/0.4/authkit/authenticate/__init__.py (modified) (5 diffs)
• AuthKit/branches/0.4/authkit/authenticate/auth_tkt.py (modified) (1 diff)
• AuthKit/branches/0.4/authkit/authenticate/form.py (modified) (4 diffs)
• AuthKit/branches/0.4/authkit/authenticate/redirect.py (modified) (1 diff)
• AuthKit/branches/0.4/authkit/authorize.py (modified) (2 diffs)
• AuthKit/branches/0.4/authkit/permissions.py (modified) (1 diff)
• AuthKit/branches/0.4/examples/docs/AuthKit.egg-info (deleted)
• AuthKit/branches/0.4/examples/docs/basic.py (modified) (3 diffs)
• AuthKit/branches/0.4/examples/docs/digest.py (modified) (2 diffs)
• AuthKit/branches/0.4/examples/docs/form.py (modified) (2 diffs)
• AuthKit/branches/0.4/examples/docs/forward.py (modified) (4 diffs)
• AuthKit/branches/0.4/examples/docs/index.html (deleted)
• AuthKit/branches/0.4/examples/docs/passurl.py (modified) (2 diffs)
• AuthKit/branches/0.4/examples/docs/redirect.py (modified) (1 diff)
• AuthKit/branches/0.4/setup.py (modified) (1 diff)
• AuthKit/branches/0.4/test/test.ini (deleted)
• AuthKit/branches/0.4/test/test.py (modified) (1 diff)

AuthKit/branches/0.4/AuthKit.egg-info/SOURCES.txt

@@ -64 +64 @@
-examples/docs/passurl.py
-examples/docs/redirect.py
-examples/pylons/AuthDemo/README.txt
-examples/pylons/AuthDemo/development.ini
-examples/pylons/AuthDemo/setup.cfg
-examples/pylons/AuthDemo/setup.py
-examples/pylons/AuthDemo/AuthDemo.egg-info/PKG-INFO
-examples/pylons/AuthDemo/AuthDemo.egg-info/SOURCES.txt
-examples/pylons/AuthDemo/AuthDemo.egg-info/dependency_links.txt
-examples/pylons/AuthDemo/AuthDemo.egg-info/entry_points.txt
-examples/pylons/AuthDemo/AuthDemo.egg-info/paste_deploy_config.ini_tmpl
-examples/pylons/AuthDemo/AuthDemo.egg-info/paster_plugins.txt
-examples/pylons/AuthDemo/AuthDemo.egg-info/requires.txt
-examples/pylons/AuthDemo/AuthDemo.egg-info/top_level.txt
-examples/pylons/AuthDemo/authdemo/__init__.py
-examples/pylons/AuthDemo/authdemo/websetup.py
-examples/pylons/AuthDemo/authdemo/config/__init__.py
-examples/pylons/AuthDemo/authdemo/config/environment.py
-examples/pylons/AuthDemo/authdemo/config/middleware.py
-examples/pylons/AuthDemo/authdemo/config/routing.py
-examples/pylons/AuthDemo/authdemo/controllers/__init__.py
-examples/pylons/AuthDemo/authdemo/controllers/account.py
-examples/pylons/AuthDemo/authdemo/controllers/error.py
-examples/pylons/AuthDemo/authdemo/controllers/hello.py
-examples/pylons/AuthDemo/authdemo/controllers/template.py
-examples/pylons/AuthDemo/authdemo/docs/index.txt
-examples/pylons/AuthDemo/authdemo/i18n/__init__.py
-examples/pylons/AuthDemo/authdemo/lib/__init__.py
-examples/pylons/AuthDemo/authdemo/lib/app_globals.py
-examples/pylons/AuthDemo/authdemo/lib/base.py
-examples/pylons/AuthDemo/authdemo/lib/database.py
-examples/pylons/AuthDemo/authdemo/lib/helpers.py
-examples/pylons/AuthDemo/authdemo/models/__init__.py
-examples/pylons/AuthDemo/authdemo/models/forms/__init__.py
-examples/pylons/AuthDemo/authdemo/models/forms/build.py
-examples/pylons/AuthDemo/authdemo/models/forms/schema.py
-examples/pylons/AuthDemo/authdemo/public/assets/bad.gif
-examples/pylons/AuthDemo/authdemo/public/assets/good.gif
-examples/pylons/AuthDemo/authdemo/public/assets/loading.gif
-examples/pylons/AuthDemo/authdemo/public/assets/passurl_icon.png
-examples/pylons/AuthDemo/authdemo/public/script/signup.js
-examples/pylons/AuthDemo/authdemo/public/script/MochiKit/MochiKit.js
-examples/pylons/AuthDemo/authdemo/public/script/MochiKit/__package__.js
-examples/pylons/AuthDemo/authdemo/public/style/default.css
-examples/pylons/AuthDemo/authdemo/templates/autohandler
-examples/pylons/AuthDemo/authdemo/templates/home.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/alreadyout.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/autohandler
-examples/pylons/AuthDemo/authdemo/templates/authkit/change_password.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/confirm.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/email_confirm_msg.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/email_password_reminder_msg.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/field_layout.myc
-examples/pylons/AuthDemo/authdemo/templates/authkit/index.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/list_personas.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/new_email_sent.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/password_reminder.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/password_reminder_sent.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/policy.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/redirect.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/register_new_email.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/registration_sent.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/reminder_sent.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/signedout.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/signin.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/signup.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/sites.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/update_details.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/update_persona.myt
-examples/pylons/AuthDemo/authdemo/templates/authkit/verify.myt
-examples/pylons/AuthDemo/authdemo/templates/openid/consumer/autohandler
-examples/pylons/AuthDemo/authdemo/templates/openid/consumer/content.myt
-examples/pylons/AuthDemo/authdemo/tests/__init__.py
-examples/pylons/AuthDemo/authdemo/tests/test_models.py
-examples/pylons/AuthDemo/authdemo/tests/functional/__init__.py
-examples/pylons/PassURLConsumer/README.txt
-examples/pylons/PassURLConsumer/development.ini
-examples/pylons/PassURLConsumer/setup.cfg
-examples/pylons/PassURLConsumer/setup.py
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/PKG-INFO
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/SOURCES.txt
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/dependency_links.txt
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/entry_points.txt
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/paste_deploy_config.ini_tmpl
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/paster_plugins.txt
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/requires.txt
-examples/pylons/PassURLConsumer/PassURLConsumer.egg-info/top_level.txt
-examples/pylons/PassURLConsumer/passurlconsumer/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/websetup.py
-examples/pylons/PassURLConsumer/passurlconsumer/config/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/config/environment.py
-examples/pylons/PassURLConsumer/passurlconsumer/config/middleware.py
-examples/pylons/PassURLConsumer/passurlconsumer/config/routing.py
-examples/pylons/PassURLConsumer/passurlconsumer/controllers/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/controllers/error.py
-examples/pylons/PassURLConsumer/passurlconsumer/controllers/openid_consumer.py
-examples/pylons/PassURLConsumer/passurlconsumer/controllers/template.py
-examples/pylons/PassURLConsumer/passurlconsumer/docs/index.txt
-examples/pylons/PassURLConsumer/passurlconsumer/i18n/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/lib/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/lib/app_globals.py
-examples/pylons/PassURLConsumer/passurlconsumer/lib/base.py
-examples/pylons/PassURLConsumer/passurlconsumer/lib/helpers.py
-examples/pylons/PassURLConsumer/passurlconsumer/models/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/public/index.html
-examples/pylons/PassURLConsumer/passurlconsumer/templates/autohandler
-examples/pylons/PassURLConsumer/passurlconsumer/templates/openid/autohandler
-examples/pylons/PassURLConsumer/passurlconsumer/templates/openid/content.myt
-examples/pylons/PassURLConsumer/passurlconsumer/tests/__init__.py
-examples/pylons/PassURLConsumer/passurlconsumer/tests/test_models.py
-examples/pylons/PassURLConsumer/passurlconsumer/tests/functional/__init__.py
-ez_setup/README.txt
-ez_setup/__init__.py
-test/test.ini
-test/test.py

AuthKit/branches/0.4/AuthKit.egg-info/requires.txt

@@ -1 @@
-
-
+
+
+
-python-openid>=1.1,<=1.2
-
-
-
-
-
-
+
+
+
+
-
-[pudge]
@@ -15 +14 @@
-
-[full]
-
-
-
-
+
+
+
-pudge==dev
-buildutils==dev
@@ -24 +22 @@
-
-[pylons]
-
+,<=1.0
-
-[mysql]
-
-
+,<=0.4
+,<=1.0

AuthKit/branches/0.4/authkit/authenticate/__init__.py

@@ -44 +44 @@
-from pkg_resources import iter_entry_points, load_entry_point
-from paste.deploy.converters import asbool
+from paste.httpexceptions import HTTPExceptionHandler
-
-#
@@ -535 +536 @@
-
-    #
+    # Setup the httpexceptions middleware
+    #
+
+#    class AddHTTPExceptionMiddleware:
+#        def __init__(self, app):
+#            self.app = app
+#        def __call__(self, environ, start_response):
+#            if not environ.has_key("paste.expected_exceptions"):
+#                self.app = HTTPExceptionHandler(self.app)
+#            return self.app(environ, start_response)
+
+    app = HTTPExceptionHandler(app)
+
+
+    #
-    # Configure the config files
-    #
@@ -721 +737 @@
-        raise NotImplementedError('No %r method has been implemented'%method)
-           
-
-
-
+
+
+
+
-    """
-    A sample WSGI application that returns a 401 status code when the path 
@@ -739 +756 @@
-    """
-    if environ['PATH_INFO']=='/private':
-
+_request
-    if environ['PATH_INFO'] == '/signout':
-        start_response('200 OK', [('Content-type', 'text/plain')])
@@ -751 +768 @@
-    else:
-        start_response('200 OK', [('Content-type', 'text/plain')])
-
-
+
+
+
+
+

AuthKit/branches/0.4/authkit/authenticate/auth_tkt.py

@@ -294 +294 @@
-            cookie_value = ''
-        log.debug("Our cookie %r value is therefore %r", self.cookie_name, cookie_value)
-['REMOTE_ADDR']
+.get('REMOTE_ADDR','0.0.0.0')
-        log.debug("Remote addr %r, value %r, include_ip %r", remote_addr, cookie_value, self.include_ip)
-

AuthKit/branches/0.4/authkit/authenticate/form.py

@@ -14 +14 @@
-template = """\
-<html>
-Login!
+Sign In
-  <body>
-Logi
+Sign I
-    <form action="%s" method="post">
-      <dl>
@@ -62 +62 @@
-
-        content = self.template % construct_url(environ)
-200 OK
+401 Unauthorized
-                                 ('Content-Length', str(len(content)))])
-        return [content]
@@ -76 +76 @@
-        app,
-        'paste.auth_tkt.set_user',
-
+
+
-
-    template_conf = strip_base(auth_conf, 'template.')
@@ -95 +96 @@
-    return app
-
-if __name__ == 'main':
-    from paste.httpserver import serve
-    from authkit.authenticate import middleware, test_app
-
-    app = middleware(
-        test_app,
-        method='new_form',
-        cookie_secret='secret encryption string',
-        users_setup = """
-            Username1:password1
-            username2:password2
-        """,
-        cookie_signout = '/signout',
-        custom_methods = {
-            'new_form': make_new_form_middleware
-        },
-        new_form_option = 'Just an example!',
-    )
-    serve(app, host='0.0.0.0', port=8080)
-

AuthKit/branches/0.4/authkit/authenticate/redirect.py

@@ -1 @@
-, test_app
+
-from authkit.authenticate.multi import MultiHandler, status_checker
-

AuthKit/branches/0.4/authkit/authorize.py

@@ -25 +25 @@
-
-from paste import httpexceptions
-
-
+
+
+
+
-
-#
@@ -164 +166 @@
-        'Try using the authkit.authorize.middleware or the authorize decorator.'
-    )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        raise error
-    else:
-        try:
-            def dummy_app(environ, start_response):
-                if not start_response == _PermissionStartResponse:
-                    raise _FiddledWith('Fiddled with start_response %r'%start_response)
-                start_response(
-                    '1000 Test Response For Permissions Check', 
-                    [('Content-type','text/plain')]
-                )
-                return _PermissionList('''Dummy response from permission check.''')
-            
-            if not isinstance(
-                permission.check(
-                    dummy_app, 
-                    environ, 
-                    _PermissionStartResponse
-                ), 
-                _PermissionList
-            ):
-                raise _FiddledWith('Fiddled with response')
-        except _FiddledWith:
-            raise error
-
-def authorized(environ, permission):

AuthKit/branches/0.4/authkit/permissions.py

@@ -31 +31 @@
-#
-
-class PermissionSetupError(Exception):
-    pass
-
-class Permission:

AuthKit/branches/0.4/examples/docs/basic.py

@@ -1 @@
-
-
+
-
-def valid(environ, username, password):
@@ -6 +5 @@
-
-app = middleware(
-test
+sample
-    setup_method='basic', 
-    basic_realm='Test Realm', 
@@ -12 +11 @@
-)
-
-
-
+
+
+
+

AuthKit/branches/0.4/examples/docs/digest.py

@@ -1 @@
-test
+sample
-from authkit.authenticate.digest import digest_password
-
@@ -7 +7 @@
-
-app = middleware(
-test_app, 
- 
- 
+sample_app,
+
+
-    digest_authenticate_function=digest
-)
-
-
-
+
+
+
+

AuthKit/branches/0.4/examples/docs/form.py

@@ -1 @@
-
-
+
-
-app = middleware(
-test
+sample
-    setup_method='form,cookie',
-    cookie_secret='secret encryption string',
@@ -13 +12 @@
-    #cookie_params_name = 'test'
-)
-
+
+
+
+
+

AuthKit/branches/0.4/examples/docs/forward.py

@@ -1 @@
-
+
+
+
-    """
-    A sample WSGI application that returns a 401 status code when the path 
@@ -36 +38 @@
-            """
-        if not environ.get('QUERY_STRING'):
-
-
+
+
+
+
+
-        else:
-            # Quick and dirty sign in check, do it properly in your code
@@ -52 +57 @@
-    
-    start_response('200 OK', [('Content-type', 'text/plain')])
-
-
-
-
+
+
+
+
+
-
-app = middleware(
-test
+sample
-    setup_method='forward,cookie',
-    forward_internalpath = '/signin',
@@ -64 +70 @@
-    cookie_secret = 'somesecret',
-)
-
+
+
+
+
+

AuthKit/branches/0.4/examples/docs/passurl.py

@@ -1 @@
-
-
+
-
-app = middleware(
-test
+sample
-    setup_method='passurl,cookie',
-    passurl_path_signedin='/private',
@@ -12 +11 @@
-)
-
-
+
+
+

AuthKit/branches/0.4/examples/docs/redirect.py

@@ -1 @@
-
-
+
-
-app = middleware(
-test
+sample
-    setup_method='redirect,cookie',
-google
+3aims
-    cookie_secret='asdasd'
-)
-
-
+
+
+

AuthKit/branches/0.4/setup.py

@@ -65 +65 @@
-    include_package_data=True,
-    zip_safe=False,
+    test_suite = 'nose.collector',
-    install_requires = [
-
-
+
+
+
-        "python-openid>=1.1,<=1.2",
-
-
-
+
+
+
+
-    ],
-    extras_require = {
-
-
-
-
+
+
+
-        'pudge': ["pudge==dev", "buildutils==dev", "pygments==0.6"],
-    },

AuthKit/branches/0.4/test/test.py

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-from paste.fixture import *
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def test_ok():
-app = TestApp(simple_app)
-res = app
-assert res.header('content-type') == 'text/plain'
-assert res.full_status == '200 OK'
-assert 'signed in
+for app in apps:
+    res = TestApp(app)
+    assertEqual(res.header('content-type'), 'text/plain')
+    assertEqual(res.full_status, '200 OK')
+    assert 'You Have Access To This Page.
-
+def test_fail():
+    for app in [basic_app, digest_app]:
+        res = TestApp(app).get('/private', status=401)
+        assertEqual(res.header('content-type'),'text/plain')
+        assertEqual(res.full_status, '401 Unauthorized')
+        #raise Exception(res)
+        assert 'This server could not verify that you are' in res
+
+def test_form_fail():
+    res = TestApp(form_app).get('/private', status=401)
+    assertEqual(res.header('content-type'),'text/html')
+    assertEqual(res.full_status, '401 Unauthorized')
+    assert 'Please Sign In' in res
+
+def test_forward_fail():
+    res = TestApp(forward_app).get('/private')
+    assertEqual(res.header('content-type'),'text/html')
+    # XXX Not sure about this but using a 401 triggers an infinite loop
+    # of redirects.
+    assertEqual(res.full_status, '200 Sign in required')
+    assert 'Please Sign In' in res
+
+def test_passurl_fail():
+    res = TestApp(passurl_app).get('/private')
+    assertEqual(res.header('content-type'),'text/html')
+    assertEqual(res.full_status, '200 OK')
+    assert 'Please Sign In' in res
+
+def test_redirect_fail():
+    res = TestApp(redirect_app).get('/private', status=302)
+    assertEqual(res.header('Location'),'http://3aims.com')
+    assertEqual(res.full_status, '302 Found')
+
+