github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Update ldap auth

v0.4
ibuler 2017-10-10 14:18:08 +08:00
parent 8bccaa6ee2
commit 0db8482873
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/utils.py
View File

@ -8,7 +8,7 @@ import uuid
from paramiko.rsakey import RSAKey from paramiko.rsakey import RSAKey
from django.conf import settings from django.conf import settings
from django.contrib.auth.mixins import UserPassesTestMixin from django.contrib.auth.mixins import UserPassesTestMixin
from django.urls import reverse_lazy from django.contrib.auth import authenticate
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.core.cache import cache from django.core.cache import cache
@ -140,7 +140,7 @@ def check_user_valid(**kwargs):
elif not user.is_valid: elif not user.is_valid:
return None, _('Disabled or expired') return None, _('Disabled or expired')
if password and user.password and user.check_password(password): if password and authenticate(username=username, password=password):
return user, '' return user, ''
if public_key and user.public_key: if public_key and user.public_key: