From 8cc77234fcaccda5ff448c0070d29ec1ca4fe3a1 Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Fri, 22 Jun 2018 15:01:11 -0400 Subject: [PATCH] revert django-radius from 1.3.3 to 1.1.0 --- awx/sso/backends.py | 4 ++-- requirements/requirements.in | 2 +- requirements/requirements.txt | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/awx/sso/backends.py b/awx/sso/backends.py index d4a2cc2280..1385f81db2 100644 --- a/awx/sso/backends.py +++ b/awx/sso/backends.py @@ -182,13 +182,13 @@ class RADIUSBackend(BaseRADIUSBackend): Custom Radius backend to verify license status ''' - def authenticate(self, request, username, password): + def authenticate(self, username, password): if not django_settings.RADIUS_SERVER: return None if not feature_enabled('enterprise_auth'): logger.error("Unable to authenticate, license does not support RADIUS authentication") return None - return super(RADIUSBackend, self).authenticate(request, username, password) + return super(RADIUSBackend, self).authenticate(username, password) def get_user(self, user_id): if not django_settings.RADIUS_SERVER: diff --git a/requirements/requirements.in b/requirements/requirements.in index 994c75adfe..c73b5d84c5 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -19,7 +19,7 @@ django-jsonfield==1.0.1 django-oauth-toolkit==1.1.2 django-polymorphic==2.0.2 django-pglocks==1.0.2 -django-radius==1.3.3 +django-radius==1.1.0 django-solo==1.1.3 django-split-settings==0.3.0 django-taggit==0.22.2 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 26efa3b99a..09e9648f98 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -117,7 +117,7 @@ django-jsonfield==1.0.1 django-oauth-toolkit==1.1.2 django-pglocks==1.0.2 django-polymorphic==2.0.2 -django-radius==1.3.3 +django-radius==1.1.0 django-solo==1.1.3 django-split-settings==0.3.0 django-taggit==0.22.2 @@ -127,7 +127,6 @@ djangorestframework==3.7.7 dogpile.cache==0.6.5 # via openstacksdk enum34==1.1.6 # via cryptography, msrest functools32==3.2.3.post2 # via jsonschema -future==0.16.0 # via django-radius futures==3.2.0 # via azure-cosmosdb-table, azure-datalake-store, azure-storage-blob, azure-storage-file, openstacksdk, requests-futures, s3transfer hyperlink==18.0.0 # via twisted idna==2.6 # via cryptography, hyperlink, requests @@ -183,7 +182,7 @@ pygerduty==0.37.0 pyjwt==1.6.0 # via adal, social-auth-core, twilio pyopenssl==17.5.0 pyparsing==2.2.0 -pyrad==2.1 # via django-radius +pyrad==1.2 # via django-radius python-dateutil==2.7.2 python-ldap==2.5.2 # via django-auth-ldap python-logstash==0.4.6