github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/6105/head
Bai 2021-05-13 19:08:35 +08:00 committed by Jiangjie.Bai
parent b37c8b09bf
commit 0ecd9fa32a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/common/utils/encode.py
View File

@ -75,11 +75,16 @@ def ssh_key_string_to_obj(text, password=None):
key = paramiko.RSAKey.from_private_key(StringIO(text), password=password) key = paramiko.RSAKey.from_private_key(StringIO(text), password=password)
except paramiko.SSHException: except paramiko.SSHException:
pass pass
else:
return key
try: try:
key = paramiko.DSSKey.from_private_key(StringIO(text), password=password) key = paramiko.DSSKey.from_private_key(StringIO(text), password=password)
except paramiko.SSHException: except paramiko.SSHException:
pass pass
else:
return key
return key return key