Merge lp:~statik/ubuntu/lucid/python-django-openid-auth/new-upstream-version into lp:ubuntu/lucid/python-django-openid-auth

[Elliot Murphy]

[Elliot Murphy (statik)]

updating to the new upstream release, converting from CDBS to dh7, switching from python-central to python-support, converting to sourcepackage 3.0 (quilt).

Builds and installs ok, confirmed that the upgrade from 0.1 to 0.2 doesn't seem to leave any python-central garbage behind.

[Elliot Murphy (statik)]

Daniel, I added you as a reviewer only because I know you were anxious to get this new version.

[lp:~statik/ubuntu/lucid/python-django-openid-auth/new-upstream-version]

4. By Elliot Murphy on 2010-02-05

Drop Provides:

[Daniel Holbach (dholbach)]

Great work!

review: Approve

=== modified file 'PKG-INFO'
--- PKG-INFO	2009-04-08 15:07:49 +0000
+++ PKG-INFO	2010-02-05 06:33:16 +0000
@@ -1,12 +1,12 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: django-openid-auth
-Version: 0.1
+Version: 0.2
 Summary: OpenID integration for django.contrib.auth
 Home-page: https://launchpad.net/django-openid-auth
 Author: Canonical Ltd
 Author-email: UNKNOWN
 License: BSD
-Download-URL: https://launchpad.net/django-openid-auth/+download
+Download-URL: http://launchpad.net/django-openid-auth/trunk/0.2/+download/django-openid-auth-0.2.tar.gz
 Description: A library that can be used to add OpenID support to Django applications.
         The library integrates with Django's built in authentication system, so
         most applications require minimal changes to support OpenID llogin. The
@@ -26,3 +26,6 @@
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires: django (>=1.0)
+Requires: openid (>=2.2.0)
+Provides: django_openid_auth
 
=== modified file 'README.txt'
--- README.txt	2009-04-08 15:07:49 +0000
+++ README.txt	2010-02-05 06:33:16 +0000
@@ -8,7 +8,14 @@
 
 == Basic Installation ==
 
- 1. Add 'django_auth_openid' to INSTALLED_APPS for your application.
+ 1. Install the Jan Rain Python OpenID library.  It can be found at:
+
+        http://openidenabled.com/python-openid/
+
+    It can also be found in most Linux distributions packaged as
+    "python-openid".  You will need version 2.2.0 or later.
+
+ 2. Add 'django_openid_auth' to INSTALLED_APPS for your application.
     At a minimum, you'll need the following in there:
 
         INSTALLED_APPS = (
@@ -18,7 +25,7 @@
             'django_openid_auth',
         )
 
- 2. Add 'django_auth_openid.auth.OpenIDBackend' to
+ 3. Add 'django_auth_openid.auth.OpenIDBackend' to
     AUTHENTICATION_BACKENDS.  This should be in addition to the
     default ModelBackend:
 
@@ -27,17 +34,17 @@
             'django.contrib.auth.backends.ModelBackend',
         )
 
- 3. To create users automatically when a new OpenID is used, add the
+ 4. To create users automatically when a new OpenID is used, add the
     following to the settings:
 
         OPENID_CREATE_USERS = True
 
- 4. To have user details updated from OpenID Simple Registration data
+ 5. To have user details updated from OpenID Simple Registration data
     each time they log in, add the following:
 
         OPENID_UPDATE_DETAILS_FROM_SREG = True
 
- 5. Hook up the login URLs to your application's urlconf with
+ 6. Hook up the login URLs to your application's urlconf with
     something like:
 
         urlpatterns = patterns('',
@@ -46,16 +53,16 @@
             ...
         )
 
- 6. Configure the LOGIN_URL and LOGIN_REDIRECT_URL appropriately for
+ 7. Configure the LOGIN_URL and LOGIN_REDIRECT_URL appropriately for
     your site:
 
-        LOGIN_URL = '/openid/login'
+        LOGIN_URL = '/openid/login/'
         LOGIN_REDIRECT_URL = '/'
 
     This will allow pages that use the standard @login_required
     decorator to use the OpenID login page.
 
- 7. Rerun "python manage.py syncdb" to add the UserOpenID table to
+ 8. Rerun "python manage.py syncdb" to add the UserOpenID table to
     your database.
 
 
