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

fix: 修复ssh-private-key错误导致系统用户列表加载出现500的问题

pull/6540/head
Bai 2021-07-23 18:28:41 +08:00 committed by 老广
parent 938255df6f
commit 160b238058
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/assets/models/base.py
View File

@ -67,7 +67,10 @@ class AuthMixin:
if self.public_key: if self.public_key:
public_key = self.public_key public_key = self.public_key
elif self.private_key: elif self.private_key:
public_key = ssh_pubkey_gen(private_key=self.private_key, password=self.password) try:
public_key = ssh_pubkey_gen(private_key=self.private_key, password=self.password)
except IOError as e:
return str(e)
else: else:
return '' return ''