github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v6.2.0.0 

Changelog: https://roxy-wi.org/changelog#6_2_0
pull/343/head
Pavel Loginov 2022-09-25 22:58:32 +03:00
parent 0371f730b1
commit 385a56c774
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/create_db.py
View File

@ -3,6 +3,7 @@ import distro
from modules.db_model import * from modules.db_model import *
from funct import check_ver
def default_values(): def default_values():
if distro.id() == 'ubuntu': if distro.id() == 'ubuntu':
@ -655,6 +656,13 @@ def default_values():
except Exception as e: except Exception as e:
print(str(e)) print(str(e))
# Needs for insert version in first time
def update_db_v_3_4_5_22():
try:
Version.insert(version='3.4.5.2').execute()
except Exception as e:
print('Cannot insert version %s' % e)
# Needs for updating user_group. Do not delete # Needs for updating user_group. Do not delete
def update_db_v_4_3_0(): def update_db_v_4_3_0():
@ -955,6 +963,8 @@ def update_ver():
def update_all(): def update_all():
if check_ver() is None:
update_db_v_3_4_5_22()
update_db_v_4_3_0() update_db_v_4_3_0()
update_db_v_5_2_4() update_db_v_5_2_4()
update_db_v_5_2_4_1() update_db_v_5_2_4_1()

25
app/modules/ssh_connection.py
View File

@ -1,6 +1,7 @@
import paramiko import paramiko
from paramiko import SSHClient from paramiko import SSHClient
class SshConnection: class SshConnection:
def __init__(self, server_ip, ssh_port, ssh_user_name, ssh_user_password, ssh_enable, ssh_key_name=None): def __init__(self, server_ip, ssh_port, ssh_user_name, ssh_user_password, ssh_enable, ssh_key_name=None):
self.ssh = SSHClient() self.ssh = SSHClient()
@ -13,16 +14,26 @@ class SshConnection:
self.ssh_enable = ssh_enable self.ssh_enable = ssh_enable
self.ssh_key_name = ssh_key_name self.ssh_key_name = ssh_key_name
def __enter__(self): def __enter__(self):
try: try:
if self.ssh_enable == 1: if self.ssh_enable == 1:
k = paramiko.pkey.load_private_key_file(self.ssh_key_name) k = paramiko.pkey.load_private_key_file(self.ssh_key_name)
self.ssh.connect(hostname=self.server_ip, port=self.ssh_port, username=self.ssh_user_name, pkey=k, self.ssh.connect(
timeout=11, banner_timeout=200) hostname=self.server_ip,
port=self.ssh_port,
username=self.ssh_user_name, pkey=k,
timeout=11,
banner_timeout=200
)
else: else:
self.ssh.connect(hostname=self.server_ip, port=self.ssh_port, username=self.ssh_user_name, self.ssh.connect(
password=self.ssh_user_password, timeout=11, banner_timeout=200) hostname=self.server_ip,
port=self.ssh_port,
username=self.ssh_user_name,
password=self.ssh_user_password,
timeout=11,
banner_timeout=200
)
except paramiko.AuthenticationException: except paramiko.AuthenticationException:
raise paramiko.SSHException('error: Authentication failed, please verify your credentials') raise paramiko.SSHException('error: Authentication failed, please verify your credentials')
except paramiko.SSHException as sshException: except paramiko.SSHException as sshException:
@ -40,11 +51,9 @@ class SshConnection:
raise paramiko.SSHException(str(e)) raise paramiko.SSHException(str(e))
return self return self
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self.ssh.close() self.ssh.close()
def run_command(self, command): def run_command(self, command):
try: try:
stdin, stdout, stderr = self.ssh.exec_command(command, get_pty=True) stdin, stdout, stderr = self.ssh.exec_command(command, get_pty=True)
@ -53,7 +62,6 @@ class SshConnection:
return stdin, stdout, stderr return stdin, stdout, stderr
def get_sftp(self, config_path, cfg): def get_sftp(self, config_path, cfg):
try: try:
sftp = self.ssh.open_sftp() sftp = self.ssh.open_sftp()
@ -71,7 +79,6 @@ class SshConnection:
except Exception as e: except Exception as e:
raise paramiko.SSHException(str(e)) raise paramiko.SSHException(str(e))
def put_sftp(self, file, full_path): def put_sftp(self, file, full_path):
try: try:
sftp = self.ssh.open_sftp() sftp = self.ssh.open_sftp()