@@ -90,3 +97,30 @@
 
 When a user logs in, they will be added or removed from the relevant
 teams listed in the mapping.
+
+If you have already django-groups and want to map these groups automatically, you can use the OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO variable in your settings.py file.
+
+	OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
+
+If you use OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO, the variable OPENID_LAUNCHPAD_TEAMS_MAPPING will be ignored.
+If you want to exclude some groups from the auto mapping, use OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST. This variable has only an effect if OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO is True.
+
+	OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST = ['django-group1', 'django-group2']
+	
+== External redirect domains ==
+
+By default, redirecting back to an external URL after auth is forbidden. To permit redirection to external URLs on a separate domain, define ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS in your settings.py file as a list of permitted domains:
+
+	ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = ['example.com', 'example.org']
+
+and redirects to external URLs on those domains will additionally be permitted.
+
+== Use as /admin (django.admin.contrib) login ==
+
+If you require openid authentication into the admin application, add the following setting:
+
+        OPENID_USE_AS_ADMIN_LOGIN = True
+
+It is worth noting that a user needs to be be marked as a "staff user" to be able to access the admin interface.  A new openid user will not normally be a "staff user".  
+The easiest way to resolve this is to use traditional authentication (OPENID_USE_AS_ADMIN_LOGIN = False) to sign in as your first user with a password and authorise your 
+openid user to be staff.
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-04-08 15:07:49 +0000
+++ debian/changelog	2010-02-05 06:33:16 +0000
@@ -1,3 +1,13 @@
+python-django-openid-auth (0.2-0ubuntu1) lucid; urgency=low
+
+  * New upstream release. (LP: #517400)
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Switch to dh 7 from CDBS
+  * Switch from pycentral to pysupport
+  * Bump standards version to 3.8.3
+
+ -- Elliot Murphy <[e-mail]>  Fri, 05 Feb 2010 00:01:53 -0500
+
 python-django-openid-auth (0.1-0ubuntu1) karmic; urgency=low
 
   * Initial release. (LP: #359304)
 
=== modified file 'debian/compat'
--- debian/compat	2009-04-08 15:07:49 +0000
+++ debian/compat	2010-02-05 06:33:16 +0000
@@ -1,1 +1,1 @@
-6
+7
 
=== modified file 'debian/control'
--- debian/control	2009-04-08 15:07:49 +0000
+++ debian/control	2010-02-05 06:33:16 +0000
@@ -1,26 +1,23 @@
 Source: python-django-openid-auth
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
-XSBC-Original-Maintainer: Elliot Murphy <[e-mail]>
+XSBC-Original-Maintainer: Elliot Murphy <[e-mail]>
 Section: python
 Priority: optional
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Build-Depends-Indep:
-    python-central (>= 0.6.7)
+    python-support (>= 0.6.4)
 Build-Depends:
-    cdbs (>= 0.4.51),
-    debhelper (>= 6.0.4),
+    debhelper (>= 7.0.50),
     python (>= 2.5)
 XS-Python-Version: all
 Homepage: https://launchpad.net/django-openid-auth
 
 Package: python-django-openid-auth
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends},
     ${misc:Depends},
     python-openid,
     python-django
-Provides: ${python:Provides}
 Description: OpenID integration for django.contrib.auth
  A library that can be used to add OpenID support to Django applications.
  The library integrates with Django's builtin authentication system, so
 
=== removed file 'debian/pycompat'
--- debian/pycompat	2009-04-08 15:07:49 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== modified file 'debian/rules'
--- debian/rules	2009-04-08 15:07:49 +0000
+++ debian/rules	2010-02-05 06:33:16 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_PYTHON_SYSTEM = pycentral
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+	dh --buildsystem=python_distutils $@
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-02-05 06:33:16 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'django_openid_auth/__init__.py'
--- django_openid_auth/__init__.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/__init__.py	2010-02-05 06:33:16 +0000
@@ -26,3 +26,4 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+
 
=== modified file 'django_openid_auth/admin.py'
--- django_openid_auth/admin.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/admin.py	2010-02-05 06:33:16 +0000
@@ -1,6 +1,7 @@
 # django-openid-auth -  OpenID integration for django.contrib.auth
 #
 # Copyright (C) 2008-2009 Canonical Ltd.
+# Copyright (C) 2010 Dave Walker
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -26,6 +27,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from django.conf import settings
 from django.contrib import admin
 from django_openid_auth.models import Nonce, Association, UserOpenID
 from django_openid_auth.store import DjangoOpenIDStore
@@ -64,3 +66,25 @@
     search_fields = ('claimed_id',)
 
 admin.site.register(UserOpenID, UserOpenIDAdmin)
+
+
+# Support for allowing openid authentication for /admin (django.contrib.admin)
+if getattr(settings, 'OPENID_USE_AS_ADMIN_LOGIN', False):
+    from django.http import HttpResponseRedirect
+    from django_openid_auth import views
+
+    def _openid_login(self, request, error_message='', extra_context=None):
+        if request.user.is_authenticated():
+            if not request.user.is_staff:
+                return views.render_failure(
+                    request, "User %s does not have admin access."
+                    % request.user.username)
+            return views.render_failure(
+                request, "Unknown Error: %s" % error_message)
+        else:
+            # Redirect to openid login path,
+            return HttpResponseRedirect(
+                settings.LOGIN_URL + "?next=" + request.get_full_path())
+
+    # Overide the standard admin login form.
+    admin.sites.AdminSite.display_login_form = _openid_login
 
=== modified file 'django_openid_auth/auth.py'
--- django_openid_auth/auth.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/auth.py	2010-02-05 06:33:16 +0000
@@ -158,7 +158,16 @@
         user.save()
 
     def update_groups_from_teams(self, user, teams_response):
+        teams_mapping_auto = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO', False)
+        teams_mapping_auto_blacklist = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST', [])
         teams_mapping = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
+        if teams_mapping_auto:
+            #ignore teams_mapping. use all django-groups
+            teams_mapping = dict()
+            all_groups = Group.objects.exclude(name__in=teams_mapping_auto_blacklist)
+            for group in all_groups:
+                teams_mapping[group.name] = group.name
+
         if len(teams_mapping) == 0:
             return
 
 
=== modified file 'django_openid_auth/forms.py'
--- django_openid_auth/forms.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/forms.py	2010-02-05 06:33:16 +0000
@@ -28,12 +28,48 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from django import forms
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.forms import UserChangeForm
+from django.contrib.auth.models import Group
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
 from openid.yadis import xri
 
 
+def teams_new_unicode(self):
+    """
+    Replacement for Group.__unicode__()
+    Calls original method to chain results
+    """
+    name = self.unicode_before_teams()
+    teams_mapping = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
+    group_teams = [t for t in teams_mapping if teams_mapping[t] == self.name]
+    if len(group_teams) > 0:
+        return "%s -> %s" % (name, ", ".join(group_teams))
+    else:
+        return name
+Group.unicode_before_teams = Group.__unicode__
+Group.__unicode__ = teams_new_unicode
+
+
+class UserChangeFormWithTeamRestriction(UserChangeForm):
+    """
+    Extends UserChangeForm to add teams awareness to the user admin form
+    """
+    def clean_groups(self):
+        data = self.cleaned_data['groups']
+        teams_mapping = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
+        known_teams = teams_mapping.values()
+        user_groups = self.instance.groups.all()
+        for group in data:
+            if group.name in known_teams and group not in user_groups:
+                raise forms.ValidationError("""The group %s is mapped to an
+                    external team.  You cannot assign it manually.""" % group.name)
+        return data
+UserAdmin.form = UserChangeFormWithTeamRestriction
+
+
 class OpenIDLoginForm(forms.Form):
     openid_identifier = forms.CharField(
         max_length=255,
 
=== modified file 'django_openid_auth/management/__init__.py'
--- django_openid_auth/management/__init__.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/management/__init__.py	2010-02-05 06:33:16 +0000
@@ -0,0 +1,27 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
 
=== modified file 'django_openid_auth/management/commands/__init__.py'
--- django_openid_auth/management/commands/__init__.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/management/commands/__init__.py	2010-02-05 06:33:16 +0000
@@ -0,0 +1,27 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
 
=== modified file 'django_openid_auth/management/commands/openid_cleanup.py'
--- django_openid_auth/management/commands/openid_cleanup.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/management/commands/openid_cleanup.py	2010-02-05 06:33:16 +0000
@@ -1,3 +1,31 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 from django.core.management.base import NoArgsCommand
 
 from django_openid_auth.store import DjangoOpenIDStore
 
=== modified file 'django_openid_auth/store.py'
--- django_openid_auth/store.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/store.py	2010-02-05 06:33:16 +0000
@@ -42,13 +42,22 @@
         self.max_nonce_age = 6 * 60 * 60 # Six hours
 
     def storeAssociation(self, server_url, association):
-        assoc = Association(
-            server_url=server_url,
-            handle=association.handle,
-            secret=base64.encodestring(association.secret),
-            issued=association.issued,
-            lifetime=association.lifetime,
-            assoc_type=association.assoc_type)
+        try:
+            assoc = Association.objects.get(
+                server_url=server_url, handle=association.handle)
+        except Association.DoesNotExist:
+            assoc = Association(
+                server_url=server_url,
+                handle=association.handle,
+                secret=base64.encodestring(association.secret),
+                issued=association.issued,
+                lifetime=association.lifetime,
+                assoc_type=association.assoc_type)
+        else:
+            assoc.secret = base64.encodestring(association.secret)
+            assoc.issued = association.issued
+            assoc.lifetime = association.lifetime
+            assoc.assoc_type = association.assoc_type
         assoc.save()
 
     def getAssociation(self, server_url, handle=None):
 
=== modified file 'django_openid_auth/templates/openid/login.html'
--- django_openid_auth/templates/openid/login.html	2009-04-08 15:07:49 +0000
+++ django_openid_auth/templates/openid/login.html	2010-02-05 06:33:16 +0000
@@ -28,8 +28,10 @@
 <form name="fopenid" action="{{ action }}" method="post">
 	<fieldset>
 		<legend>{% trans "Sign In Using Your OpenID" %}</legend>
-        <div class="form-row"><label for="id_openid_identifier">{%
-        trans "OpenID:" %}</label><br />{{ form.openid_identifier }}</div>
+        <div class="form-row">
+            <label for="id_openid_identifier">{% trans "OpenID:" %}</label><br />
+            {{ form.openid_identifier }}
+        </div>
         <div class="submit-row "><input name="bsignin" type="submit" value="{% trans "Sign in" %}"></div>
 
  {% if next %}
 
=== modified file 'django_openid_auth/tests/__init__.py'
--- django_openid_auth/tests/__init__.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/tests/__init__.py	2010-02-05 06:33:16 +0000
@@ -1,3 +1,31 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 import unittest
 
 
 
=== modified file 'django_openid_auth/tests/test_store.py'
--- django_openid_auth/tests/test_store.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/tests/test_store.py	2010-02-05 06:33:16 +0000
@@ -1,3 +1,31 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 import time
 import unittest
 
@@ -28,6 +56,20 @@
         self.assertEquals(dbassoc.lifetime, 600)
         self.assertEquals(dbassoc.assoc_type, 'HMAC-SHA1')
 
+    def test_storeAssociation_update_existing(self):
+        assoc = OIDAssociation('handle', 'secret', 42, 600, 'HMAC-SHA1')
+        self.store.storeAssociation('server-url', assoc)
+
+        # Now update the association with new information.
+        assoc = OIDAssociation('handle', 'secret2', 420, 900, 'HMAC-SHA256')
+        self.store.storeAssociation('server-url', assoc)
+        dbassoc = Association.objects.get(
+            server_url='server-url', handle='handle')
+        self.assertEqual(dbassoc.secret, 'secret2'.encode('base-64'))
+        self.assertEqual(dbassoc.issued, 420)
+        self.assertEqual(dbassoc.lifetime, 900)
+        self.assertEqual(dbassoc.assoc_type, 'HMAC-SHA256')
+
     def test_getAssociation(self):
         timestamp = int(time.time())
         self.store.storeAssociation(
@@ -76,9 +118,6 @@
         self.assertEquals(assoc.issued, timestamp + 1)
 
     def test_removeAssociation(self):
-        self.assertEquals(
-            self.store.removeAssociation('server-url', 'unknown'), False)
-
         timestamp = int(time.time())
         self.store.storeAssociation(
             'server-url', OIDAssociation('handle', 'secret', timestamp, 600,
@@ -88,6 +127,10 @@
         self.assertEquals(
             self.store.getAssociation('server-url', 'handle'), None)
 
+    def test_removeAssociation_unknown(self):
+        self.assertEquals(
+            self.store.removeAssociation('server-url', 'unknown'), False)
+
     def test_useNonce(self):
         timestamp = time.time()
         # The nonce can only be used once.
 
=== modified file 'django_openid_auth/tests/test_views.py'
--- django_openid_auth/tests/test_views.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/tests/test_views.py	2010-02-05 06:33:16 +0000
@@ -1,3 +1,31 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 import cgi
 import re
 import time
@@ -15,6 +43,7 @@
 
 from django_openid_auth import teams
 from django_openid_auth.models import UserOpenID
+from django_openid_auth.views import sanitise_redirect_url
 
 
 ET = importElementTree()
@@ -97,21 +126,26 @@
         self.provider = StubOpenIDProvider('http://example.com/')
         setDefaultFetcher(self.provider, wrap_exceptions=False)
 
+        self.old_login_redirect_url = getattr(settings, 'LOGIN_REDIRECT_URL', '/accounts/profile/')
         self.old_create_users = getattr(settings, 'OPENID_CREATE_USERS', False)
         self.old_update_details = getattr(settings, 'OPENID_UPDATE_DETAILS_FROM_SREG', False)
         self.old_sso_server_url = getattr(settings, 'OPENID_SSO_SERVER_URL')
         self.old_teams_map = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
+        self.old_use_as_admin_login = getattr(settings, 'OPENID_USE_AS_ADMIN_LOGIN', False)
 
         settings.OPENID_CREATE_USERS = False
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = False
         settings.OPENID_SSO_SERVER_URL = None
         settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {}
+        settings.OPENID_USE_AS_ADMIN_LOGIN = False
 
     def tearDown(self):
+        settings.LOGIN_REDIRECT_URL = self.old_login_redirect_url
         settings.OPENID_CREATE_USERS = self.old_create_users
         settings.OPENID_UPDATE_DETAILS_FROM_SREG = self.old_update_details
         settings.OPENID_SSO_SERVER_URL = self.old_sso_server_url
         settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = self.old_teams_map
+        settings.OPENID_USE_AS_ADMIN_LOGIN = self.old_use_as_admin_login
 
         setDefaultFetcher(None)
         super(RelyingPartyTests, self).tearDown()
@@ -122,8 +156,8 @@
         self.assertEquals(webresponse.code, 302)
         redirect_to = webresponse.headers['location']
         self.assertTrue(redirect_to.startswith(
-                'http://testserver/openid/complete'))
-        return self.client.get('/openid/complete',
+                'http://testserver/openid/complete/'))
+        return self.client.get('/openid/complete/',
             dict(cgi.parse_qsl(redirect_to.split('?', 1)[1])))
 
     def test_login(self):
@@ -135,29 +169,54 @@
         useropenid.save()
 
         # The login form is displayed:
-        response = self.client.get('/openid/login')
+        response = self.client.get('/openid/login/')
         self.assertTemplateUsed(response, 'openid/login.html')
 
         # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login',
+        response = self.client.post('/openid/login/',
             {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser'})
+             'next': '/getuser/'})
         self.assertContains(response, 'OpenID transaction in progress')
 
         openid_request = self.provider.parseFormPost(response.content)
         self.assertEquals(openid_request.mode, 'checkid_setup')
         self.assertTrue(openid_request.return_to.startswith(
-                'http://testserver/openid/complete'))
+                'http://testserver/openid/complete/'))
 
         # Complete the request.  The user is redirected to the next URL.
         openid_response = openid_request.answer(True)
         response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser')
+        self.assertRedirects(response, 'http://testserver/getuser/')
 
         # And they are now logged in:
-        response = self.client.get('/getuser')
+        response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'someuser')
 
+    def test_login_no_next(self):
+        """Logins with no next parameter redirect to LOGIN_REDIRECT_URL."""
+        user = User.objects.create_user('someuser', '[e-mail]')
+        useropenid = UserOpenID(
+            user=user,
+            claimed_id='http://example.com/identity',
+            display_id='http://example.com/identity')
+        useropenid.save()
+
+        settings.LOGIN_REDIRECT_URL = '/getuser/'
+        response = self.client.post('/openid/login/',
+            {'openid_identifier': 'http://example.com/identity'})
+        self.assertContains(response, 'OpenID transaction in progress')
+
+        openid_request = self.provider.parseFormPost(response.content)
+        self.assertEquals(openid_request.mode, 'checkid_setup')
+        self.assertTrue(openid_request.return_to.startswith(
+                'http://testserver/openid/complete/'))
+
+        # Complete the request.  The user is redirected to the next URL.
+        openid_response = openid_request.answer(True)
+        response = self.complete(openid_response)
+        self.assertRedirects(
+            response, 'http://testserver' + settings.LOGIN_REDIRECT_URL)
+
     def test_login_sso(self):
         settings.OPENID_SSO_SERVER_URL = 'http://example.com/identity'
         user = User.objects.create_user('someuser', '[e-mail]')
@@ -169,22 +228,22 @@
 
         # Requesting the login form immediately begins an
         # authentication request.
-        response = self.client.get('/openid/login', {'next': '/getuser'})
+        response = self.client.get('/openid/login/', {'next': '/getuser/'})
         self.assertEquals(response.status_code, 200)
         self.assertContains(response, 'OpenID transaction in progress')
 
         openid_request = self.provider.parseFormPost(response.content)
         self.assertEquals(openid_request.mode, 'checkid_setup')
         self.assertTrue(openid_request.return_to.startswith(
-                'http://testserver/openid/complete'))
+                'http://testserver/openid/complete/'))
 
         # Complete the request.  The user is redirected to the next URL.
         openid_response = openid_request.answer(True)
         response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser')
