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

v5.5.0.0 

Changelog: https://roxy-wi.org/changelog.py#5_5_0
pull/321/head
Aidaho 2022-03-24 10:23:29 +02:00
parent 03226ae657
commit c629cef68f
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/add.py
View File

@ -22,7 +22,7 @@ if (
form.getvalue('generateconfig') is None form.getvalue('generateconfig') is None
): ):
try: try:
user, user_id, role, token, servers, user_services = funct.get_users_params() user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1)
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
group = cookie.get('group') group = cookie.get('group')
user_group = group.value user_group = group.value

2
app/config.py
View File

@ -47,7 +47,7 @@ else:
action = "config.py" action = "config.py"
configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir') configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
file_format = 'cfg' file_format = 'cfg'
servers = sql.get_dick_permit() servers = sql.get_dick_permit(haproxy=1)
if serv is not None: if serv is not None:
if service == 'nginx': if service == 'nginx':

6
app/funct.py
View File

@ -1538,10 +1538,14 @@ def get_users_params(**kwargs):
role = '' role = ''
user_services = '' user_services = ''
token = '' token = ''
if kwargs.get('virt'): if kwargs.get('virt') and kwargs.get('haproxy'):
servers = sql.get_dick_permit(virt=1, haproxy=1)
elif kwargs.get('virt'):
servers = sql.get_dick_permit(virt=1) servers = sql.get_dick_permit(virt=1)
elif kwargs.get('disable'): elif kwargs.get('disable'):
servers = sql.get_dick_permit(disable=0) servers = sql.get_dick_permit(disable=0)
elif kwargs.get('haproxy'):
servers = sql.get_dick_permit(haproxy=1)
else: else:
servers = sql.get_dick_permit() servers = sql.get_dick_permit()

2
app/runtimeapi.py
View File

@ -9,7 +9,7 @@ funct.check_login(service=1)
form = funct.form form = funct.form
try: try:
user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1) user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1, haproxy=1)
servbackend = form.getvalue('servbackend') servbackend = form.getvalue('servbackend')
serv = form.getvalue('serv') serv = form.getvalue('serv')
if servbackend is None: if servbackend is None:

1
app/versions.py
View File

@ -47,6 +47,7 @@ else:
if funct.check_login(service=1): if funct.check_login(service=1):
title = "Working with versions HAProxy configs" title = "Working with versions HAProxy configs"
configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir') configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
servers = sql.get_dick_permit(haproxy=1)
action = "versions.py" action = "versions.py"
if serv is not None and form.getvalue('del') is not None: if serv is not None and form.getvalue('del') is not None:

2
app/viewsttats.py
View File

@ -18,7 +18,7 @@ else:
title = 'HAProxy stats page' title = 'HAProxy stats page'
try: try:
user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1) user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1, haproxy=1)
if serv is None: if serv is None:
first_serv = servers first_serv = servers