diff --git a/app/login.py b/app/login.py index 7bde7c29..1d823658 100644 --- a/app/login.py +++ b/app/login.py @@ -114,7 +114,7 @@ def ban(): c["ban"]["Secure"] = "True" c["ban"]["expires"] = expires.strftime("%a, %d %b %Y %H:%M:%S GMT") try: - funct.logging('localhost', login+' failed log in', haproxywi=1, login=1) + funct.logging('localhost', login + ' failed log in', haproxywi=1, login=1) except Exception: funct.logging('localhost', ' Failed log in. Wrong username', haproxywi=1) print(c.output()) @@ -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 - l.set_option(ldap.OPT_REFERRALS, 0) + ldap_bind.protocol_version = ldap.VERSION3 + 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+"))" + 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 = '
Cannot find "session_ttl" parameter. ' \ - 'Check it into settings, "main" section
' + error = '
Cannot find "session_ttl" parameter. Check it into settings, "main" section
' pass try: @@ -229,15 +228,11 @@ if login is not None and password is not None: if login is None: print("Content-type: text/html\n") - + create_db.update_all_silent() -output_from_parsed_template = template.render(h2=0, title="Login page", - role=role, - user=user, - error_log=error_log, - error=error, - ref=ref, - versions=funct.versions(), - db_create=db_create) +output_from_parsed_template = template.render( + h2=0, title="Login page", role=role, user=user, error_log=error_log, error=error, ref=ref, + versions=funct.versions(), db_create=db_create +) print(output_from_parsed_template) diff --git a/app/logs.py b/app/logs.py index 17abfa8f..7e15b919 100644 --- a/app/logs.py +++ b/app/logs.py @@ -10,10 +10,9 @@ if form.getvalue('grep') is None: grep = "" else: grep = form.getvalue('grep') - exgrep = form.getvalue('exgrep') if form.getvalue('exgrep') else '' - + if form.getvalue('rows') is None: rows = 10 else: @@ -21,14 +20,14 @@ else: rows = form.getvalue('rows1') else: rows = form.getvalue('rows') - + hour = form.getvalue('hour') hour1 = form.getvalue('hour1') minut = form.getvalue('minut') minut1 = form.getvalue('minut1') waf = form.getvalue('waf') service = form.getvalue('service') - + print('Content-type: text/html\n') funct.check_login() @@ -54,23 +53,9 @@ else: title = "HAProxy`s logs" servers = sql.get_dick_permit(haproxy=1) -template = template.render(h2=1, - autorefresh=1, - title=title, - role=role, - 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) +template = template.render( + h2=1, autorefresh=1, title=title, role=role, 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) diff --git a/app/metrics.py b/app/metrics.py index 8704cd87..df7129e6 100644 --- a/app/metrics.py +++ b/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, - autorefresh=1, - role=role, - user=user, - servers=servers, - services=services, - user_services=user_services, - service=service, - user_status=user_status, - user_plan=user_plan, - token=token) +template = template.render( + h2=1, title=title, autorefresh=1, role=role, user=user, servers=servers, services=services, + user_services=user_services, service=service, user_status=user_status, user_plan=user_plan, token=token +) print(template) diff --git a/app/overview.py b/app/overview.py index a7df05e7..feccf2c7 100644 --- a/app/overview.py +++ b/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') @@ -24,7 +25,7 @@ try: for s in servers: if i != servers_len: - servers_for_grep += s[2]+'\|' + servers_for_grep += s[2] + '\|' else: servers_for_grep += s[2] @@ -100,34 +101,18 @@ except Exception as e: token = '' -template = template.render(h2=1, - autorefresh=1, - title="Overview", - role=role, - user=user, - 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"), - error=stderr, - haproxy_wi_log=funct.haproxy_wi_log(), - servers=servers, - is_checker_worker=is_checker_worker, - is_metrics_worker=is_metrics_worker, - host=host, - user_services=user_services, - token=token) -print(template) +rendered_template = template.render( + h2=1, autorefresh=1, title="Overview", role=role, user=user, 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"), error=stderr, + haproxy_wi_log=funct.haproxy_wi_log(), servers=servers, is_checker_worker=is_checker_worker, + is_metrics_worker=is_metrics_worker, host=host, user_services=user_services, token=token +) +print(rendered_template) diff --git a/app/portscanner.py b/app/portscanner.py index d9179d08..edbdc0d3 100644 --- a/app/portscanner.py +++ b/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, - title=title, - role=role, - user=user, - servers=servers, - port_scanner_settings=port_scanner_settings, - 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) +rendered_template = template.render( + h2=1, autorefresh=0, title=title, role=role, user=user, servers=servers, port_scanner_settings=port_scanner_settings, + 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(rendered_template) diff --git a/app/provisioning.py b/app/provisioning.py index c24b873e..eeecee1a 100644 --- a/app/provisioning.py +++ b/app/provisioning.py @@ -12,9 +12,9 @@ funct.page_for_admin(level=2) try: user, user_id, role, token, servers, user_services = funct.get_users_params() if role == 1: - groups=sql.select_groups() + groups = sql.select_groups() else: - groups=funct.get_user_group(id=1) + groups = funct.get_user_group(id=1) user_group = funct.get_user_group(id=1) cmd = 'which terraform' @@ -28,15 +28,9 @@ try: except Exception as e: print(str(e)) - -output_from_parsed_template = template.render(title="Servers provisioning", - role=role, - user=user, - groups=groups, - user_group=user_group, - 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) +rendered_template = template.render( + title="Servers provisioning", role=role, user=user, groups=groups, user_group=user_group, + servers=sql.select_provisioned_servers(), providers=sql.select_providers(user_group), + is_terraform=is_terraform, user_services=user_services, token=token +) +print(rendered_template) diff --git a/app/runtimeapi.py b/app/runtimeapi.py index 5f0b9f8a..596553ec 100644 --- a/app/runtimeapi.py +++ b/app/runtimeapi.py @@ -17,14 +17,8 @@ try: except Exception: pass - -template = template.render(h2=0, - title="RunTime API", - role=role, - user=user, - select_id="serv", - selects=servers, - token=token, - user_services=user_services, - servbackend=servbackend) -print(template) +rendered_template = template.render( + h2=0, title="RunTime API", role=role, user=user, select_id="serv", selects=servers, token=token, + user_services=user_services, servbackend=servbackend +) +print(rendered_template) diff --git a/app/sections.py b/app/sections.py index a3297d1b..29aed6b0 100644 --- a/app/sections.py +++ b/app/sections.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import os + import sql import funct from jinja2 import Environment, FileSystemLoader @@ -35,22 +36,22 @@ if serv is not None and open is not None: sections = funct.get_sections(cfg) if serv is not None and section is not None: - + try: funct.logging(serv, "sections.py open config") except Exception: pass - + start_line, end_line, config_read = funct.get_section_from_config(cfg, section) - os.system("/bin/mv %s %s.old" % (cfg, cfg)) + os.system("/bin/mv %s %s.old" % (cfg, cfg)) if serv is not None and form.getvalue('config') is not None: try: funct.logging(serv, "sections.py edited config") except Exception: pass - + config = form.getvalue('config') oldcfg = form.getvalue('oldconfig') save = form.getvalue('save') @@ -62,40 +63,27 @@ if serv is not None and form.getvalue('config') is not None: config = '' config = funct.rewrite_section(start_line, end_line, oldcfg, config) - + try: with open(cfg, "w") as conf: conf.write(config) except IOError: error = "Can't read import config file" - + stderr = funct.master_slave_upload_and_restart(serv, cfg, just_save=save, oldcfg=oldcfg) if "is valid" in stderr: stderr = '' - + funct.diff_config(oldcfg, cfg) - + os.system("/bin/rm -f " + hap_configs_dir + "*.old") -template = template.render(h2=1, title="Working with HAProxy configs", - role=role, - action="sections.py", - user=user, - select_id="serv", - serv=serv, - aftersave=aftersave, - 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) +rendered_template = template.render( + h2=1, title="Working with HAProxy config sections", role=role, action="sections.py", user=user, select_id="serv", + serv=serv, aftersave=aftersave, 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(rendered_template)