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):