+        self.assertRedirects(response, 'http://testserver/getuser/')
 
         # And they are now logged in:
-        response = self.client.get('/getuser')
+        response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'someuser')
 
     def test_login_create_users(self):
@@ -193,9 +252,9 @@
         User.objects.create_user('someuser', '[e-mail]')
 
         # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login',
+        response = self.client.post('/openid/login/',
             {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser'})
+             'next': '/getuser/'})
         self.assertContains(response, 'OpenID transaction in progress')
 
         # Complete the request, passing back some simple registration
@@ -208,11 +267,11 @@
                            'email': '[e-mail]'})
         openid_response.addExtension(sreg_response)
         response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser')
+        self.assertRedirects(response, 'http://testserver/getuser/')
 
         # And they are now logged in as a new user (they haven't taken
         # over the existing "someuser" user).
-        response = self.client.get('/getuser')
+        response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'someuser2')
 
         # Check the details of the new user.
@@ -231,9 +290,9 @@
         useropenid.save()
 
         # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login',
+        response = self.client.post('/openid/login/',
             {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser'})
+             'next': '/getuser/'})
         self.assertContains(response, 'OpenID transaction in progress')
 
         # Complete the request, passing back some simple registration
@@ -246,11 +305,11 @@
                            'email': '[e-mail]'})
         openid_response.addExtension(sreg_response)
         response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser')
