From 0ecd9fa32a1d5ad08b4698df201e8b6d65cc25da Mon Sep 17 00:00:00 2001 From: Bai Date: Thu, 13 May 2021 19:08:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=85=AC=E9=92=A5=E4=BC=98=E5=85=88=E4=BD=BF?= =?UTF-8?q?=E7=94=A8dss=E6=A0=BC=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98(?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8rsa)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/utils/encode.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/common/utils/encode.py b/apps/common/utils/encode.py index cd130e7fe..dc68c9ba8 100644 --- a/apps/common/utils/encode.py +++ b/apps/common/utils/encode.py @@ -75,11 +75,16 @@ def ssh_key_string_to_obj(text, password=None): key = paramiko.RSAKey.from_private_key(StringIO(text), password=password) except paramiko.SSHException: pass + else: + return key try: key = paramiko.DSSKey.from_private_key(StringIO(text), password=password) except paramiko.SSHException: pass + else: + return key + return key