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

v6.0.2.0 

Changelog: https://roxy-wi.org/changelog.py#6_0_2
pull/328/head
Pavel Loginov 2022-05-24 23:20:24 +03:00
parent 8988e1a00e
commit 4fa061df97
10 changed files with 61 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/api.py
View File

@ -5,11 +5,12 @@ import os
import sys
from bottle import route, run, hook, response, request, error
import api_funct
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
os.chdir(os.path.dirname(os.path.abspath(__file__)))
sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app/'))
import api_funct
import sql
_error_auth = '403 Auth before'

12
app/add.py
View File

@ -16,10 +16,10 @@ funct.check_login(service=1)
funct.page_for_admin(level=3)
if (
form.getvalue('mode') is None
and form.getvalue('new_userlist') is None
and form.getvalue('peers-name') is None
and form.getvalue('generateconfig') is None
form.getvalue('mode') is None and
form.getvalue('new_userlist') is None and
form.getvalue('peers-name') is None and
form.getvalue('generateconfig') is None
):
try:
user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1)
@ -29,8 +29,8 @@ if (
except Exception as e:
print(str(e))
dir = os.path.dirname(os.getcwd())+ "/" + sql.get_setting('lists_path')
white_dir = os.path.dirname(os.getcwd())+ "/" + sql.get_setting('lists_path') + "/" + user_group + "/white"
dir = os.path.dirname(os.getcwd()) + "/" + sql.get_setting('lists_path')
white_dir = os.path.dirname(os.getcwd()) + "/" + sql.get_setting('lists_path') + "/" + user_group + "/white"
black_dir = os.path.dirname(os.getcwd()) + "/" + sql.get_setting('lists_path') + "/" + user_group + "/black"
if not os.path.exists(dir):

17
app/history.py
View File

@ -75,17 +75,8 @@ elif service == 'user':
users = sql.select_users()
template = template.render(
h2=1,
autorefresh=0,
title=title,
role=role,
user=user,
users=users,
serv=serv,
service=service,
history=history,
user_services=user_services,
token=token
rendered_template = template.render(
h2=1, autorefresh=0, title=title, role=role, user=user, users=users, serv=serv, service=service,
history=history, user_services=user_services, token=token
)
print(template)
print(rendered_template)

2
app/login.py
View File

@ -148,7 +148,7 @@ def check_in_ldap(user, password):
attributes = [ldap_search_field]
result = ldap_bind.search_s(ldap_base, ldap.SCOPE_SUBTREE, criteria, attributes)
bind = l.simple_bind_s(result[0][0], password)
bind = ldap_bind.simple_bind_s(result[0][0], password)
except ldap.INVALID_CREDENTIALS:
print("Content-type: text/html\n")
print('<center><div class="alert alert-danger">Invalid credentials</div><br /><br />')

2
app/overview.py
View File

@ -78,7 +78,7 @@ try:
cmd = "systemctl is-active roxy-wi-socket"
socket, stderr = funct.subprocess_execute(cmd)
except Exception as e:
except Exception:
role = ''
user = ''
users = ''

31
app/servers.py
View File

@ -26,25 +26,12 @@ except Exception as e:
user_status, user_plan = 0, 0
funct.logging('localhost', 'Cannot get a user plan: ' + str(e), haproxywi=1)
output_from_parsed_template = template.render(title="Servers: ",
role=role,
user=user,
users=sql.select_users(group=user_group),
groups=sql.select_groups(),
servers=sql.get_dick_permit(virt=1, disable=0, only_group=1),
roles=sql.select_roles(),
masters=sql.select_servers(get_master_servers=1, uuid=user_id.value),
group=user_group,
sshs=sql.select_ssh(group=user_group),
token=token,
settings=settings,
backups=sql.select_backups(),
page="servers.py",
geoip_country_codes=geoip_country_codes,
user_services=user_services,
ldap_enable=ldap_enable,
user_status=user_status,
user_plan=user_plan,
gits=gits,
services=services)
print(output_from_parsed_template)
rendered_template = template.render(
title="Servers: ", role=role, user=user, users=sql.select_users(group=user_group), groups=sql.select_groups(),
servers=sql.get_dick_permit(virt=1, disable=0, only_group=1), roles=sql.select_roles(),
masters=sql.select_servers(get_master_servers=1, uuid=user_id.value), group=user_group,
sshs=sql.select_ssh(group=user_group), token=token, settings=settings, backups=sql.select_backups(),
page="servers.py", geoip_country_codes=geoip_country_codes, user_services=user_services, ldap_enable=ldap_enable,
user_status=user_status, user_plan=user_plan, gits=gits, services=services
)
print(rendered_template)

26
app/smon.py
View File

@ -19,7 +19,7 @@ try:
cmd = "systemctl is-active roxy-wi-smon"
smon_status, stderr = funct.subprocess_execute(cmd)
except Exception as e:
pass
print(str(e))
if action == 'add':
smon = sql.select_smon(user_group, action='add')
@ -48,20 +48,10 @@ except Exception as e:
user_status, user_plan = 0, 0
funct.logging('localhost', 'Cannot get a user plan: ' + str(e), haproxywi=1)
template = template.render(h2=1, title=title,
autorefresh=autorefresh,
role=role,
user=user,
group=user_group,
telegrams=sql.get_user_telegram_by_group(user_group),
slacks=sql.get_user_slack_by_group(user_group),
smon=smon,
smon_status=smon_status,
smon_error=stderr,
action=action,
sort=sort,
user_services=user_services,
user_status=user_status,
user_plan=user_plan,
token=token)
print(template)
rendered_template = template.render(
h2=1, title=title, autorefresh=autorefresh, role=role, user=user, group=user_group,
telegrams=sql.get_user_telegram_by_group(user_group), slacks=sql.get_user_slack_by_group(user_group),
smon=smon, smon_status=smon_status, smon_error=stderr, action=action, sort=sort, user_services=user_services,
user_status=user_status, user_plan=user_plan, token=token
)
print(rendered_template)

30
app/users.py
View File

@ -30,25 +30,11 @@ except Exception as e:
user_status, user_plan = 0, 0
funct.logging('localhost', 'Cannot get a user plan: ' + str(e), haproxywi=1)
template = template.render(title="Admin area: Manage users",
role=role,
user=user,
users=users,
groups=sql.select_groups(),
servers=sql.select_servers(full=1),
roles=sql.select_roles(),
masters=sql.select_servers(get_master_servers=1),
sshs=sql.select_ssh(),
token=token,
settings=settings,
backups=sql.select_backups(),
grafana=''.join(grafana),
page="users.py",
user_services=user_services,
ldap_enable=ldap_enable,
user_status=user_status,
user_plan=user_plan,
gits=gits,
services=services)
print(template)
rendered_template = template.render(
title="Admin area: Manage users", role=role, user=user, users=users, groups=sql.select_groups(),
servers=sql.select_servers(full=1), roles=sql.select_roles(), masters=sql.select_servers(get_master_servers=1),
sshs=sql.select_ssh(), token=token, settings=settings, backups=sql.select_backups(), grafana=''.join(grafana),
page="users.py", user_services=user_services, ldap_enable=ldap_enable, user_status=user_status,
user_plan=user_plan, gits=gits, services=services
)
print(rendered_template)

40
app/versions.py
View File

@ -1,6 +1,8 @@
#!/usr/bin/env python3
import os
import funct, sql
import funct
import sql
from jinja2 import Environment, FileSystemLoader
env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
template = env.get_template('delver.html')
@ -77,11 +79,11 @@ if serv is not None and form.getvalue('del') is not None:
try:
file.add(form.getvalue(get) + "<br />")
funct.logging(serv, "Version of config has been deleted: %s" % form.getvalue(get), login=1,
keep_history=1, service=service)
keep_history=1, service=service)
except Exception:
pass
except OSError as e:
stderr = "Error: %s - %s." % (e.filename,e.strerror)
stderr = "Error: %s - %s." % (e.filename, e.strerror)
if serv is not None and form.getvalue('config') is not None:
configver = configs_dir + configver
@ -89,8 +91,9 @@ if serv is not None and form.getvalue('config') is not None:
aftersave = 1
try:
funct.logging(serv, "Version of config has been uploaded %s" % configver, login=1,
keep_history=1, service=service)
funct.logging(
serv, "Version of config has been uploaded %s" % configver, login=1, keep_history=1, service=service
)
except Exception:
pass
@ -104,22 +107,11 @@ if serv is not None and form.getvalue('config') is not None:
stderr = funct.master_slave_upload_and_restart(serv, configver, just_save=save, apache=1, config_file_name=config_file_name)
else:
stderr = funct.master_slave_upload_and_restart(serv, configver, just_save=save)
template = template.render(h2=1, title=title,
role=role,
user=user,
select_id="serv",
serv=serv,
aftersave=aftersave,
selects=servers,
stderr=stderr,
open=form.getvalue('open'),
Select=form.getvalue('del'),
file=file,
configver=configver,
service=service,
user_services=user_services,
action=action,
token=token)
print(template)
rendered_template = template.render(
h2=1, title=title, role=role, user=user, select_id="serv", serv=serv, aftersave=aftersave, selects=servers,
stderr=stderr, open=form.getvalue('open'), Select=form.getvalue('del'), file=file, configver=configver,
service=service, user_services=user_services, action=action, token=token
)
print(rendered_template)

22
app/waf.py
View File

@ -50,19 +50,9 @@ else:
servers_waf = sql.select_waf_servers_metrics(user_id.value)
autorefresh = 1
template = template.render(h2=1, title=title,
autorefresh=autorefresh,
role=role,
user=user,
serv=serv,
servers=servers_waf,
servers_all=servers,
manage_rules=manage_rules,
rules=rules,
user_services=user_services,
waf_rule_file=waf_rule_file,
waf_rule_id=waf_rule_id,
config=config_read,
cfg=cfg,
token=token)
print(template)
rendered_template = template.render(
h2=1, title=title, autorefresh=autorefresh, role=role, user=user, serv=serv, servers=servers_waf,
servers_all=servers, manage_rules=manage_rules, rules=rules, user_services=user_services,
waf_rule_file=waf_rule_file, waf_rule_id=waf_rule_id, config=config_read, cfg=cfg, token=token
)
print(rendered_template)