+        self.assertRedirects(response, 'http://testserver/getuser/')
 
         # And they are now logged in as testuser (the passed in
         # nickname has not caused the username to change).
-        response = self.client.get('/getuser')
+        response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'testuser')
 
         # The user's full name and email have been updated.
@@ -276,9 +335,9 @@
         useropenid.save()
 
         # Posting in an identity URL begins the authentication request:
-        response = self.client.post('/openid/login',
+        response = self.client.post('/openid/login/',
             {'openid_identifier': 'http://example.com/identity',
-             'next': '/getuser'})
+             'next': '/getuser/'})
         self.assertContains(response, 'OpenID transaction in progress')
 
         # Complete the request
@@ -289,10 +348,10 @@
             teams_request, 'teamname,some-other-team')
         openid_response.addExtension(teams_response)
         response = self.complete(openid_response)
-        self.assertRedirects(response, 'http://testserver/getuser')
+        self.assertRedirects(response, 'http://testserver/getuser/')
 
         # And they are now logged in as testuser
-        response = self.client.get('/getuser')
+        response = self.client.get('/getuser/')
         self.assertEquals(response.content, 'testuser')
 
         # The user's groups have been updated.
@@ -300,6 +359,65 @@
         self.assertTrue(group in user.groups.all())
         self.assertTrue(ogroup not in user.groups.all())
 
