From eedc1ae8b50258444e052a1efccd5924bdc248e7 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 2 Mar 2023 19:05:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/accounts/models/base.py | 2 +- apps/assets/automations/base/manager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/accounts/models/base.py b/apps/accounts/models/base.py index 26ebcd89a..e4bd780ac 100644 --- a/apps/accounts/models/base.py +++ b/apps/accounts/models/base.py @@ -123,7 +123,7 @@ class BaseAccount(JMSOrgBaseModel): # It does not require this for old-style PEM keys. with open(key_path, 'w') as f: f.write(self.secret) - if is_openssh_format_key(self.secret): + if is_openssh_format_key(self.secret.encode('utf-8')): f.write("\n") os.chmod(key_path, 0o400) return key_path diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index e9cfb84e3..6660d6e84 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -132,7 +132,7 @@ class BasePlaybookManager: # It does not require this for old-style PEM keys. with open(key_path, 'w') as f: f.write(secret) - if is_openssh_format_key(secret): + if is_openssh_format_key(secret.encode('utf-8')): f.write("\n") os.chmod(key_path, 0o400) return key_path