fix: 修复自动生成公钥优先使用dss格式的问题(默认优先使用rsa)

2021-05-13 19:08:35 +08:00 · 2021-05-13 19:08:35 +08:00 · 0ecd9fa32a
parent b37c8b09bf
commit 0ecd9fa32a
1 changed files with 5 additions and 0 deletions
--- 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