-
+    def test_login_teams_automapping(self):
+        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING = {'teamname': 'groupname',
+                                                   'otherteam': 'othergroup'}
+        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
+        settings.OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST = ['django-group1', 'django-group2']
+        user = User.objects.create_user('testuser', '[e-mail]')
+        group1 = Group(name='django-group1')
+        group1.save()
+        group2 = Group(name='django-group2')
+        group2.save()
+        group3 = Group(name='django-group3')
+        group3.save()
+        user.save()
+        useropenid = UserOpenID(
+            user=user,
+            claimed_id='http://example.com/identity',
+            display_id='http://example.com/identity')
+        useropenid.save()
+
+        # Posting in an identity URL begins the authentication request:
+        response = self.client.post('/openid/login/',
+            {'openid_identifier': 'http://example.com/identity',
+             'next': '/getuser/'})
+        self.assertContains(response, 'OpenID transaction in progress')
+
+        # Complete the request
+        openid_request = self.provider.parseFormPost(response.content)
+        openid_response = openid_request.answer(True)
+        teams_request = teams.TeamsRequest.fromOpenIDRequest(openid_request)
+        
+        self.assertEqual(group1 in user.groups.all(), False)
+        self.assertEqual(group2 in user.groups.all(), False)
+        self.assertTrue(group3 not in user.groups.all())
+
+class HelperFunctionsTest(TestCase):
+    def test_sanitise_redirect_url(self):
+        settings.ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = [
+            "example.com", "example.org"]
+        # list of URLs and whether they should be passed or not
+        urls = [
+            ("http://example.com", True),
+            ("http://example.org/", True),
+            ("http://example.org/foo/bar", True),
+            ("http://example.org/foo/bar?baz=quux", True),
+            ("http://example.org:9999/foo/bar?baz=quux", True),
+            ("http://www.example.org/", False),
+            ("http://example.net/foo/bar?baz=quux", False),
+            ("/somewhere/local", True),
+            ("/somewhere/local?url=http://fail.com/bar", True),
+            # An empty path, as seen when no "next" parameter is passed.
+            ("", False),
+            ("/path with spaces", False),
+        ]
+        for url, returns_self in urls:
+            sanitised = sanitise_redirect_url(url)
+            if returns_self:
+                self.assertEqual(url, sanitised)
+            else:
+                self.assertEqual(settings.LOGIN_REDIRECT_URL, sanitised)
+        
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'django_openid_auth/tests/urls.py'
--- django_openid_auth/tests/urls.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/tests/urls.py	2010-02-05 06:33:16 +0000
@@ -1,3 +1,31 @@
+# django-openid-auth -  OpenID integration for django.contrib.auth
+#
+# Copyright (C) 2009 Canonical Ltd.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 from django.http import HttpResponse
 from django.conf.urls.defaults import *
 
