github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-24 14:02:01 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改一些拼写

Browse Source
This commit is contained in:
ibuler 2022-12-02 19:56:13 +08:00
parent a70f85e346
commit fbea1f3480
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import os
import re import re
import time import time
from io import StringIO from io import StringIO
import logging
import paramiko import paramiko
import sshpubkeys import sshpubkeys
@ -74,13 +75,13 @@ _supported_paramiko_ssh_key_types = (paramiko.RSAKey, paramiko.DSSKey, paramiko.
def ssh_key_string_to_obj(text, password=None): def ssh_key_string_to_obj(text, password=None):
key = None key = None
for ssh_key_type in _supported_paramiko_ssh_key_types: for ssh_key_type in _supported_paramiko_ssh_key_types:
if not isinstance(ssh_key_type, paramiko.PKey):
continue
try: try:
key = ssh_key_type.from_private_key(StringIO(text), password=password) key = ssh_key_type.from_private_key(StringIO(text), password=password)
return key return key
except paramiko.SSHException: except paramiko.SSHException:
pass pass
if key is None:
raise ValueError('Invalid private key')
return key return key
@ -152,9 +153,11 @@ def parse_ssh_private_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 ""
private_key_bytes = private_key.private_bytes(serialization.Encoding.PEM, private_key_bytes = private_key.private_bytes(
serialization.Encoding.PEM,
serialization.PrivateFormat.OpenSSH, serialization.PrivateFormat.OpenSSH,
serialization.NoEncryption()) serialization.NoEncryption()
)
return private_key_bytes.decode('utf-8') return private_key_bytes.decode('utf-8')
@ -193,6 +196,7 @@ def _parse_ssh_private_key(text, password=None):
private_key = serialization.load_ssh_private_key(text, password=password) private_key = serialization.load_ssh_private_key(text, password=password)
return private_key return private_key
except (ValueError, TypeError): except (ValueError, TypeError):
logging.error("Invalid private key")
pass pass
return None return None