upgrade python-django-openstack-auth to CentOS 7.6 version
[Patch 2/3] update to version 3.6.1-1 Story: 2004522 Task: 28420 Depends-On: https://review.openstack.org/#/c/627764/ Change-Id: I296dcf5bac411ecb9dc26de2bbee0d3b316f9874 Signed-off-by: SidneyAn <ran1.an@intel.com>
This commit is contained in:
parent
bb402ac03d
commit
ef3688ed8d
|
@ -14,7 +14,7 @@ index 7ac6008..fd06bbc 100644
|
|||
@@ -7,7 +7,7 @@
|
||||
|
||||
Name: python-django-openstack-auth
|
||||
Version: 3.5.0
|
||||
Version: 3.6.1
|
||||
-Release: 1%{?dist}
|
||||
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Django authentication backend for OpenStack Keystone
|
||||
|
|
|
@ -51,8 +51,8 @@ index 89acf21..5e9e8e0 100644
|
|||
+/wheels/*
|
||||
+
|
||||
%changelog
|
||||
* Mon Aug 21 2017 Alfredo Moralejo <amoralej@redhat.com> 3.5.0-1
|
||||
- Update to 3.5.0
|
||||
* Tue Jun 12 2018 RDO <dev@lists.rdoproject.org> 3.6.1-1
|
||||
- Update to 3.6.1
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ index c7d0c51..90e281b 100644
|
|||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -117,6 +116,7 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
@@ -118,6 +117,7 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
|
||||
@sensitive_variables()
|
||||
def clean(self):
|
||||
|
@ -63,7 +63,7 @@ index c7d0c51..90e281b 100644
|
|||
default_domain = getattr(settings,
|
||||
'OPENSTACK_KEYSTONE_DEFAULT_DOMAIN',
|
||||
'Default')
|
||||
@@ -130,6 +130,14 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
@@ -131,6 +131,14 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
return self.cleaned_data
|
||||
|
||||
try:
|
||||
|
@ -78,7 +78,7 @@ index c7d0c51..90e281b 100644
|
|||
self.user_cache = authenticate(request=self.request,
|
||||
username=username,
|
||||
password=password,
|
||||
@@ -141,14 +149,27 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
@@ -142,14 +150,27 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
'remote_ip': utils.get_client_ip(self.request)
|
||||
}
|
||||
LOG.info(msg)
|
||||
|
@ -86,10 +86,10 @@ index c7d0c51..90e281b 100644
|
|||
+ # since this user logged in successfully, clear its
|
||||
+ # lockout status
|
||||
+ utils.clear_user_lockout(username)
|
||||
+
|
||||
+
|
||||
+ # handle user login
|
||||
+ utils.handle_user_login(username, password)
|
||||
+
|
||||
+
|
||||
except exceptions.KeystoneAuthException as exc:
|
||||
- msg = 'Login failed for user "%(username)s", remote address '\
|
||||
- '%(remote_ip)s.' % {
|
||||
|
|
|
@ -24,7 +24,7 @@ diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py
|
|||
index 90e281b..4834ab2 100644
|
||||
--- a/openstack_auth/forms.py
|
||||
+++ b/openstack_auth/forms.py
|
||||
@@ -153,10 +153,10 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
@@ -154,10 +154,10 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
# since this user logged in successfully, clear its
|
||||
# lockout status
|
||||
utils.clear_user_lockout(username)
|
||||
|
|
|
@ -8,9 +8,9 @@ Subject: [PATCH 1/1] Horizon Distributed Cloud subcloud switching
|
|||
-Fixed tenant list not being displayed on login
|
||||
---
|
||||
openstack_auth/backend.py | 2 +-
|
||||
openstack_auth/forms.py | 14 +++++++++++++-
|
||||
openstack_auth/forms.py | 15 ++++++++++++++-
|
||||
openstack_auth/views.py | 21 ++++++++++++---------
|
||||
3 files changed, 26 insertions(+), 11 deletions(-)
|
||||
3 files changed, 27 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py
|
||||
index cd15ca8..4fa7129 100644
|
||||
|
@ -29,7 +29,7 @@ diff --git a/openstack_auth/forms.py b/openstack_auth/forms.py
|
|||
index 4834ab2..49b8d8b 100644
|
||||
--- a/openstack_auth/forms.py
|
||||
+++ b/openstack_auth/forms.py
|
||||
@@ -138,11 +138,24 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
@@ -139,11 +139,24 @@ class Login(django_auth_forms.AuthenticationForm):
|
||||
if lockedout:
|
||||
raise forms.ValidationError("user currently locked out.")
|
||||
|
||||
|
@ -59,7 +59,7 @@ diff --git a/openstack_auth/views.py b/openstack_auth/views.py
|
|||
index a680abf..0b1351d 100644
|
||||
--- a/openstack_auth/views.py
|
||||
+++ b/openstack_auth/views.py
|
||||
@@ -293,15 +293,17 @@ def switch_region(request, region_name,
|
||||
@@ -289,15 +289,17 @@ def switch_region(request, region_name,
|
||||
endpoint_dict = utils.get_internal_identity_endpoints(
|
||||
request.user.service_catalog, region_filter=region_name)
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
mirror:Source/python-django-openstack-auth-3.5.0-1.el7.src.rpm
|
||||
mirror:Source/python-django-openstack-auth-3.6.1-1.el7.src.rpm
|
||||
|
|
Loading…
Reference in New Issue