@@ -6,6 +34,6 @@
     return HttpResponse(request.user.username)
 
 urlpatterns = patterns('',
-    (r'^getuser', get_user),
+    (r'^getuser/$', get_user),
     (r'^openid/', include('django_openid_auth.urls')),
 )
 
=== modified file 'django_openid_auth/urls.py'
--- django_openid_auth/urls.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/urls.py	2010-02-05 06:33:16 +0000
@@ -30,7 +30,7 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('django_openid_auth.views',
-    (r'^login$', 'login_begin'),
-    (r'^complete$', 'login_complete'),
-    url(r'^logo$', 'logo', name='openid-logo'),
+    (r'^login/$', 'login_begin'),
+    (r'^complete/$', 'login_complete'),
+    url(r'^logo.gif$', 'logo', name='openid-logo'),
 )
 
=== modified file 'django_openid_auth/views.py'
--- django_openid_auth/views.py	2009-04-08 15:07:49 +0000
+++ django_openid_auth/views.py	2010-02-05 06:33:16 +0000
@@ -29,10 +29,12 @@
 
 import re
 import urllib
+from urlparse import urlsplit
 
 from django.conf import settings
 from django.contrib.auth import (
     REDIRECT_FIELD_NAME, authenticate, login as auth_login)
+from django.contrib.auth.models import Group
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
@@ -62,8 +64,26 @@
 def sanitise_redirect_url(redirect_to):
     """Sanitise the redirection URL."""
     # Light security check -- make sure redirect_to isn't garbage.
-    if not redirect_to or '//' in redirect_to or ' ' in redirect_to:
+    is_valid = True
+    if not redirect_to or ' ' in redirect_to:
+        is_valid = False
+    elif '//' in redirect_to:
+        # Allow the redirect URL to be external if it's a permitted domain
+        allowed_domains = getattr(settings, 
+            "ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS", [])
+        s, netloc, p, q, f = urlsplit(redirect_to)
+        # allow it if netloc is blank or if the domain is allowed
+        if netloc:
+            # a domain was specified. Is it an allowed domain?
+            if netloc.find(":") != -1:
+                netloc, _ = netloc.split(":", 1)
+            if netloc not in allowed_domains:
+                is_valid = False
+
+    # If the return_to URL is not valid, use the default.
+    if not is_valid:
         redirect_to = settings.LOGIN_REDIRECT_URL
+
     return redirect_to
 
 
@@ -148,7 +168,16 @@
         sreg.SRegRequest(optional=['email', 'fullname', 'nickname']))
 
     # Request team info
+    teams_mapping_auto = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO', False)
+    teams_mapping_auto_blacklist = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO_BLACKLIST', [])
     launchpad_teams = getattr(settings, 'OPENID_LAUNCHPAD_TEAMS_MAPPING', {})
+    if teams_mapping_auto:
+        #ignore launchpad teams. use all django-groups
+        launchpad_teams = dict()
+        all_groups = Group.objects.exclude(name__in=teams_mapping_auto_blacklist)
+        for group in all_groups:
+            launchpad_teams[group.name] = group.name
+
     if launchpad_teams:
         openid_request.addExtension(teams.TeamsRequest(launchpad_teams.keys()))
 
 
