Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

Dockerfile

@@ -9,7 +9,7 @@ COPY ./requirements /tmp/requirements
 RUN yum -y install epel-release && \
       echo -e "[mysql]\nname=mysql\nbaseurl=https://mirrors.tuna.tsinghua.edu.cn/mysql/yum/mysql57-community-el6/\ngpgcheck=0\nenabled=1" > /etc/yum.repos.d/mysql.repo
 RUN cd /tmp/requirements && yum -y install $(cat rpm_requirements.txt)
-RUN cd /tmp/requirements && pip install --upgrade pip setuptools && \
+RUN cd /tmp/requirements && pip install --upgrade pip setuptools && pip install wheel && \
     pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt || pip install -r requirements.txt
 RUN mkdir -p /root/.ssh/ && echo -e "Host *\n\tStrictHostKeyChecking no\n\tUserKnownHostsFile /dev/null" > /root/.ssh/config
 

apps/settings/utils/ldap.py

@@ -21,10 +21,6 @@ __all__ = [
 LDAP_USE_CACHE_FLAGS = [1, '1', 'true', 'True', True]
 
 
-class LDAPOUGroupException(Exception):
-    pass
-
-
 class LDAPConfig(object):
 
     def __init__(self, config=None):
@@ -93,8 +89,12 @@ class LDAPServerUtil(object):
     def paged_cookie(self):
         if self._paged_size is 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):
         extra = ''
@@ -119,14 +119,11 @@ class LDAPServerUtil(object):
     def search_user_entries_ou(self, search_ou, paged_cookie=None):
         search_filter = self.get_search_filter()
         attributes = list(self.config.attr_map.values())
-        ok = self.connection.search(
+        self.connection.search(
             search_base=search_ou, search_filter=search_filter,
             attributes=attributes, paged_size=self._paged_size,
             paged_cookie=paged_cookie
         )
-        if not ok:
-            error = _("Search no entry matched in ou {}".format(search_ou))
-            raise LDAPOUGroupException(error)
 
     @timeit
     def search_user_entries(self):

apps/users/api/user.py

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

apps/users/views/login.py

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