debian/0000775000000000000000000000000012303057564007175 5ustar debian/copyright0000664000000000000000000000636512207711035011133 0ustar Format: http://dep.debian.net/deps/dep5 Upstream-Name: python-django-openstack-auth Source: https://github.com/gabrielhurley/django_openstack_auth.git Files: * Copyright: 2012 Gabriel Hurley License: BSD 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. * Neither the name of the author nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission. . 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. Files: debian/* Copyright: 2012 Canonical Ltd License: BSD 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. * Neither the name of the author nor the names of other contributors may be used to endorse or promote products derived from this software without specific prior written permission. . 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. . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/BSD". debian/compat0000664000000000000000000000000212207711035010364 0ustar 8 debian/watch0000664000000000000000000000015412207711035010217 0ustar version=3 http://pypi.python.org/packages/source/d/django_openstack_auth/django_openstack_auth-(.*)\.tar.gz debian/source/0000775000000000000000000000000012207711313010465 5ustar debian/source/format0000664000000000000000000000001412207711035011674 0ustar 3.0 (quilt) debian/patches/0000775000000000000000000000000012303056707010622 5ustar debian/patches/series0000664000000000000000000000005612303056701012032 0ustar django-1.6.compat django-1.4-1.6-compat.patch debian/patches/django-1.4-1.6-compat.patch0000664000000000000000000000540512303056707015174 0ustar From 40b654e6eeb49045d6b08dfc887e6ba9b604533a Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 25 Nov 2013 15:54:22 +0100 Subject: [PATCH] Support Django 1.4, 1.5 and 1.6 The default session serializer switched to JSONSerializer in Django-1.6. Unfortunately, it can't serialize arbitrary objects (such as datetime instances), there we have to stay with PickleSerializer (compare with https://docs.djangoproject.com/en/1.6/topics/http/sessions/#write-your-own-serializer). Sets Django==1.4 for the py27dj14 tox testenv. Don't relax the version requirements just yet. Change-Id: Ifb5a68950fa6a4a652a0fb0cb81048d89763ec3f --- openstack_auth/tests/settings.py | 3 +++ openstack_auth/tests/urls.py | 2 +- openstack_auth/views.py | 9 ++++++++- tox.ini | 6 ++++++ 4 files changed, 18 insertions(+), 2 deletions(-) --- a/openstack_auth/tests/settings.py +++ b/openstack_auth/tests/settings.py @@ -48,3 +48,6 @@ USE_TZ = True OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'domain' + +# NOTE(saschpe): The openstack_auth.user.Token object isn't JSON-serializable ATM +SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' --- a/openstack_auth/tests/urls.py +++ b/openstack_auth/tests/urls.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls import patterns, include, url from django.views.generic import TemplateView from openstack_auth.utils import patch_middleware_get_user --- a/openstack_auth/views.py +++ b/openstack_auth/views.py @@ -13,6 +13,7 @@ import logging +import django from django import shortcuts from django.conf import settings from django.contrib.auth import REDIRECT_FIELD_NAME @@ -55,7 +56,13 @@ def login(request): initial.update({'region': requested_region}) if request.method == "POST": - form = curry(Login, request) + # NOTE(saschpe): Since https://code.djangoproject.com/ticket/15198, + # the 'request' object is passed directly to AuthenticationForm in + # django.contrib.auth.views#login: + if django.VERSION >= (1, 6): + form = curry(Login) + else: + form = curry(Login, request) else: form = curry(Login, initial=initial) --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,12 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python openstack_auth/tests/run_tests.py +[testenv:py27dj14] +deps = pbr>=0.5.21,<1.0 + Django==1.4 + python-keystoneclient>=0.3.2 + -r{toxinidir}/test-requirements.txt + [testenv:pep8] commands = flake8 debian/patches/django-1.6.compat0000664000000000000000000000144712303056427013600 0ustar From b04693387be08c1ead880d0e7472026ed76dad80 Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Thu, 21 Nov 2013 11:30:14 +0100 Subject: [PATCH] Fix django.conf.urls.defaults imports These imports aren't available in Django 1.6. We need to use django.conf.urls instead. Partially-implements blueprint django-1point6 Change-Id: I8b5d315cbcb7bfba98e9f11e256b5aaa6bff4fd0 --- openstack_auth/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/openstack_auth/urls.py +++ b/openstack_auth/urls.py @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from .utils import patch_middleware_get_user debian/rules0000775000000000000000000000034712240476625010264 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 %: dh $@ --with python2 get-orig-source: uscan --verbose --force-download --rename --repack --download-current-version --destdir=../build-area debian/docs0000664000000000000000000000001312207711035010033 0ustar README.rst debian/changelog0000664000000000000000000000452212303057564011052 0ustar python-django-openstack-auth (1.1.3-0ubuntu3) trusty; urgency=medium * Fix compatibility with Django 1.6 (LP: #1284533): - d/p/django-1.6-compat.patch, d/p/django-1.4-1.6-compat.patch: Cherry picked fixes from upstream VCS for compatibility with Django 1.4 -> 1.6. -- James Page Tue, 25 Feb 2014 09:16:35 +0000 python-django-openstack-auth (1.1.3-0ubuntu2) trusty; urgency=medium * Rebuild to drop files installed into /usr/share/pyshared. -- Matthias Klose Sun, 23 Feb 2014 13:51:19 +0000 python-django-openstack-auth (1.1.3-0ubuntu1) trusty; urgency=low * New upstream release. * debian/control: Added python-pbr, python-oslo.sphinx, python-babel, and python-coverage as build dependencies. -- Chuck Short Tue, 12 Nov 2013 13:30:31 -0500 python-django-openstack-auth (1.1.1-0ubuntu1) saucy; urgency=low * New upstream release. -- Adam Gandelman Thu, 29 Aug 2013 11:28:08 -0700 python-django-openstack-auth (1.0.7-0ubuntu1) raring; urgency=low * New upstream bugfix release (LP: #1155871). -- James Page Thu, 21 Mar 2013 09:19:00 +0000 python-django-openstack-auth (1.0.1-0ubuntu6) quantal; urgency=low * debian/control: Take possible backprots into account. -- Chuck Short Thu, 23 Aug 2012 07:47:45 -0500 python-django-openstack-auth (1.0.1-0ubuntu5) quantal; urgency=low * debian/control: rename binary to python-openstack-auth. -- Chuck Short Mon, 20 Aug 2012 20:09:26 -0500 python-django-openstack-auth (1.0.1-0ubuntu4) quantal; urgency=low * debian/control: Change Architecture: from any to all, as we do not require a per arch package. -- Dave Walker (Daviey) Fri, 17 Aug 2012 15:22:26 +0100 python-django-openstack-auth (1.0.1-0ubuntu3) quantal; urgency=low * Fix lintian warnings. (LP: #1031479) -- Chuck Short Wed, 08 Aug 2012 07:22:18 -0500 python-django-openstack-auth (1.0.1-0ubuntu2) quantal; urgency=low * Re-license the package to sync up with the source. -- Chuck Short Wed, 01 Aug 2012 07:24:57 -0500 python-django-openstack-auth (1.0.1-0ubuntu1) quantal; urgency=low * Initial release. -- Chuck Short Thu, 26 Jul 2012 07:25:40 -0500 debian/control0000664000000000000000000000151212240476637010605 0ustar Source: python-django-openstack-auth Section: python Priority: optional Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 8.0.0), python-setuptools, python-all (>= 2.6.6-3~), python-mox, python-django, python-keystoneclient, python-pbr, python-oslo.sphinx, python-sphinx, python-coverage, python-babel Standards-Version: 3.9.4 Homepage: http://pypi.python.org/pypi/django_openstack_auth Package: python-openstack-auth Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python-keystoneclient, python-django Conflicts: python-django-openstack-auth ( << 1.0.1-0ubuntu4~ ) Replaces: python-django-openstack-auth ( << 1.0.1-0ubuntu4~ ) Description: A django authentication backend for Openstack Django authentication backend for use with the OpenStack Keystone Identity backend.