Changeset 144

Timestamp:

01/09/08 20:14:19

Author:

thejimmyg

Message:

Added an alternative construct_url() method

Files:

• AuthKit/trunk/AuthKit.egg-info/PKG-INFO (modified) (2 diffs)
• AuthKit/trunk/CHANGELOG.txt (modified) (1 diff)
• AuthKit/trunk/authkit/authenticate/form.py (modified) (3 diffs)

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

@@ -1 +1 @@
-Metadata-Version: 1.0
-Name: AuthKit
-39
+43
-Summary: An authentication and authorization toolkit for WSGI applications and frameworks
-Home-page: http://authkit.org/
@@ -53 +53 @@
-        0.4.1 (**svn**)
-        
+        * Fixed #38, cookie sign out path should match the path specified in
+        the config file.
+        * Fixed #37, missing import of sys in digest authentication
+        * Updated SQLAlchemy code to use SQLAlchemyManager. Needs installing
+        manually with ``easy_install SQLAlchemyManager``.
-        * Added a user management api_version attribute and changed the API so that
-        the users object is set up on each request and recieves an environ

AuthKit/trunk/CHANGELOG.txt

@@ -4 +4 @@
-0.4.1 (**svn**)
-
+* AuthKit form authentication now picks up HTTP_X_FORWARDED_HOST and
+  HTTP_X_FORWARDED_PORT when generating an action. This allows you to run
+  an AuthKit app on port 80, proxied from 443 as long as you set up these
+  two (slightly unstandard) variables.
-* Fixed #38, cookie sign out path should match the path specified in 
-  the config file.

AuthKit/trunk/authkit/authenticate/form.py

@@ -20 +20 @@
-
-from paste.auth.form import AuthFormHandler
-construct_url, 
+
-from authkit.authenticate import get_template, valid_password, \
-   get_authenticate_function, strip_base, RequireEnvironKey, \
@@ -27 +27 @@
-
-import logging
+import urllib
-log = logging.getLogger('authkit.authenticate.form')
-
@@ -94 +95 @@
-        return [content]
-
+def construct_url(environ, with_query_string=True, with_path_info=True,
+                  script_name=None, path_info=None, querystring=None):
+    """Reconstructs the URL from the WSGI environment.
+
+    You may override SCRIPT_NAME, PATH_INFO, and QUERYSTRING with
+    the keyword arguments.
+
+    """
+    url = '://'
+    host = environ.get('HTTP_X_FORWARDED_HOST', environ.get('HTTP_HOST'))
+    port = None
+    if ':' in host:
+        host, port = host.split(':', 1)
+    else:
+        host = environ.get('HTTP_X_FORWARDED_HOST', environ.get('HTTP_HOST'))
+        port = environ.get('HTTP_X_FORWARDED_PORT', environ.get('SERVER_PORT'))
+
+        # This is not a good way of determining the request scheme because
+        # the request could be proxied from an HTTPS server to an HTTP server
+        # if environ['wsgi.url_scheme'] == 'https':
+        #     if port == '443':
+        #         port = None
+        # elif environ['wsgi.url_scheme'] == 'http':
+        #     if port == '80':
+        #         port = None
+    url += host
+    if port:
+        if port == '443':
+            url = 'https'+url
+        elif port == '80':
+            url = 'http'+url
+        else:
+            url += 'https'+url+':%s' % port
+    else:
+        url = 'http'+url
+    if script_name is None:
+        url += urllib.quote(environ.get('SCRIPT_NAME',''))
+    else:
+        url += urllib.quote(script_name)
+    if with_path_info:
+        if path_info is None:
+            url += urllib.quote(environ.get('PATH_INFO',''))
+        else:
+            url += urllib.quote(path_info)
+    if with_query_string:
+        if querystring is None:
+            if environ.get('QUERY_STRING'):
+                url += '?' + environ['QUERY_STRING']
+        elif querystring:
+            url += '?' + querystring
+    return url
+
+
+
-def load_form_config(
-    app,