From d6527e3b02e2b9df77be36eaeff3b67f98b061a6 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 8 Jun 2021 20:50:15 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AF=86=E7=A0=81=20(#6247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: 优化 xrdp setting * perf: 优化支持记录密码 Co-authored-by: ibuler --- apps/jumpserver/conf.py | 1 + apps/jumpserver/settings/custom.py | 1 + apps/settings/api/common.py | 1 + apps/settings/serializers/settings.py | 1 + 4 files changed, 4 insertions(+) diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index 89b790929..81188eb8a 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -259,6 +259,7 @@ class Config(dict): 'SECURITY_INSECURE_COMMAND': False, 'SECURITY_INSECURE_COMMAND_LEVEL': 5, 'SECURITY_INSECURE_COMMAND_EMAIL_RECEIVER': '', + 'SECURITY_LUNA_REMEMBER_AUTH': True, 'HTTP_BIND_HOST': '0.0.0.0', 'HTTP_LISTEN_PORT': 8080, diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index ae965d343..c60c53788 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -127,3 +127,4 @@ GLOBAL_ORG_DISPLAY_NAME = CONFIG.GLOBAL_ORG_DISPLAY_NAME HEALTH_CHECK_TOKEN = CONFIG.HEALTH_CHECK_TOKEN TERMINAL_RDP_ADDR = CONFIG.TERMINAL_RDP_ADDR +SECURITY_LUNA_REMEMBER_AUTH = CONFIG.SECURITY_LUNA_REMEMBER_AUTH diff --git a/apps/settings/api/common.py b/apps/settings/api/common.py index bb3107dfd..03c885d78 100644 --- a/apps/settings/api/common.py +++ b/apps/settings/api/common.py @@ -115,6 +115,7 @@ class PublicSettingApi(generics.RetrieveAPIView): "OLD_PASSWORD_HISTORY_LIMIT_COUNT": settings.OLD_PASSWORD_HISTORY_LIMIT_COUNT, "SECURITY_COMMAND_EXECUTION": settings.SECURITY_COMMAND_EXECUTION, "SECURITY_PASSWORD_EXPIRATION_TIME": settings.SECURITY_PASSWORD_EXPIRATION_TIME, + "SECURITY_LUNA_REMEMBER_AUTH": settings.SECURITY_LUNA_REMEMBER_AUTH, "XPACK_LICENSE_IS_VALID": has_valid_xpack_license(), "LOGIN_TITLE": self.get_login_title(), "LOGO_URLS": self.get_logo_urls(), diff --git a/apps/settings/serializers/settings.py b/apps/settings/serializers/settings.py index 99bdc8c09..f2e11c17f 100644 --- a/apps/settings/serializers/settings.py +++ b/apps/settings/serializers/settings.py @@ -137,6 +137,7 @@ class TerminalSettingSerializer(serializers.Serializer): TERMINAL_RDP_ADDR = serializers.CharField( required=False, label=_("RDP address"), max_length=1024, + allow_blank=True, help_text=_('RDP visit address, eg: dev.jumpserver.org:3389') )