v6.0.2.0

Changelog: https://roxy-wi.org/changelog.py#6_0_2

app/login.py

@@ -137,16 +137,16 @@ def check_in_ldap(user, password):
 
 	ldap_proto = 'ldap' if ldap_type == "0" else 'ldaps'
 
-	l = ldap.initialize('{}://{}:{}/'.format(ldap_proto, server, port))
+	ldap_bind = ldap.initialize('{}://{}:{}/'.format(ldap_proto, server, port))
 	try:
-		l.protocol_version = ldap.VERSION3
+		ldap_bind.protocol_version = ldap.VERSION3
-		l.set_option(ldap.OPT_REFERRALS, 0)
+		ldap_bind.set_option(ldap.OPT_REFERRALS, 0)
 
-		bind = l.simple_bind_s(root_user, root_password)
+		bind = ldap_bind.simple_bind_s(root_user, root_password)
 
 		criteria = "(&(objectClass=" + ldap_class_search + ")(" + ldap_user_attribute + "=" + user + "))"
 		attributes = [ldap_search_field]
-		result = l.search_s(ldap_base, ldap.SCOPE_SUBTREE, criteria, attributes)
+		result = ldap_bind.search_s(ldap_base, ldap.SCOPE_SUBTREE, criteria, attributes)
 
 		bind = l.simple_bind_s(result[0][0], password)
 	except ldap.INVALID_CREDENTIALS:
@@ -180,8 +180,7 @@ try:
 	if sql.get_setting('session_ttl'):
 		session_ttl = sql.get_setting('session_ttl')
 except Exception:
-	error = '<center><div class="alert alert-danger">Cannot find "session_ttl" parameter. ' \
+	error = '<center><div class="alert alert-danger">Cannot find "session_ttl" parameter. Check it into settings, "main" section</div>'
-			'Check it into settings, "main" section</div>'
 	pass
 
 try:
@@ -232,12 +231,8 @@ if login is None:
 
 create_db.update_all_silent()
 
-output_from_parsed_template = template.render(h2=0, title="Login page",
+output_from_parsed_template = template.render(
-													role=role,
+	h2=0, title="Login page", role=role, user=user, error_log=error_log, error=error, ref=ref,
-													user=user,
+	versions=funct.versions(), db_create=db_create
-													error_log=error_log,
+)
-													error=error,
-													ref=ref,
-													versions=funct.versions(),
-													db_create=db_create)
 print(output_from_parsed_template)

app/logs.py

@@ -11,7 +11,6 @@ if form.getvalue('grep') is None:
 else:
 	grep = form.getvalue('grep')
 
-
 exgrep = form.getvalue('exgrep') if form.getvalue('exgrep') else ''
 
 if form.getvalue('rows') is None:
@@ -54,23 +53,9 @@ else:
 		title = "HAProxy`s logs"
 		servers = sql.get_dick_permit(haproxy=1)
 
-template = template.render(h2=1,
+template = template.render(
-							autorefresh=1,
+	h2=1, autorefresh=1, title=title, role=role, user=user, select_id="serv", selects=servers,
-							title=title,
+	serv=form.getvalue('serv'), rows=rows, grep=grep, exgrep=exgrep, hour=hour, hour1=hour1, minut=minut,
-							role=role,
+	minut1=minut1, waf=waf, service=service, user_services=user_services, token=token
-							user=user,
+)
-							select_id="serv",
-							selects=servers,
-							serv=form.getvalue('serv'),
-							rows=rows,
-							grep=grep,
-							exgrep=exgrep,
-							hour=hour,
-							hour1=hour1,
-							minut=minut,
-							minut1=minut1,
-							waf=waf,
-							service=service,
-							user_services=user_services,
-							token=token)
 print(template)

app/metrics.py

@@ -34,7 +34,7 @@ try:
 					title = "HAProxy`s metrics"
 					servers = sql.select_servers_metrics()
 			services = '1'
-except Exception as e:
+except Exception:
 	pass
 
 try:
@@ -44,15 +44,8 @@ except Exception as e:
 	funct.logging('localhost', 'Cannot get a user plan: ' + str(e), haproxywi=1)
 
 
-template = template.render(h2=1, title=title,
+template = template.render(
-							autorefresh=1,
+	h2=1, title=title, autorefresh=1, role=role, user=user, servers=servers, services=services,
-							role=role,
+	user_services=user_services, service=service, user_status=user_status, user_plan=user_plan, token=token
-							user=user,
+)
-							servers=servers,
-							services=services,
-							user_services=user_services,
-							service=service,
-							user_status=user_status,
-							user_plan=user_plan,
-							token=token)
 print(template)

app/overview.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import os
+
 import funct
 import sql
-import create_db
+
-import os
 from jinja2 import Environment, FileSystemLoader
 env = Environment(loader=FileSystemLoader('templates/'), autoescape=True)
 template = env.get_template('ovw.html')
@@ -100,34 +101,18 @@ except Exception as e:
 	token = ''
 
 
