Fixes in tasks

This commit is contained in:
Antonio de la Rosa 2025-05-14 01:13:31 +02:00
parent ec52e45969
commit 6cd4598708
4 changed files with 50 additions and 54 deletions

View file

@ -126,12 +126,15 @@ class Task:
add_host=False
"""
rsa=None
if self.private_key!='':
try:
rsa=paramiko.RSAKey.from_private_key_file(self.private_key, self.password_key)
except paramiko.ssh_exception.SSHException:
rsa=paramiko.Ed25519Key.from_private_key_file(self.private_key, self.password_key)
"""
if check_ssh_host.lookup(self.server)==None:
@ -153,7 +156,9 @@ class Task:
try:
self.ssh.connect(self.server, port=self.port, username=self.remote_user, password=self.remote_password, pkey=rsa, key_filename=None, timeout=None, allow_agent=True, look_for_keys=True, compress=False, sock=None, gss_auth=False, gss_kex=False, gss_deleg_creds=True, gss_host=None, banner_timeout=None)
#self.ssh.connect(self.server, port=self.port, username=self.remote_user, password=self.remote_password, pkey=rsa, key_filename=None, timeout=None, allow_agent=True, look_for_keys=True, compress=False, sock=None, gss_auth=False, gss_kex=False, gss_deleg_creds=True, gss_host=None, banner_timeout=None)
self.ssh.connect(self.server, port=self.port, username=self.remote_user, password=self.remote_password, key_filename=self.private_key, passphrase=self.password_key, timeout=None, allow_agent=False, look_for_keys=False, compress=False, sock=None, gss_auth=False, gss_kex=False, gss_deleg_creds=True, gss_host=None, banner_timeout=None)
if add_host:
host_key.save(self.config.ssh_directory+'/known_hosts')