k3nny/TISbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment DSSKey and add ed25519

Browse Source
This commit is contained in:
Kévin Guérineau 2020-08-10 10:02:46 +02:00
parent ac3a3975e7
commit 68bc8caab6
6 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtisbackup/backup_mysql.py
View File

@ -60,7 +60,8 @@ class backup_mysql(backup_generic):
try: try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key) mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key) #mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())

3
libtisbackup/backup_oracle.py
View File

@ -49,7 +49,8 @@ class backup_oracle(backup_generic):
try: try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key) mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key) #mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())

3
libtisbackup/backup_pgsql.py
View File

@ -53,7 +53,8 @@ class backup_pgsql(backup_generic):
try: try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key) mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key) #mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
self.logger.debug('[%s] Trying to connect to "%s" with username root and key "%s"',self.backup_name,self.server_name,self.private_key) self.logger.debug('[%s] Trying to connect to "%s" with username root and key "%s"',self.backup_name,self.server_name,self.private_key)
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()

3
libtisbackup/backup_samba4.py
View File

@ -55,7 +55,8 @@ class backup_samba4(backup_generic):
try: try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key) mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key) #mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
self.ssh = paramiko.SSHClient() self.ssh = paramiko.SSHClient()
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())

3
libtisbackup/backup_sqlserver.py
View File

@ -55,7 +55,8 @@ class backup_sqlserver(backup_generic):
try: try:
mykey = paramiko.RSAKey.from_private_key_file(self.private_key) mykey = paramiko.RSAKey.from_private_key_file(self.private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(self.private_key) #mykey = paramiko.DSSKey.from_private_key_file(self.private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
self.logger.debug('[%s] Connecting to %s with user root and key %s',self.backup_name,self.server_name,self.private_key) self.logger.debug('[%s] Connecting to %s with user root and key %s',self.backup_name,self.server_name,self.private_key)
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()

3
libtisbackup/common.py
View File

@ -476,7 +476,8 @@ def ssh_exec(command,ssh=None,server_name='',remote_user='',private_key='',ssh_p
try: try:
mykey = paramiko.RSAKey.from_private_key_file(private_key) mykey = paramiko.RSAKey.from_private_key_file(private_key)
except paramiko.SSHException: except paramiko.SSHException:
mykey = paramiko.DSSKey.from_private_key_file(private_key) #mykey = paramiko.DSSKey.from_private_key_file(private_key)
mykey = paramiko.Ed25519Key.from_private_key_file(self.private_key)
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())