- '
- '
- Listen ' - '
- Frontend ' - '
- Backend ' - '
- SSL certificates ' - '
'
- '
'
-
- ''
-
- ''
- '
'
-
-
- ''
-
- ''
- '
'
-
- ''
- ''
- '
'
- ''
- '
')
-
-
-funct.footer()
\ No newline at end of file
diff --git a/app/config.py b/app/config.py
index fae21cf7..edaad85d 100644
--- a/app/config.py
+++ b/app/config.py
@@ -6,15 +6,26 @@ import http.cookies
from configparser import ConfigParser, ExtendedInterpolation
import funct
import sql
-
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('config.html')
+print('Content-type: text/html\n')
+funct.check_login()
+funct.page_for_admin(level = 2)
form = cgi.FieldStorage()
serv = form.getvalue('serv')
-servNew = form.getvalue('serNew')
+config_read = ""
+cfg = ""
+stderr = ""
+aftersave = ""
-funct.head("Edit HAproxy config")
-funct.check_config()
-funct.check_login()
-funct.page_for_admin(level = 1)
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit()
+except:
+ pass
path_config = "haproxy-webintarface.config"
config = ConfigParser(interpolation=ExtendedInterpolation())
@@ -23,8 +34,6 @@ config.read(path_config)
log_path = config.get('main', 'log_path')
hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir')
-funct.chooseServer("config.py", "Edit HAproxy config", "y")
-
if serv is not None:
cfg = hap_configs_dir + serv + "-" + funct.get_data('config') + ".cfg"
@@ -38,18 +47,10 @@ if form.getvalue('serv') is not None and form.getvalue('open') is not None :
try:
conf = open(cfg, "r")
+ config_read = conf.read()
except IOError:
print('| Upload SSL certificates | ' - '' - 'Certificate name' - ' | ' - '' - 'Paste certificate content here(?)' - ' | ' - '
| ' - '' - ' | ' - '' - '' - ' | ' - ''
- ' ' - 'Upload' - ' | '
- '
Can\'t read import config file
')
- print("Config from %s
" % serv) - print('') conf.close os.system("/bin/mv %s %s.old" % (cfg, cfg)) @@ -63,27 +64,33 @@ if form.getvalue('serv') is not None and form.getvalue('config') is not None: config = form.getvalue('config') oldcfg = form.getvalue('oldconfig') save = form.getvalue('save') - + aftersave = 1 try: with open(cfg, "a") as conf: conf.write(config) except IOError: print("Can't read import config file") - - print('New config was saved as: %s
' % serv) - -funct.footer() \ No newline at end of file +output_from_parsed_template = template.render(h2 = 1, title = "Edit Runnig HAProxy config", + role = sql.get_user_role_by_uuid(user_id.value), + action = "config.py", + user = user, + select_id = "serv", + serv = serv, + aftersave = aftersave, + config = config_read, + cfg = cfg, + selects = servers, + stderr = stderr, + note = 1) +print(output_from_parsed_template) \ No newline at end of file diff --git a/app/configshow.py b/app/configshow.py index f14ab16b..50bf2f5b 100644 --- a/app/configshow.py +++ b/app/configshow.py @@ -1,46 +1,27 @@ #!/usr/bin/env python3 -import html -import cgi import os +import sql +import http import funct -import paramiko -from configparser import ConfigParser, ExtendedInterpolation -from datetime import datetime -from pytz import timezone - -form = cgi.FieldStorage() -serv = form.getvalue('serv') - -funct.head("Get Running Config") -funct.check_config() +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('config.html') +print('Content-type: text/html\n') funct.check_login() -path_config = "haproxy-webintarface.config" -config = ConfigParser(interpolation=ExtendedInterpolation()) -config.read(path_config) +try: + cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) + user_id = cookie.get('uuid') + user = sql.get_user_name_by_uuid(user_id.value) + servers = sql.get_dick_permit() +except: + pass -ssh_keys = config.get('ssh', 'ssh_keys') -ssh_user_name = config.get('ssh', 'ssh_user_name') -hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir') -haproxy_config_path = config.get('haproxy', 'haproxy_config_path') - -funct.chooseServer("configshow.py", "Get Running Config", "n", onclick="showConfig()") - -print('
')
-if serv is not None and form.getvalue('open') is not None :
-
- cfg = hap_configs_dir + serv + "-" + funct.get_data('config') + ".cfg"
-
- funct.get_config(serv, cfg)
-
- print("
')
-funct.footer()
\ No newline at end of file
+output_from_parsed_template = template.render(h2 = 1, title = "Show Runnig config",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ onclick = "showConfig()",
+ select_id = "serv",
+ selects = servers,
+ note = 0)
+print(output_from_parsed_template)
\ No newline at end of file
diff --git a/app/configver.py b/app/configver.py
index 10fa5790..3d8d041f 100644
--- a/app/configver.py
+++ b/app/configver.py
@@ -1,92 +1,83 @@
#!/usr/bin/env python3
import html
import cgi
-import os
+import os, http.cookies
import funct
import sql
from configparser import ConfigParser, ExtendedInterpolation
-
-form = cgi.FieldStorage()
-serv = form.getvalue('serv')
-configver = form.getvalue('configver')
-
-funct.head("Old Versions HAproxy config")
-funct.check_config()
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('configver.html')
+print('Content-type: text/html\n')
funct.check_login()
funct.page_for_admin(level = 2)
+form = cgi.FieldStorage()
+serv = form.getvalue('serv')
+config_read = ""
+configver = ""
+stderr = ""
+aftersave = ""
+
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit()
+except:
+ pass
path_config = "haproxy-webintarface.config"
config = ConfigParser(interpolation=ExtendedInterpolation())
config.read(path_config)
-
+form = cgi.FieldStorage()
+serv = form.getvalue('serv')
+configver = form.getvalue('configver')
hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir')
-funct.chooseServer("configver.py#conf", "Old Versions HAproxy config", "y")
-
-if serv is not None and form.getvalue('open') is not None:
-
- print('Config from %s
" % serv) - print('') - print('Choose old version
') - print('') - - Select = form.getvalue('Select') - - if Select is not None: - - configver = form.getvalue('configver') - funct.logging(serv, "open old config %s" % configver) - - print("Config from %s, and version is: %s
" % (serv, configver)) - print('') - funct.get_button("Just save", value="save") - funct.get_button("Upload and restart") - print('
' % serv) -funct.footer() +output_from_parsed_template = template.render(h2 = 1, title = "Old Versions HAProxy config", + role = sql.get_user_role_by_uuid(user_id.value), + action = "configver.py", + user = user, + select_id = "serv", + serv = serv, + return_files = get_files(), + aftersave = aftersave, + config = config_read, + configver = configver, + selects = servers, + stderr = stderr, + open = form.getvalue('open'), + onclick = "showUploadConfig()", + note = 1) +print(output_from_parsed_template) diff --git a/app/delver.py b/app/delver.py index f21361aa..8e8a3075 100644 --- a/app/delver.py +++ b/app/delver.py @@ -1,61 +1,76 @@ #!/usr/bin/env python3 -import html +import html, http.cookies import cgi import os -import funct +import funct, sql from configparser import ConfigParser, ExtendedInterpolation import glob - +from configparser import ConfigParser, ExtendedInterpolation +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('delver.html') +print('Content-type: text/html\n') +funct.check_login() +funct.page_for_admin() form = cgi.FieldStorage() serv = form.getvalue('serv') +stderr = "" +aftersave = "" +file = set() -funct.head("Old Versions HAproxy config") -funct.check_config() -funct.check_login() +try: + cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) + user_id = cookie.get('uuid') + user = sql.get_user_name_by_uuid(user_id.value) + servers = sql.get_dick_permit() +except: + pass path_config = "haproxy-webintarface.config" config = ConfigParser(interpolation=ExtendedInterpolation()) config.read(path_config) - +form = cgi.FieldStorage() +serv = form.getvalue('serv') +Select = form.getvalue('del') hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir') -funct.page_for_admin() -funct.chooseServer("delver.py", "Delete Versions HAproxy config", "n") +def get_files(): + import glob + file = set() + return_files = set() + for files in glob.glob(os.path.join(hap_configs_dir,'*.cfg')): + file.add(files.split('/')[6]) + files = sorted(file, reverse=True) + for file in files: + ip = file.split("-") + if serv == ip[0]: + return_files.add(file) + return sorted(return_files, reverse=True) if serv is not None and form.getvalue('open') is not None: - - print('
Choose old version
') - print('') - - Select = form.getvalue('del') - if Select is not None: - os.chdir(hap_configs_dir) - print("The following files were deleted:") + aftersave = 1 for get in form: if "cfg" in get: try: - os.remove(form.getvalue(get)) - print(form.getvalue(get) + "
") + os.remove(os.path.join(hap_configs_dir, form.getvalue(get))) + file.add(form.getvalue(get) + "
") funct.logging(serv, "delver.py deleted config: %s" % form.getvalue(get)) except OSError: - print ("Error: %s - %s." % (e.filename,e.strerror)) + stderr = "Error: %s - %s." % (e.filename,e.strerror) print('' % form.getvalue('serv')) -funct.footer() \ No newline at end of file +output_from_parsed_template = template.render(h2 = 1, title = "Delete old versions HAProxy config", + role = sql.get_user_role_by_uuid(user_id.value), + action = "delver.py", + user = user, + select_id = "serv", + serv = serv, + aftersave = aftersave, + return_files = get_files(), + selects = servers, + stderr = stderr, + open = form.getvalue('open'), + Select = form.getvalue('del'), + file = file) +print(output_from_parsed_template) \ No newline at end of file diff --git a/app/diff.py b/app/diff.py index 3ab6ac5b..263d0a8c 100644 --- a/app/diff.py +++ b/app/diff.py @@ -1,28 +1,28 @@ #!/usr/bin/env python3 -import html -import cgi +import os +import sql +import http import funct -import ovw - -form = cgi.FieldStorage() -serv = form.getvalue('serv') -left = form.getvalue('left') -right = form.getvalue('right') +import sql +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('config.html') -funct.head("Compare HAproxy configs") -funct.check_config() -funct.check_login() -funct.chooseServer("diff.py#diff", "Compare HAproxy configs", "n", onclick="showCompareConfigs()") +print('Content-type: text/html\n') +funct.check_login() -print('
')
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit()
+except:
+ pass
-if serv is not None and form.getvalue('open') is not None :
- ovw.show_compare_configs(serv)
-
-print('
')
-
-if serv is not None and right is not None:
- ovw.comapre_show()
-
-print('
')
-funct.footer()
\ No newline at end of file
+output_from_parsed_template = template.render(h2 = 1, title = "Compare configs",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ onclick = "showCompareConfigs()",
+ select_id = "serv",
+ selects = servers)
+print(output_from_parsed_template)
\ No newline at end of file
diff --git a/app/edit.py b/app/edit.py
index eff77d00..90dcaad2 100644
--- a/app/edit.py
+++ b/app/edit.py
@@ -1,52 +1,29 @@
#!/usr/bin/env python3
-import html
-import cgi
+import os
+import sql
+import http
import funct
import sql
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('runtimeapi.html')
-form = cgi.FieldStorage()
-serv = form.getvalue('serv')
-
-funct.head("Runtime API")
+print('Content-type: text/html\n')
funct.check_login()
-funct.check_config()
-print('Runtime API
' - '| Server | ' - 'Disable/Enable server or output any information | ' - 'Command | ' - 'Save change | ' - '' - ' |
| ' - ' | ' - '' - ' | ' - '' - '' - ' | ' - '' - ' | ' - 'Enter' - ' | ' - '
'
- '
')
-
-funct.footer()
\ No newline at end of file
+output_from_parsed_template = template.render(h2 = 1,
+ title = "Runtime API",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ onclick = "showRuntime()",
+ select_id = "serv",
+ selects = servers)
+print(output_from_parsed_template)
\ No newline at end of file
diff --git a/app/funct.py b/app/funct.py
index 855c8d3d..499b049a 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -121,189 +121,6 @@ def get_button(button, **kwargs):
if value is None:
value = ""
print('' % (value, value, button))
-
-def head(title):
- print('Content-type: text/html\n')
- print('')
-
-def links():
- print('Login ')
- else:
- print('Logout ' % sql.get_user_name_by_uuid(user_id.value))
-
-def footer():
- print('
'
- ''
- ''
- ''
- '
')
-
-def show_login_links():
- import sql
- cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
- user_id = cookie.get('uuid')
-
- if user_id is None:
- print('' - 'UP' - '
' - '
')
- print('%s' % h2)
- print(''
- '
Auto-refresh'
- ''
- ''
- ''
- '
'
- ''
- '
')
def ssh_connect(serv, **kwargs):
ssh = SSHClient()
@@ -339,10 +156,8 @@ def ssh_connect(serv, **kwargs):
def get_config(serv, cfg, **kwargs):
if kwargs.get("keepalived"):
- os.chdir(config.get('configs', 'kp_save_configs_dir'))
config_path = "/etc/keepalived/keepalived.conf"
else:
- os.chdir(hap_configs_dir)
config_path = haproxy_config_path
ssh = ssh_connect(serv)
@@ -433,7 +248,6 @@ def upload_and_restart(serv, cfg, **kwargs):
try:
ssh = ssh_connect(serv)
- print(''
- 'Refresh Interval'
- '
'
- ''
- '
'
- ''
- '
'
- '- '
- '
- ' - 'Off ' - ' ' - '
'
- '
'
- '- '
- '
- ' - '5 seconds' - ' ' - '
- ' - '10 seconds' - ' ' - '
- ' - '30 seconds' - ' ' - '
- ' - '45 seconds' - ' ' - '
'
- '
'
- ''
- '- '
- '
- ' - '1 minute' - ' ' - '
- ' - '5 minutes' - ' ' - '
- ' - '15 minutes' - ' ' - '
- ' - '30 minutes' - ' ' - '
connected to %s
' % serv)
except:
print('Connect fail
')
sftp = ssh.open_sftp()
@@ -446,32 +260,20 @@ def upload_and_restart(serv, cfg, **kwargs):
commands = [ "mv -f " + tmp_file + " /etc/keepalived/keepalived.conf", "systemctl restart keepalived" ]
else:
if kwargs.get("just_save") == "save":
- commands = [ "/sbin/haproxy -q -c -f " + tmp_file, "mv -f " + tmp_file + " " + haproxy_config_path ]
+ commands = [ "/sbin/haproxy -q -c -f " + tmp_file + "&& mv -f " + tmp_file + " " + haproxy_config_path ]
else:
- commands = [ "/sbin/haproxy -q -c -f " + tmp_file, "mv -f " + tmp_file + " " + haproxy_config_path, restart_command ]
+ commands = [ "/sbin/haproxy -q -c -f " + tmp_file + "&& mv -f " + tmp_file + " " + haproxy_config_path + " && " + restart_command ]
try:
if config.get('haproxy', 'firewall_enable') == "1":
commands.extend(open_port_firewalld(cfg))
except:
- print('Please check the config for the presence of the parameter - "firewall_enable". Mast be: "0" or "1". Firewalld configure not working now
')
+ return 'Please check the config for the presence of the parameter - "firewall_enable". Mast be: "0" or "1". Firewalld configure not working now'
- i = 0
for command in commands:
- i = i + 1
- stdin , stdout, stderr = ssh.exec_command(command)
- if i == 1:
- if not stderr.read():
- print('Config ok
')
- else:
- print('In your config have errors, please check, and try again
')
- return False
- break
- if i is not 1:
- print(stderr.read().decode(encoding='UTF-8'))
-
- return True
-
- print('' + title + '
Choose server
') - print('') - - if note == "y": - print('Note: If you reconfigure Master server, Slave will reconfigured automatically
')
- print('Configure HA
' - '| Master | ' - 'Slave | ' - 'VRRP interface | ' - 'VRRP IP | ' - 'Install HAProxy(?) | ' - '' - ' |
| ' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - 'Create' - ' | ' - '
| Master | ' - 'Slave | ' - 'VRRP interface | ' - 'VRRP IP | ' - 'Restart Keepalived(?) | ' - '' - ' |
| ' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - '' - ' | ' - '' - 'Add' - ' | ' - '
Installation HAProxy
' - '| Note | ' - 'Server | ' - '' - ' |
| ' - 'Haproxy-WI will try install haproxy-1.18.5, if it does not work then haproxy-1.15' - ' | ' - '' - '' - ' | ' - '' - 'Install' - ' | ' - '
Edit Running Keepalived config
' - 'Choose server
' - '') - if serv is not None: cfg = kp_save_configs_dir+ serv + '-' + funct.get_data('config') + '.conf' @@ -61,18 +47,10 @@ if form.getvalue('serv') is not None and form.getvalue('open') is not None : try: conf = open(cfg, "r",encoding='utf-8', errors='ignore') + config_read = conf.read() except IOError: print('Can\'t read import config file
')
- print("Config from %s
" % serv) - print('') conf.close os.system("/bin/mv %s %s.old" % (cfg, cfg)) @@ -86,21 +64,28 @@ if form.getvalue('serv') is not None and form.getvalue('config') is not None: config = form.getvalue('config') oldcfg = form.getvalue('oldconfig') save = form.getvalue('save') - + aftersave = 1 try: with open(cfg, "a") as conf: conf.write(config) except IOError: print("Can't read import config file") - - print('New config was saved as: %s
' % serv) - -funct.footer() \ No newline at end of file +output_from_parsed_template = template.render(h2 = 1, title = "Edit Runnig Keepalived config", + role = sql.get_user_role_by_uuid(user_id.value), + action = "keepalivedconfig.py", + user = user, + select_id = "serv", + serv = serv, + aftersave = aftersave, + config = config_read, + cfg = cfg, + selects = servers, + stderr = stderr, + keepalived = 1) +print(output_from_parsed_template) \ No newline at end of file diff --git a/app/login.py b/app/login.py index 08ab06db..8dc6cd08 100644 --- a/app/login.py +++ b/app/login.py @@ -10,52 +10,52 @@ import create_db import datetime import uuid from configparser import ConfigParser, ExtendedInterpolation +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('login.html') +form = cgi.FieldStorage() cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) -form = cgi.FieldStorage() +user_id = cookie.get('uuid') ref = form.getvalue('ref') login = form.getvalue('login') password = form.getvalue('pass') +db_create = "" +error_log = "" +error = "" path_config = "haproxy-webintarface.config" config = ConfigParser(interpolation=ExtendedInterpolation()) config.read(path_config) -def login_page(error): - if error == "error": - funct.head("Login page") - printError = "
Login page. Enter please
Somthing wrong :( I'm sad about this, but try again!
" - else: - printError = "
Login page. Enter please
" +if ref is None: + ref = "/index.html" - if create_db.check_db(): - if create_db.create_table(): - print('
DB was created
') - create_db.update_all() - print('
Now you can login, default: admin/admin
')
- create_db.update_all_silent()
+if form.getvalue('error'):
+ error_log = '') - create_db.update_all() - print('
Now you can login, default: admin/admin
Somthing wrong :( I\'m sad about this, but try again!
' + +try: + if config.get('main', 'session_ttl'): + session_ttl = config.getint('main', 'session_ttl') +except: + error = '
Can not find "session_ttl" parametr. Check into config, "main" section
'
+ pass
- ref = form.getvalue('ref')
- if ref is None:
- ref = "/index.html"
-
- print('Can not find "session_ttl" parametr. Check into config, "main" section
')
-
-if form.getvalue('logout') is not None:
- cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
- user_id = cookie.get('uuid')
+if create_db.check_db():
+ if create_db.create_table():
+ create_db.update_all()
+ db_create = 'DB was created
Now you can login, default: admin/admin
'
+create_db.update_all_silent()
+
+if form.getvalue('logout'):
try:
sql.delete_uuid(user_id.value)
except:
@@ -63,15 +63,9 @@ if form.getvalue('logout') is not None:
print("Set-cookie: uuid=; expires=Wed May 18 03:33:20 2003; path=/app/; httponly")
print("Content-type: text/html\n")
print('')
-
-if login is None:
- funct.head("Login page")
- login_page("n")
-
+
if login is not None and password is not None:
- if form.getvalue('ref') is None:
- ref = "/index.html"
-
+
USERS = sql.select_users()
session_ttl = config.getint('main', 'session_ttl')
expires = datetime.datetime.utcnow() + datetime.timedelta(days=session_ttl)
@@ -90,7 +84,18 @@ if login is not None and password is not None:
print('Now you can login, default: admin/admin
| Server | ' - 'Number rows | ' - 'Ex for grep | ' - '' - ' |
| ' - ' | ' % rows) -print(' | ' % grep) -print(' | ' - '' - 'Show' - ' | ' - '' - '
'
- '
'
- '')
-funct.footer()
\ No newline at end of file
diff --git a/app/map.py b/app/map.py
index f34181d7..290808cc 100644
--- a/app/map.py
+++ b/app/map.py
@@ -1,21 +1,28 @@
#!/usr/bin/env python3
-import html
-import cgi
import os
+import sql
+import http
import funct
-import ovw
+import sql
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('config.html')
-form = cgi.FieldStorage()
-serv = form.getvalue('serv')
-
-funct.head("Show HAproxy config")
-funct.check_config()
+print('Content-type: text/html\n')
funct.check_login()
-funct.chooseServer("map.py", "Show HAproxy map", "n", onclick="showMap()")
-print('')
-if serv is not None:
- ovw.get_map(serv)
-print('
')
-
-funct.footer()
\ No newline at end of file
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit()
+except:
+ pass
+
+output_from_parsed_template = template.render(h2 = 1, title = "Show Map",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ onclick = "showMap()",
+ select_id = "serv",
+ selects = servers)
+print(output_from_parsed_template)
\ No newline at end of file
diff --git a/app/options.py b/app/options.py
index 6eb4c63b..d46fffbb 100644
--- a/app/options.py
+++ b/app/options.py
@@ -188,11 +188,15 @@ if serv is not None and act == "configShow":
import os
from datetime import datetime
from pytz import timezone
-
hap_configs_dir = config.get('configs', 'haproxy_save_configs_dir')
- cfg = hap_configs_dir + serv + "-" + funct.get_data('config') + ".cfg"
- funct.get_config(serv, cfg)
+ if form.getvalue('configver') is None:
+ cfg = hap_configs_dir + serv + "-" + funct.get_data('config') + ".cfg"
+ funct.get_config(serv, cfg)
+ else:
+ cfg = hap_configs_dir + form.getvalue('configver')
+
+
print('')
print("Config from %s
" % serv) @@ -202,8 +206,18 @@ if serv is not None and act == "configShow": print('Please check the config for the presence of the parameter - "log_path".
')
try:
- log = open(log_path + viewlog, "r")
+ log = open(log_path + viewlog, "r",encoding='utf-8', errors='ignore')
except IOError:
print('Can\'t read import log file
')
sys.exit()
diff --git a/app/overview.py b/app/overview.py
index e6db6197..75586e2e 100644
--- a/app/overview.py
+++ b/app/overview.py
@@ -1,14 +1,24 @@
#!/usr/bin/env python3
-import html
-import cgi
-import funct
-import ovw
-
-funct.head("Overview")
-funct.check_config()
+import funct, sql
+import os, http
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('ovw.html')
+
+print('Content-type: text/html\n')
funct.check_login()
-funct.get_auto_refresh("Overview")
-print("")
-print('')
-funct.footer()
\ No newline at end of file
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+
+except:
+ pass
+
+output_from_parsed_template = template.render(h2 = 1,
+ autorefresh = 1,
+ title = "Overview",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user)
+print(output_from_parsed_template)
\ No newline at end of file
diff --git a/app/settings.py b/app/settings.py
index fe6058dd..963c65ef 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -1,32 +1,41 @@
#!/usr/bin/env python3
-import html
+import html, http
import cgi
import sys
import os
-import funct
+import funct, sql
from configparser import ConfigParser, ExtendedInterpolation
-
-funct.head("Admin area: View settings")
-funct.check_config()
-funct.check_login()
-funct.page_for_admin()
-
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('viewsettings.html')
+form = cgi.FieldStorage()
path_config = "haproxy-webintarface.config"
config = ConfigParser(interpolation=ExtendedInterpolation())
config.read(path_config)
fullpath = config.get('main', 'fullpath')
-print('Admin area: View settings
' - ''
- '
')
-funct.footer()
\ No newline at end of file
+
+output_from_parsed_template = template.render(h2 = 1, title = "Admin area: View settings",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ fullpath = fullpath,
+ config_items_section_name = config_items_section_name)
+print(output_from_parsed_template)
diff --git a/app/templates/add.html b/app/templates/add.html
new file mode 100644
index 00000000..6bab9726
--- /dev/null
+++ b/app/templates/add.html
@@ -0,0 +1,359 @@
+{% extends "base.html" %}
+{% block content %}
+Only view, edit you can here: {fullpath}/haproxy-webintarface.config
' - ''.format(fullpath=fullpath))
-
+print('Content-type: text/html\n')
+funct.check_login()
+funct.page_for_admin()
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit()
+except:
+ pass
+
+config_items_section_name = {}
for section_name in config.sections():
- print('Section:', section_name)
- for name, value in config.items(section_name):
- print(' {} = {}'.format(name, value))
- print()
+ config_items_section_name[section_name] = {}
+ for name, value in config.items(section_name):
+ config_items_section_name[section_name][name] = value
-print('
+ {{title}} - HAproxy-WI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/templates/config.html b/app/templates/config.html
new file mode 100644
index 00000000..f0ed74c3
--- /dev/null
+++ b/app/templates/config.html
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% block content %}
+
+
Go to view stats + {% if stderr %} +
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/configver.html b/app/templates/configver.html
new file mode 100644
index 00000000..2bb4d2cf
--- /dev/null
+++ b/app/templates/configver.html
@@ -0,0 +1,56 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+ {% endif %}
+ {% if aftersave %}
+
Go to view stats + {% if stderr %} +
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/delver.html b/app/templates/delver.html
new file mode 100644
index 00000000..6f4aad7a
--- /dev/null
+++ b/app/templates/delver.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+ {% endif %}
+ {% if aftersave %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/ha.html b/app/templates/ha.html
new file mode 100644
index 00000000..d3c7f237
--- /dev/null
+++ b/app/templates/ha.html
@@ -0,0 +1,88 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/ihap.html b/app/templates/ihap.html
new file mode 100644
index 00000000..4b7639c5
--- /dev/null
+++ b/app/templates/ihap.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/login.html b/app/templates/login.html
new file mode 100644
index 00000000..c1e30f3b
--- /dev/null
+++ b/app/templates/login.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/logs.html b/app/templates/logs.html
new file mode 100644
index 00000000..0a0bf9f6
--- /dev/null
+++ b/app/templates/logs.html
@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+
+
+
+
+{% endblock %}
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
new file mode 100644
index 00000000..22cbf46d
--- /dev/null
+++ b/app/templates/ovw.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/runtimeapi.html b/app/templates/runtimeapi.html
new file mode 100644
index 00000000..1ebbc3cd
--- /dev/null
+++ b/app/templates/runtimeapi.html
@@ -0,0 +1,46 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/viewlogs.html b/app/templates/viewlogs.html
new file mode 100644
index 00000000..42e94d83
--- /dev/null
+++ b/app/templates/viewlogs.html
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+{% block content %}
+
+
+
+ + + + +{% endblock %} \ No newline at end of file diff --git a/app/users.py b/app/users.py index 51480075..0891d984 100644 --- a/app/users.py +++ b/app/users.py @@ -1,220 +1,32 @@ #!/usr/bin/env python3 -import html +import html, http import cgi import sys import os import funct import sql - -funct.head("Admin area: users manage") -funct.check_config() -funct.check_login() -funct.page_for_admin() - +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('admin.html') form = cgi.FieldStorage() -USERS = sql.select_users() -GROUPS = sql.select_groups() -SERVERS = sql.select_servers(full=1) -ROLES = sql.select_roles() +print('Content-type: text/html\n') +funct.check_login() +funct.page_for_admin() +try: + cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) + user_id = cookie.get('uuid') + user = sql.get_user_name_by_uuid(user_id.value) + servers = sql.get_dick_permit() +except: + pass -print('' - '
') + + +funct.check_login() +funct.page_for_admin() try: time_storage_hours = time_storage * 24 for dirpath, dirnames, filenames in os.walk(log_path): @@ -46,22 +39,27 @@ except: print('
' - '' - '') - -funct.footer() \ No newline at end of file +def get_files(): + file = set() + for files in glob.glob(os.path.join(log_path,'*.log')): + file.add(files.split('/')[5]) + return sorted(file, reverse=True) + +output_from_parsed_template = template.render(h2 = 1, + autorefresh = 1, + title = "View logs", + role = sql.get_user_role_by_uuid(user_id.value), + user = user, + onclick = "viewLogs()", + serv = form.getvalue('viewlogs'), + select_id = "viewlogs", + selects = get_files()) +print(output_from_parsed_template) diff --git a/app/viewsttats.py b/app/viewsttats.py index 81b88842..1b2f6670 100644 --- a/app/viewsttats.py +++ b/app/viewsttats.py @@ -1,39 +1,41 @@ #!/usr/bin/env python3 -import html +import html, http, os import cgi import requests import funct import sql -from configparser import ConfigParser, ExtendedInterpolation from requests_toolbelt.utils import dump - -print("Content-type: text/html\n") - +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('viewstats.html') form = cgi.FieldStorage() -serv = form.getvalue('serv') +serv = form.getvalue('serv') if serv is None: first_serv = sql.get_dick_permit() for i in first_serv: serv = i[2] break -print('
-
+
- Listen +
- Frontend +
- Backend +
- SSL certificates +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if add %}
+ | Upload SSL certificates | ++ Certificate name + | ++ Paste certificate content here(?) + | +
| + + | ++ + | +
+ + Upload + |
+
+
+ {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/admin.html b/app/templates/admin.html
new file mode 100644
index 00000000..446ebaed
--- /dev/null
+++ b/app/templates/admin.html
@@ -0,0 +1,303 @@
+{% extends "base.html" %}
+{% block content %}
+
+{{ add }} was success added
+ {{ conf_add }} +
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/base.html b/app/templates/base.html
new file mode 100644
index 00000000..53af6b40
--- /dev/null
+++ b/app/templates/base.html
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+ + +
+ | Login name | +Password | +Role | +Group | ++ | + | |
| + | + | + | + + | ++ + | ++ |
+
+ + +
+
+
+
+
+ +
+ | Name | +Desciption | ++ | + | ||
| {{ group.1 }} | +{{ group.2 }} | ++ {% else %} + | + + | ++ + | ++ + | + {% endif %} +
+
+ +
+
+
+ + +
+ +
+ + +
+
+
+
+ | Name | +Desciption | ++ | + |
| {{role.1}} | +{{role.2}} | +
+
+
+
+
+| Upload SSH Key | ++ Key(?) + | ++ |
| + Note: Paste pem file content here + | +
+ + Upload + |
+ + |
+ {% if h2 %}
+
+ {{title}}
+ {% if autorefresh %}
+
+
+
+
+ {% endif %}
+ {% if autorefresh %}
+
+
+ {{title}}
+ {% if autorefresh %}
+
+
+
+ Auto-refresh
+
+
+ {% endif %}
+
+ {% endif %}
+ {% if autorefresh %}
+
+
+ {% endif %}
+ {% block content %}{% endblock %}
+
+
+
+ Refresh Interval
+
+
+
+
+
+ -
+
- + Off + +
+
+ -
+
- + 5 seconds + +
- + 10 seconds + +
- + 30 seconds + +
- + 45 seconds + +
+
+
+ -
+
- + 1 minute + +
- + 5 minutes + +
- + 15 minutes + +
- + 30 minutes + +
+ UP +
+
Choose server
++
+ + {% if note %} +Note: If you reconfigure Master server, Slave will reconfigured automatically
+ {% endif %}
+ {% if config %}
+ Config from {{ serv }}
+ + {% endif %} + {% if aftersave %} +New config was saved as: {{ cfg }}
+ Go to view stats + {% if stderr %} +
+ Some errors:
+
+
+ {{stderr}} +
+ {% else %}
+ +
+ {{stderr}} +
Config ok
+ {% endif %}
+ {% endif %}
+ Choose server
++
+ + {% if note %} +Note: If you reconfigure Master server, Slave will reconfigured automatically
+ {% endif %}
+ {% if open %}
+ Choose old version
+ +Uploaded old config ver: {{ configver }}
+ Go to view stats + {% if stderr %} +
+ Some errors:
+
+
+ {{stderr}} +
+ {% else %}
+ +
+ {{stderr}} +
Config ok
+ {% endif %}
+ {% endif %}
+ Choose server
++
+ + {% if note %} +Note: If you reconfigure Master server, Slave will reconfigured automatically
+ {% endif %}
+ {% if open %}
+ Choose old version
+ +The following files were deleted:
+ {% if stderr %}
+
+ Some errors:
+
+
+ {{stderr}} +
+ {% else %}
+ +
+ {{stderr}} +
+ {% for f in file %}
+ {{f}}
+ {% endfor %}
+
+ {% endif %}
+ {% endif %}
+ | Master | +Slave | +VRRP interface | +VRRP IP | +Install HAProxy(?) | ++ |
| + + | ++ + | ++ + | ++ + | ++ + | ++ Create + | +
| Master | +Slave | +VRRP interface | +VRRP IP | +Restart Keepalived(?) | ++ |
| + + | ++ + | ++ + | ++ + | ++ + | ++ Add + | +
| Note | +Server | ++ |
| + Haproxy-WI will try install haproxy-1.18.5, if it does not work then haproxy-1.15 + | ++ + | ++ Install + | +
| Server | +Number rows | +Ex for grep | ++ |
| + | ++ + | ++ + | ++ Show + + | +
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/overview.html b/app/templates/overview.html
new file mode 100644
index 00000000..5c0f967b
--- /dev/null
+++ b/app/templates/overview.html
@@ -0,0 +1,53 @@
+{% extends "base.html" %}
+{% block content %}
+ | Login | +Group | +Role | ++ + | +|
| {{ user.1 }} | +{{ user.2 }} | +{{ user.5 }} | +{{ user.4 }} | ++ |
| Server | ++ HAproxy status + | ++ Action + | ++ Last edit + | +
| {{ server.1 }} | +{{ server.7 }} | +
+ 
+ 
+ 
+ 
+ |
+
| Server | +Disable/Enable server or output any information | +Command | +Save change | ++ |
| + | ++ + | ++ + | ++ {% if role <= 2 %} + + {% endif %} + | ++ Enter + | + +
Choose server
++
+ +
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/viewsettings.html b/app/templates/viewsettings.html
new file mode 100644
index 00000000..1a7af7c6
--- /dev/null
+++ b/app/templates/viewsettings.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% block content %}
+Only view, edit you can here: {{ fullpath }}/haproxy-webintarface.config
+
+ {% for name, value in config_items_section_name|dictsort(false) %}
+
Section: {{name}}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/viewstats.html b/app/templates/viewstats.html
new file mode 100644
index 00000000..b6054403
--- /dev/null
+++ b/app/templates/viewstats.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% block content %}
+Section: {{name}}
+
+ {% for param, value2 in value|dictsort(false) %}
+
{{param}} = {{value2}} + {% endfor %} +
+ {% endfor %}
+{{param}} = {{value2}} + {% endfor %} +
+ + + + +{% endblock %} \ No newline at end of file diff --git a/app/users.py b/app/users.py index 51480075..0891d984 100644 --- a/app/users.py +++ b/app/users.py @@ -1,220 +1,32 @@ #!/usr/bin/env python3 -import html +import html, http import cgi import sys import os import funct import sql - -funct.head("Admin area: users manage") -funct.check_config() -funct.check_login() -funct.page_for_admin() - +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('admin.html') form = cgi.FieldStorage() -USERS = sql.select_users() -GROUPS = sql.select_groups() -SERVERS = sql.select_servers(full=1) -ROLES = sql.select_roles() +print('Content-type: text/html\n') +funct.check_login() +funct.page_for_admin() +try: + cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) + user_id = cookie.get('uuid') + user = sql.get_user_name_by_uuid(user_id.value) + servers = sql.get_dick_permit() +except: + pass -print('' - '
'
- ''
- '
')
\ No newline at end of file
+output_from_parsed_template = template.render(title = "Admin area: users manage",
+ role = sql.get_user_role_by_uuid(user_id.value),
+ user = user,
+ users = sql.select_users(),
+ groups = sql.select_groups(),
+ servers = sql.select_servers(full=1),
+ roles = sql.select_roles(),
+ masters = sql.select_servers(get_master_servers=1))
+print(output_from_parsed_template)
diff --git a/app/viewlogs.py b/app/viewlogs.py
index 2d608ee5..2ae414df 100644
--- a/app/viewlogs.py
+++ b/app/viewlogs.py
@@ -1,39 +1,32 @@
#!/usr/bin/env python3
-import html
-import cgi
-import os, sys
+import os
+import sql
+import http, cgi
import funct
-from configparser import ConfigParser, ExtendedInterpolation
+import sql
import glob
import datetime
+from configparser import ConfigParser, ExtendedInterpolation
+from jinja2 import Environment, FileSystemLoader
+env = Environment(loader=FileSystemLoader('templates/'))
+template = env.get_template('viewlogs.html')
form = cgi.FieldStorage()
-viewlog = form.getvalue('viewlogs')
-
-funct.head("View logs")
-funct.check_login()
-funct.page_for_admin()
-funct.get_auto_refresh("View logs")
-
path_config = "haproxy-webintarface.config"
config = ConfigParser(interpolation=ExtendedInterpolation())
config.read(path_config)
+print('Content-type: text/html\n')
try:
if config.get('main', 'log_path'):
log_path = config.get('main', 'log_path')
time_storage = config.getint('logs', 'log_time_storage')
except:
print(''
- '
') - -print('
') - -print('
') - -print('
') - -print('
'
- '
') - -print('
' -'
'
-'') - -print('
' -'
'
- '
' - '
') - -print('
' - '
') - -print('
'
- ''
- '
'
- '
'
- '| Name | ' - 'Desciption | ' - '' - ' | ' - ' |
| %s | ' % ( role[1])) - print('%s | ' % (role[2])) - print('
'
- ''
- '
'
- ''
- '
| Upload SSH Key | ' - '' - 'Key(?)' - ' | ' - '' - ' |
| ' - 'Note: Paste pem file content here' - ' | ' - ''
- ' ' - 'Upload' - ' | '
- '' - ' |
Can not find "log_path" and "log_time_storage" parametrs. Check into config
')
-try:
- os.chdir(log_path)
-except IOError:
- print('No such file or directory: "%s". Please check "log_path" in config and exist directory
' % log_path)
- sys.exit()
-
-print(''
- ''
- 'Choose log file
') + + +funct.check_login() +funct.page_for_admin() try: time_storage_hours = time_storage * 24 for dirpath, dirnames, filenames in os.walk(log_path): @@ -46,22 +39,27 @@ except: print('
Can\'t delete old logs file.
Please check "log_time_storage" in config and
exist directory
')
pass
-print(''
- 'Show'
- 'Please check "log_time_storage" in config and
exist directory
' - '' - '') - -funct.footer() \ No newline at end of file +def get_files(): + file = set() + for files in glob.glob(os.path.join(log_path,'*.log')): + file.add(files.split('/')[5]) + return sorted(file, reverse=True) + +output_from_parsed_template = template.render(h2 = 1, + autorefresh = 1, + title = "View logs", + role = sql.get_user_role_by_uuid(user_id.value), + user = user, + onclick = "viewLogs()", + serv = form.getvalue('viewlogs'), + select_id = "viewlogs", + selects = get_files()) +print(output_from_parsed_template) diff --git a/app/viewsttats.py b/app/viewsttats.py index 81b88842..1b2f6670 100644 --- a/app/viewsttats.py +++ b/app/viewsttats.py @@ -1,39 +1,41 @@ #!/usr/bin/env python3 -import html +import html, http, os import cgi import requests import funct import sql -from configparser import ConfigParser, ExtendedInterpolation from requests_toolbelt.utils import dump - -print("Content-type: text/html\n") - +from jinja2 import Environment, FileSystemLoader +env = Environment(loader=FileSystemLoader('templates/')) +template = env.get_template('viewstats.html') form = cgi.FieldStorage() -serv = form.getvalue('serv') +serv = form.getvalue('serv') if serv is None: first_serv = sql.get_dick_permit() for i in first_serv: serv = i[2] break -print('
')
+print('Content-type: text/html\n')
+funct.check_login()
-funct.get_auto_refresh("HAproxy statistics")
+try:
+ cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+ user_id = cookie.get('uuid')
+ user = sql.get_user_name_by_uuid(user_id.value)
+ servers = sql.get_dick_permit(virt=1)
+except:
+ pass
-print('
' - '' - '') - -funct.head("Stats HAproxy configs") -print('
')
-funct.footer()
diff --git a/requirements.txt b/requirements.txt
index 5e842c0f..274bfc71 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,5 @@ numpy==1.14.0
matplotlib==2.1.2
urllib3==1.22
future==0.13.1
-mysql-connector-python==8.0.11
\ No newline at end of file
+mysql-connector-python==8.0.11
+Jinja2==2.10
\ No newline at end of file
diff --git a/update.sh b/update.sh
index 8d197830..977354a3 100644
--- a/update.sh
+++ b/update.sh
@@ -10,6 +10,8 @@ chown -R apache:apache *
cd app/
./update_db.py
+pip install -r requirements.txt
+
echo ""
echo "#################"
echo "Change in config:"
' - '' - '') - -funct.head("Stats HAproxy configs") -print('