From 9a18817dbba38ea7b204a8ea99dff1ce2869b287 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 3 Sep 2018 19:40:06 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Drdp=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=88=90=E5=8A=9F=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/assets/forms/user.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/assets/forms/user.py b/apps/assets/forms/user.py index b25e19d87..de669bce3 100644 --- a/apps/assets/forms/user.py +++ b/apps/assets/forms/user.py @@ -98,15 +98,18 @@ class SystemUserForm(PasswordAndKeyAuthForm): auto_generate_key = self.cleaned_data.get('auto_generate_key', False) private_key, public_key = super().gen_keys() - if login_mode == SystemUser.MANUAL_LOGIN or protocol == SystemUser.TELNET_PROTOCOL: + if login_mode == SystemUser.MANUAL_LOGIN or \ + protocol in [SystemUser.RDP_PROTOCOL, SystemUser.TELNET_PROTOCOL]: system_user.auto_push = 0 + auto_generate_key = False system_user.save() if auto_generate_key: logger.info('Auto generate key and set system user auth') system_user.auto_gen_auth() else: - system_user.set_auth(password=password, private_key=private_key, public_key=public_key) + system_user.set_auth(password=password, private_key=private_key, + public_key=public_key) return system_user