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

U 优化SSH类库

pull/517/head
vapao 2022-07-04 23:05:54 +08:00
parent 65d22703ec
commit 4787f051a6
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
spug_api/libs/ssh.py
View File

@ -3,23 +3,51 @@
# Released under the AGPL-3.0 License. # Released under the AGPL-3.0 License.
from paramiko.client import SSHClient, AutoAddPolicy from paramiko.client import SSHClient, AutoAddPolicy
from paramiko.rsakey import RSAKey from paramiko.rsakey import RSAKey
from paramiko.transport import Transport from paramiko.auth_handler import AuthHandler
from paramiko.ssh_exception import AuthenticationException from paramiko.ssh_exception import AuthenticationException, SSHException
from paramiko.py3compat import b, u
from io import StringIO from io import StringIO
from uuid import uuid4 from uuid import uuid4
import time import time
import re import re
Transport._preferred_pubkeys = (
"ssh-ed25519", def _finalize_pubkey_algorithm(self, key_type):
"ecdsa-sha2-nistp256", if "rsa" not in key_type:
"ecdsa-sha2-nistp384", return key_type
"ecdsa-sha2-nistp521", if re.search(r"-OpenSSH_(?:[1-6]|7\.[0-7])", self.transport.remote_version):
"ssh-rsa", pubkey_algo = "ssh-rsa"
"rsa-sha2-256", if key_type.endswith("-cert-v01@openssh.com"):
"rsa-sha2-512", pubkey_algo += "-cert-v01@openssh.com"
"ssh-dss",
) self.transport._agreed_pubkey_algorithm = pubkey_algo
return pubkey_algo
my_algos = [x for x in self.transport.preferred_pubkeys if "rsa" in x]
if not my_algos:
raise SSHException(
"An RSA key was specified, but no RSA pubkey algorithms are configured!" # noqa
)
server_algo_str = u(
self.transport.server_extensions.get("server-sig-algs", b(""))
)
if server_algo_str:
server_algos = server_algo_str.split(",")
agreement = list(filter(server_algos.__contains__, my_algos))
if agreement:
pubkey_algo = agreement[0]
else:
err = "Unable to agree on a pubkey algorithm for signing a {!r} key!" # noqa
raise AuthenticationException(err.format(key_type))
else:
pubkey_algo = my_algos[0]
msg = "Server did not send a server-sig-algs list; defaulting to our first preferred algo ({!r})" # noqa
if key_type.endswith("-cert-v01@openssh.com"):
pubkey_algo += "-cert-v01@openssh.com"
self.transport._agreed_pubkey_algorithm = pubkey_algo
return pubkey_algo
AuthHandler._finalize_pubkey_algorithm = _finalize_pubkey_algorithm
class SSH: class SSH:
@ -126,9 +154,9 @@ class SSH:
yield exit_code, line yield exit_code, line
yield exit_code, line yield exit_code, line
def put_file(self, local_path, remote_path): def put_file(self, local_path, remote_path, callback=None):
sftp = self._get_sftp() sftp = self._get_sftp()
sftp.put(local_path, remote_path, confirm=False) sftp.put(local_path, remote_path, callback=callback, confirm=False)
def put_file_by_fl(self, fl, remote_path, callback=None): def put_file_by_fl(self, fl, remote_path, callback=None):
sftp = self._get_sftp() sftp = self._get_sftp()