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

pref: 暂时修改 key fingerprint

pull/9154/head
ibuler 2022-12-02 20:06:56 +08:00
parent fbea1f3480
commit 052a4afef6
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,8 @@ class BaseAccount(JMSOrgBaseModel):
@property @property
def ssh_key_fingerprint(self): def ssh_key_fingerprint(self):
# Todo: 等待修复
return '等待修复'
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:

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

@ -165,8 +165,10 @@ def parse_ssh_public_key_str(text: bytes = "", password=None) -> str:
private_key = _parse_ssh_private_key(text, password=password) private_key = _parse_ssh_private_key(text, password=password)
if private_key is None: if private_key is None:
return "" return ""
public_key_bytes = private_key.public_key().public_bytes(serialization.Encoding.OpenSSH, public_key_bytes = private_key.public_key().public_bytes(
serialization.PublicFormat.OpenSSH) serialization.Encoding.OpenSSH,
serialization.PublicFormat.OpenSSH,
)
return public_key_bytes.decode('utf-8') return public_key_bytes.decode('utf-8')
@ -185,12 +187,11 @@ def _parse_ssh_private_key(text, password=None):
text = text.encode("utf-8") text = text.encode("utf-8")
except UnicodeDecodeError: except UnicodeDecodeError:
return None return None
if password is not None: if isinstance(password, str):
if isinstance(password, str): try:
try: password = password.encode("utf-8")
password = password.encode("utf-8") except UnicodeDecodeError:
except UnicodeDecodeError: return None
return None
try: try:
private_key = serialization.load_ssh_private_key(text, password=password) private_key = serialization.load_ssh_private_key(text, password=password)