-template = template.render(h2=1,
+rendered_template = template.render(
-							autorefresh=1,
+	h2=1, autorefresh=1, title="Overview", role=role, user=user, groups=groups, roles=sql.select_roles(),
-							title="Overview",
+	metrics_master=''.join(metrics_master), metrics_worker=''.join(metrics_worker), checker_master=''.join(checker_master),
-							role=role,
+	checker_worker=''.join(checker_worker), keep_alive=''.join(keep_alive), smon=''.join(smon),
-							user=user,
+	port_scanner=''.join(port_scanner), grafana=''.join(grafana), socket=''.join(socket),
-							groups=groups,
-							roles=sql.select_roles(),
-							metrics_master=''.join(metrics_master),
-							metrics_worker=''.join(metrics_worker),
-							checker_master=''.join(checker_master),
-							checker_worker=''.join(checker_worker),
-							keep_alive=''.join(keep_alive),
-							smon=''.join(smon),
-							port_scanner=''.join(port_scanner),
-							grafana=''.join(grafana),
-							socket=''.join(socket),
 	haproxy_wi_log_id=funct.haproxy_wi_log(log_id=1, file="roxy-wi-", with_date=1),
 	metrics_log_id=funct.haproxy_wi_log(log_id=1, file="metrics", with_date=1),
 	checker_log_id=funct.haproxy_wi_log(log_id=1, file="checker", with_date=1),
 	keep_alive_log_id=funct.haproxy_wi_log(log_id=1, file="keep_alive"),
 	socket_log_id=funct.haproxy_wi_log(log_id=1, file="socket"),
-							metrics_error_log_id=funct.haproxy_wi_log(log_id=1, file="metrics-error"),
+	metrics_error_log_id=funct.haproxy_wi_log(log_id=1, file="metrics-error"), error=stderr,
-							error=stderr,
+	haproxy_wi_log=funct.haproxy_wi_log(), servers=servers, is_checker_worker=is_checker_worker,
-							haproxy_wi_log=funct.haproxy_wi_log(),
+	is_metrics_worker=is_metrics_worker, host=host, user_services=user_services, token=token
-							servers=servers,
+)
-							is_checker_worker=is_checker_worker,
+print(rendered_template)
-							is_metrics_worker=is_metrics_worker,
-							host=host,
-							user_services=user_services,
-							token=token)
-print(template)

app/portscanner.py

@@ -48,18 +48,9 @@ except Exception as e:
     funct.logging('localhost', 'Cannot get a user plan: ' + str(e), haproxywi=1)
 
 
-output_from_parsed_template = template.render(h2=1, autorefresh=0,
+rendered_template = template.render(
-                                                title=title,
+    h2=1, autorefresh=0, title=title, role=role, user=user, servers=servers, port_scanner_settings=port_scanner_settings,
-                                                role=role,
+    count_ports=count_ports, history=history, port_scanner=''.join(port_scanner), port_scanner_stderr=port_scanner_stderr,
-                                                user=user,
+    user_services=user_services, user_status=user_status, user_plan=user_plan, token=token
-                                                servers=servers,
+)
-                                                port_scanner_settings=port_scanner_settings,
+print(rendered_template)
-                                                count_ports=count_ports,
-                                                history=history,
-                                                port_scanner=''.join(port_scanner),
-                                                port_scanner_stderr=port_scanner_stderr,
-                                                user_services=user_services,
-                                                user_status=user_status,
-                                                user_plan=user_plan,
-                                                token=token)
-print(output_from_parsed_template)

app/provisioning.py

@@ -28,15 +28,9 @@ try:
 except Exception as e:
     print(str(e))
 
-
+rendered_template = template.render(
-output_from_parsed_template = template.render(title="Servers provisioning",
+    title="Servers provisioning", role=role, user=user, groups=groups, user_group=user_group,
-												role=role,
+    servers=sql.select_provisioned_servers(), providers=sql.select_providers(user_group),
-												user=user,
+    is_terraform=is_terraform, user_services=user_services, token=token
-                                                groups=groups,
+)
-                                                user_group=user_group,
+print(rendered_template)
-                                                servers=sql.select_provisioned_servers(),
-                                                providers=sql.select_providers(user_group),
-                                                is_terraform=is_terraform,
-                                                user_services=user_services,
-												token=token)
-print(output_from_parsed_template)

app/runtimeapi.py

@@ -17,14 +17,8 @@ try:
 except Exception:
 	pass
 
-
+rendered_template = template.render(
-template = template.render(h2=0,
+	h2=0, title="RunTime API", role=role, user=user, select_id="serv", selects=servers, token=token,
-							title="RunTime API",
+	user_services=user_services, servbackend=servbackend
-							role=role,
+)
-							user=user,
+print(rendered_template)
-							select_id="serv",
-							selects=servers,
-							token=token,
-							user_services=user_services,
-							servbackend=servbackend)
-print(template)

app/sections.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+
 import sql
 import funct
 from jinja2 import Environment, FileSystemLoader
@@ -79,23 +80,10 @@ if serv is not None and form.getvalue('config') is not None:
 	os.system("/bin/rm -f " + hap_configs_dir + "*.old")
 
 
-template = template.render(h2=1, title="Working with HAProxy configs",
+rendered_template = template.render(
-							role=role,
+	h2=1, title="Working with HAProxy config sections", role=role, action="sections.py", user=user, select_id="serv",
-							action="sections.py",
+	serv=serv, aftersave=aftersave, config=config_read, cfg=cfg, selects=servers, stderr=stderr, error=error,
-							user=user,
+	start_line=start_line, end_line=end_line, section=section, sections=sections, is_serv_protected=is_serv_protected,
-							select_id="serv",
+	user_services=user_services, token=token
-							serv=serv,
+)
-							aftersave=aftersave,
+print(rendered_template)
-							config=config_read,
-							cfg=cfg,
-							selects=servers,
-							stderr=stderr,
-							error=error,
-							start_line=start_line,
-							end_line=end_line,
-							section=section,
-							sections=sections,
-							is_serv_protected=is_serv_protected,
-							user_services=user_services,
-							token=token)
-print(template)