github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-18 00:08:31 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 优化LDAPUtil逻辑 (#2728)

Browse Source
This commit is contained in:
BaiJiangJie
2019-05-24 11:11:50 +08:00
committed by 老广
parent b791073802
commit 217bb81722
5 changed files with 105 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/authentication/backends/ldap.py
View File

@@ -7,6 +7,8 @@ from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django_auth_ldap.backend import _LDAPUser, LDAPBackend
from django_auth_ldap.config import _LDAPConfig, LDAPSearch, LDAPSearchUnion
from users.utils import construct_user_email
logger = _LDAPConfig.get_logger()
@@ -95,14 +97,9 @@ class LDAPUser(_LDAPUser):
if not hasattr(self._user, field):
continue
if isinstance(getattr(self._user, field), bool):
value = bool(int(value == 'true'))
value = value.lower() in ['true', '1']
setattr(self._user, field, value)
if not hasattr(self._user, 'email') or '@' not in self._user.email:
if '@' not in self._user.username:
email = '{}@{}'.format(self._user.username, settings.EMAIL_SUFFIX)
else:
email = self._user.username
setattr(self._user, 'email', email)
email = getattr(self._user, 'email', '')
email = construct_user_email(email, self._user.username)
setattr(self._user, 'email', email)