From 6951f4dd97666f15514564283651378f2d357b78 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 22 Nov 2019 12:25:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[Update]=20=E5=88=A0=E9=99=A4=20LDAP=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=8A=9B=E5=87=BA=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8=E7=B1=BB=EF=BC=88=20LDAPOU?= =?UTF-8?q?GroupException=EF=BC=89=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=A4=9A?= =?UTF-8?q?=E6=9C=89=20OU=20=E4=B8=8B=E5=AF=BC=E5=85=A5=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/utils/ldap.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index e5ad1c3e8..041467710 100644 --- a/apps/settings/utils/ldap.py +++ b/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): @@ -119,14 +115,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): From 9e322323f305abd1c33cb017000dac123820ecc2 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 22 Nov 2019 13:52:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[Update]=20LDAP=20=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20cookie=20=E5=8F=96=E5=80=BC=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BC=82=E5=B8=B8=E6=8D=95=E8=8E=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/settings/utils/ldap.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index 041467710..726c74c82 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -89,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'] - return cookie + try: + 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 = '' From f47781a330720efb7d2f026d4a324bc8e89fca2e Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 22 Nov 2019 16:48:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[Update]=20=E5=8F=91=E9=80=81=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E5=AF=86=E9=92=A5=E9=82=AE=E4=BB=B6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=94=A8=E6=88=B7=E5=85=AC=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/api/user.py | 2 +- apps/users/views/login.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/users/api/user.py b/apps/users/api/user.py index 2a033915c..4545f629b 100644 --- a/apps/users/api/user.py +++ b/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) diff --git a/apps/users/views/login.py b/apps/users/views/login.py index 046bc9415..3f0f88e8f 100644 --- a/apps/users/views/login.py +++ b/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 From 5bcd122de9fe7cbcc7acbf1e359748a2c977a98d Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Fri, 29 Nov 2019 19:13:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9Dockerfile?= =?UTF-8?q?=EF=BC=8C=E5=AE=89=E8=A3=85=20wheel=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbcbc3a00..a45e41a45 100644 --- a/Dockerfile +++ b/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