=== modified file 'example_consumer/settings.py'
--- example_consumer/settings.py	2009-04-08 15:07:49 +0000
+++ example_consumer/settings.py	2010-02-05 06:33:16 +0000
@@ -125,5 +125,8 @@
 OPENID_SSO_SERVER_URL = 'https://login.launchpad.net/'
 
 # Tell django.contrib.auth to use the OpenID signin URLs.
-LOGIN_URL = '/openid/login'
+LOGIN_URL = '/openid/login/'
 LOGIN_REDIRECT_URL = '/'
+
+# Should django_auth_openid be used to sign into the admin interface?
+OPENID_USE_AS_ADMIN_LOGIN = False
 
=== modified file 'example_consumer/urls.py'
--- example_consumer/urls.py	2009-04-08 15:07:49 +0000
+++ example_consumer/urls.py	2010-02-05 06:33:16 +0000
@@ -38,7 +38,7 @@
 urlpatterns = patterns('',
     (r'^$', views.index),
     (r'^openid/', include('django_openid_auth.urls')),
-    (r'^logout$', 'django.contrib.auth.views.logout'),
+    (r'^logout/$', 'django.contrib.auth.views.logout'),
     (r'^private/$', views.require_authentication),
 
     (r'^admin/(.*)', admin.site.root),
 
=== modified file 'setup.py'
--- setup.py	2009-04-08 15:07:49 +0000
+++ setup.py	2010-02-05 06:33:16 +0000
@@ -43,17 +43,19 @@
 
 
 description, long_description = __doc__.split('\n\n', 1)
+VERSION = '0.2'
 
 setup(
     name='django-openid-auth',
-    version='0.1',
+    version=VERSION,
     author='Canonical Ltd',
     description=description,
     long_description=long_description,
     license='BSD',
     platforms=['any'],
     url='https://launchpad.net/django-openid-auth',
-    download_url='https://launchpad.net/django-openid-auth/+download',
+    download_url=('http://launchpad.net/django-openid-auth/trunk/%s/+download'
+                  '/django-openid-auth-%s.tar.gz' % (VERSION, VERSION)),
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
@@ -73,4 +75,6 @@
     package_data={
         'django_openid_auth': ['templates/openid/*.html'],
         },
+    provides=['django_openid_auth'],
+    requires=['django (>=1.0)', 'openid (>=2.2.0)'],
     )