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

Merge branch 'dev' into user_detail_template

pull/3449/head
jym503558564 2019-11-25 15:55:44 +08:00
parent cc9554cdb4 3a812c2267
commit a92aec2775
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/settings/utils/ldap.py
View File

@ -21,10 +21,6 @@ __all__ = [
LDAP_USE_CACHE_FLAGS = [1, '1', 'true', 'True', True] LDAP_USE_CACHE_FLAGS = [1, '1', 'true', 'True', True]
class LDAPOUGroupException(Exception):
pass
class LDAPConfig(object): class LDAPConfig(object):
def __init__(self, config=None): def __init__(self, config=None):
@ -93,8 +89,12 @@ class LDAPServerUtil(object):
def paged_cookie(self): def paged_cookie(self):
if self._paged_size is None: if self._paged_size is None:
return None return None
cookie = self.connection.result['controls']['1.2.840.113556.1.4.319']['value']['cookie'] try:
return cookie cookie = self.connection.result['controls']['1.2.840.113556.1.4.319']['value']['cookie']
return cookie
except Exception as e:
logger.error(e)
return None
def get_search_filter_extra(self): def get_search_filter_extra(self):
extra = '' extra = ''
@ -119,14 +119,11 @@ class LDAPServerUtil(object):
def search_user_entries_ou(self, search_ou, paged_cookie=None): def search_user_entries_ou(self, search_ou, paged_cookie=None):
search_filter = self.get_search_filter() search_filter = self.get_search_filter()
attributes = list(self.config.attr_map.values()) attributes = list(self.config.attr_map.values())
ok = self.connection.search( self.connection.search(
search_base=search_ou, search_filter=search_filter, search_base=search_ou, search_filter=search_filter,
attributes=attributes, paged_size=self._paged_size, attributes=attributes, paged_size=self._paged_size,
paged_cookie=paged_cookie paged_cookie=paged_cookie
) )
if not ok:
error = _("Search no entry matched in ou {}".format(search_ou))
raise LDAPOUGroupException(error)
@timeit @timeit
def search_user_entries(self): def search_user_entries(self):

2
apps/users/api/user.py
View File

@ -119,7 +119,7 @@ class UserResetPKApi(UserQuerysetMixin, generics.UpdateAPIView):
def perform_update(self, serializer): def perform_update(self, serializer):
from ..utils import send_reset_ssh_key_mail from ..utils import send_reset_ssh_key_mail
user = self.get_object() user = self.get_object()
user.is_public_key_valid = False user.public_key = None
user.save() user.save()
send_reset_ssh_key_mail(user) send_reset_ssh_key_mail(user)

1
apps/users/views/login.py
View File

@ -142,7 +142,6 @@ class UserFirstLoginView(PermissionsMixin, SessionWizardView):
if field.value(): if field.value():
setattr(user, field.name, field.value()) setattr(user, field.name, field.value())
user.is_first_login = False user.is_first_login = False
user.is_public_key_valid = True
user.save() user.save()
context = { context = {
'user_guide_url': settings.USER_GUIDE_URL 'user_guide_url': settings.USER_GUIDE_URL