External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-18 21:21:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2291 from rooftopcellist/revert_radius_110

Browse Source 
Revert Django-radius to 1.1.0
This commit is contained in:
Christian Adams 2018-06-25 08:59:36 -04:00 committed by GitHub
commit 39c0ed4ad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/sso/backends.py
View File

@ -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:

2
requirements/requirements.in
View File

@ -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

5
requirements/requirements.txt
View File

@ -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