From 6955a3db11eb703b51b75eff43d6c78849ad587f Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Fri, 15 Dec 2023 17:10:51 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20ldap=E6=B5=8B=E8=AF=95=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96&=E4=B8=8A?= =?UTF-8?q?=E4=BA=A7=E6=96=87=E4=BB=B6=E5=90=8D=E9=95=BF=E5=BA=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/serializers/job.py | 2 +- apps/settings/utils/ldap.py | 2 +- apps/settings/ws.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/ops/serializers/job.py b/apps/ops/serializers/job.py index 3bb91d463..6e95a1fb9 100644 --- a/apps/ops/serializers/job.py +++ b/apps/ops/serializers/job.py @@ -52,7 +52,7 @@ class JobSerializer(ResourceLabelsMixin, BulkOrgResourceModelSerializer, PeriodT class FileSerializer(serializers.Serializer): - files = serializers.FileField(allow_empty_file=True) + files = serializers.FileField(allow_empty_file=False, max_length=128) class Meta: ref_name = "JobFileSerializer" diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py index 60babfa4e..23b7b3882 100644 --- a/apps/settings/utils/ldap.py +++ b/apps/settings/utils/ldap.py @@ -649,7 +649,7 @@ class LDAPTestUtil(object): def _test_before_login_check(self, username, password): from settings.ws import CACHE_KEY_LDAP_TEST_CONFIG_TASK_STATUS, TASK_STATUS_IS_OVER - if cache.get(CACHE_KEY_LDAP_TEST_CONFIG_TASK_STATUS) != TASK_STATUS_IS_OVER: + if not cache.get(CACHE_KEY_LDAP_TEST_CONFIG_TASK_STATUS): raise self.LDAPBeforeLoginCheckError(_('Please test the connection first')) backend = LDAPAuthorizationBackend() diff --git a/apps/settings/ws.py b/apps/settings/ws.py index 38bc54af0..0f8f344fe 100644 --- a/apps/settings/ws.py +++ b/apps/settings/ws.py @@ -161,8 +161,8 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer): return cache.get(task_key) == TASK_STATUS_IS_OVER @staticmethod - def set_task_status_over(task_key): - cache.set(task_key, TASK_STATUS_IS_OVER, 120) + def set_task_status_over(task_key, ttl=120): + cache.set(task_key, TASK_STATUS_IS_OVER, ttl) @staticmethod def set_task_msg(task_key, ok, msg): @@ -192,7 +192,7 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer): username = serializer.validated_data['username'] password = serializer.validated_data['password'] ok, msg = LDAPTestUtil().test_login(username, password) - self.set_task_status_over(CACHE_KEY_LDAP_TEST_LOGIN_TASK_STATUS) + self.set_task_status_over(CACHE_KEY_LDAP_TEST_LOGIN_TASK_STATUS, 3) self.set_task_msg(CACHE_KEY_LDAP_TEST_LOGIN_MSG, ok, msg) def run_sync_user(self, data):