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

v3.2.4

pull/42/head
Aidaho12 2018-09-03 14:07:12 +06:00
parent ca1d564294
commit 1d39d5de16
2 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/funct.py
View File

@ -172,54 +172,27 @@ def ssh_connect(serv, **kwargs):
ssh.connect(hostname = serv, port = ssh_port, username = ssh_user_name, pkey = k) ssh.connect(hostname = serv, port = ssh_port, username = ssh_user_name, pkey = k)
else: else:
ssh.connect(hostname = serv, port = ssh_port, username = ssh_user_name, password = ssh_user_password) ssh.connect(hostname = serv, port = ssh_port, username = ssh_user_name, password = ssh_user_password)
if kwargs.get('check'): return ssh
return True
else:
return ssh
except paramiko.AuthenticationException: except paramiko.AuthenticationException:
if kwargs.get('check'): return 'Authentication failed, please verify your credentials'
print('<div class="alert alert-danger">Authentication failed, please verify your credentials</div>') pass
return False
else:
return 'Authentication failed, please verify your credentials'
pass
except paramiko.SSHException as sshException: except paramiko.SSHException as sshException:
if kwargs.get('check'): return 'Unable to establish SSH connection: %s ' % sshException
print('<div class="alert alert-danger">Unable to establish SSH connection: %s </div>' % sshException) pass
return False
else:
return 'Unable to establish SSH connection: %s ' % sshException
pass
except paramiko.BadHostKeyException as badHostKeyException: except paramiko.BadHostKeyException as badHostKeyException:
if kwargs.get('check'): return 'Unable to verify server\'s host key: %s ' % badHostKeyException
print('<div class="alert alert-danger">Unable to verify server\'s host key: %s </div>' % badHostKeyException) pass
return False
else:
return 'Unable to verify server\'s host key: %s ' % badHostKeyException
pass
except Exception as e: except Exception as e:
if e == "No such file or directory": if e == "No such file or directory":
if kwargs.get('check'): return '%s. Check ssh key' % e
print('<div class="alert alert-danger">%s. Check ssh key</div>') % e pass
else:
return '%s. Check ssh key' % e
pass
elif e == "Invalid argument": elif e == "Invalid argument":
if kwargs.get('check'): error = 'Check the IP of the server'
print('<div class="alert alert-danger">Check the IP of the new server</div>') pass
else:
error = 'Check the IP of the new server'
pass
else: else:
if kwargs.get('check'): error = e
print('<div class="alert alert-danger">%s</div>') % e pass
else: return str(error)
error = e
pass
if kwargs.get('check'):
return False
else:
return error
def get_config(serv, cfg, **kwargs): def get_config(serv, cfg, **kwargs):
import sql import sql
@ -470,7 +443,7 @@ def ssh_command(serv, commands, **kwargs):
ssh.close() ssh.close()
except: except:
ssh = str(ssh) ssh = str(ssh)
print("<div class='alert alert-danger'>"+ssh+"</div>") print("<div class='alert alert-danger' style='margin: 0;'>"+ssh+"</div>")
pass pass
def escape_html(text): def escape_html(text):

18
app/sql.py
View File

@ -110,13 +110,13 @@ def update_group(name, descript, id):
cur.close() cur.close()
con.close() con.close()
def add_server(hostname, ip, group, typeip, enable, master, cred, alert, metrics): def add_server(hostname, ip, group, typeip, enable, master, cred, alert, metrics, port):
con, cur = create_db.get_cur() con, cur = create_db.get_cur()
sql = """ sql = """
INSERT INTO servers INSERT INTO servers
(hostname, ip, groups, type_ip, enable, master, cred, alert, metrics) (hostname, ip, groups, type_ip, enable, master, cred, alert, metrics, port)
VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')
""" % (hostname, ip, group, typeip, enable, master, cred, alert, metrics) """ % (hostname, ip, group, typeip, enable, master, cred, alert, metrics, port)
try: try:
cur.execute(sql) cur.execute(sql)
con.commit() con.commit()
@ -1150,11 +1150,12 @@ if form.getvalue('newserver') is not None:
metrics = form.getvalue('metrics') metrics = form.getvalue('metrics')
page = form.getvalue('page') page = form.getvalue('page')
page = page.split("#")[0] page = page.split("#")[0]
port = form.getvalue('port')
print('Content-type: text/html\n') print('Content-type: text/html\n')
if ip is None or group is None or cred is None: if ip is None or group is None or cred is None or port is None:
print(error_mess) print(error_mess)
else: else:
if add_server(hostname, ip, group, typeip, enable, master, cred, alert, metrics): if add_server(hostname, ip, group, typeip, enable, master, cred, alert, metrics, port):
show_update_server(ip, page) show_update_server(ip, page)
if form.getvalue('serverdel') is not None: if form.getvalue('serverdel') is not None:
@ -1202,13 +1203,10 @@ if form.getvalue('updateserver') is not None:
metrics = form.getvalue('metrics') metrics = form.getvalue('metrics')
port = form.getvalue('port') port = form.getvalue('port')
print('Content-type: text/html\n') print('Content-type: text/html\n')
if name is None or ip is None: if name is None or ip is None or port is None:
print(error_mess) print(error_mess)
else: else:
#if funct.ssh_connect(ip, check=1):
update_server(name, ip, group, typeip, enable, master, id, cred, alert, metrics, port) update_server(name, ip, group, typeip, enable, master, id, cred, alert, metrics, port)
#else:
# print('<span class="alert alert-danger" id="error"><a title="Close" id="errorMess"><b>X</b></a></span>')
if form.getvalue('updatessh'): if form.getvalue('updatessh'):
id = form.getvalue('id') id = form.getvalue('id')