From 4ec13eb83e61bbb030bdb0aa048d4405457bf657 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Tue, 27 Sep 2022 22:24:37 +0300 Subject: [PATCH] v6.2.0.0 Changelog: https://roxy-wi.org/changelog#6_2_0 --- app/funct.py | 16 ++++++++++------ app/ha.py | 2 ++ app/history.py | 2 ++ app/login.py | 4 ++-- app/metrics.py | 5 ++++- app/nettools.py | 2 ++ app/portscanner.py | 2 ++ app/provisioning.py | 2 ++ app/runtimeapi.py | 2 ++ app/sections.py | 1 + app/servers.py | 2 ++ app/smon.py | 2 ++ app/sql.py | 11 ++--------- app/statsview.py | 2 ++ app/users.py | 2 ++ app/versions.py | 1 + app/viewlogs.py | 1 + app/waf.py | 20 ++++++++++++++------ 18 files changed, 55 insertions(+), 24 deletions(-) diff --git a/app/funct.py b/app/funct.py index e94b1859..1a6255f9 100644 --- a/app/funct.py +++ b/app/funct.py @@ -1560,17 +1560,21 @@ def get_users_params(**kwargs): try: user_uuid = cookie.get('uuid') user = sql.get_user_name_by_uuid(user_uuid.value) + except Exception as e: + print('') + return + try: role = sql.get_user_role_by_uuid(user_uuid.value) + except Exception as e: + print('') + return + try: user_id = sql.get_user_id_by_uuid(user_uuid.value) user_services = sql.select_user_services(user_id) token = sql.get_token(user_uuid.value) - except Exception: - user = '' - role = '' - user_uuid = '' - user_services = '' - token = '' + except Exception as e: print('') + return if kwargs.get('virt') and kwargs.get('haproxy'): servers = sql.get_dick_permit(virt=1, haproxy=1) diff --git a/app/ha.py b/app/ha.py index 48b1fd0d..59f428ef 100644 --- a/app/ha.py +++ b/app/ha.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) diff --git a/app/history.py b/app/history.py index 797e3912..e6bc877f 100644 --- a/app/history.py +++ b/app/history.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct import sql from jinja2 import Environment, FileSystemLoader diff --git a/app/login.py b/app/login.py index 444e0437..de606bf6 100644 --- a/app/login.py +++ b/app/login.py @@ -180,8 +180,8 @@ if form.getvalue('error'): 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
' +except Exception as e: + error = f'error: {e}' pass try: diff --git a/app/metrics.py b/app/metrics.py index 8a094236..ea098bf3 100644 --- a/app/metrics.py +++ b/app/metrics.py @@ -1,7 +1,10 @@ #!/usr/bin/env python3 +import sys + +import distro + import funct import sql -import distro from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) template = env.get_template('metrics.html') diff --git a/app/nettools.py b/app/nettools.py index e6659be5..b432353c 100644 --- a/app/nettools.py +++ b/app/nettools.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) diff --git a/app/portscanner.py b/app/portscanner.py index 8dad466f..3ae70c7d 100644 --- a/app/portscanner.py +++ b/app/portscanner.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct import sql from jinja2 import Environment, FileSystemLoader diff --git a/app/provisioning.py b/app/provisioning.py index 1740470e..b3f05587 100644 --- a/app/provisioning.py +++ b/app/provisioning.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct import sql from jinja2 import Environment, FileSystemLoader diff --git a/app/runtimeapi.py b/app/runtimeapi.py index 0cb8a09a..5c52fe91 100644 --- a/app/runtimeapi.py +++ b/app/runtimeapi.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) diff --git a/app/sections.py b/app/sections.py index 85da030c..710d6373 100644 --- a/app/sections.py +++ b/app/sections.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import os +import sys from jinja2 import Environment, FileSystemLoader diff --git a/app/servers.py b/app/servers.py index afcf5028..3f465ce5 100644 --- a/app/servers.py +++ b/app/servers.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import pytz import funct diff --git a/app/smon.py b/app/smon.py index f1965b48..4ea21755 100644 --- a/app/smon.py +++ b/app/smon.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct import sql from jinja2 import Environment, FileSystemLoader diff --git a/app/sql.py b/app/sql.py index fa856d59..351a7b51 100755 --- a/app/sql.py +++ b/app/sql.py @@ -5,6 +5,7 @@ import sys import os import funct + from modules.db_model import * @@ -15,15 +16,7 @@ def out_error(error): stk = traceback.extract_tb(exc_tb, 1) function_name = stk[0][2] error = error + ' in function: ' + function_name + ' in file: ' + file_name - print('error: ' + error) - if 'database is locked' not in error: - try: - funct.logging('localhost', error, haproxywi=1, login=1) - except Exception: - try: - funct.logging('localhost', error, haproxywi=1) - except Exception: - pass + raise Exception('error: ' + error) def add_user(user, email, password, role, activeuser, group): diff --git a/app/statsview.py b/app/statsview.py index 0189f430..fda51892 100644 --- a/app/statsview.py +++ b/app/statsview.py @@ -1,4 +1,6 @@ #!/usr/bin/env python3 +import sys + import funct import sql from jinja2 import Environment, FileSystemLoader diff --git a/app/users.py b/app/users.py index 152cc4f7..530e975f 100644 --- a/app/users.py +++ b/app/users.py @@ -1,5 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +import sys + import pytz import funct diff --git a/app/versions.py b/app/versions.py index 50a1246d..d2c3cd30 100644 --- a/app/versions.py +++ b/app/versions.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import os +import sys from jinja2 import Environment, FileSystemLoader diff --git a/app/viewlogs.py b/app/viewlogs.py index 7cb83347..a9030b18 100644 --- a/app/viewlogs.py +++ b/app/viewlogs.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import os +import sys import datetime from jinja2 import Environment, FileSystemLoader diff --git a/app/waf.py b/app/waf.py index d974c7f2..684899e9 100644 --- a/app/waf.py +++ b/app/waf.py @@ -8,6 +8,19 @@ from jinja2 import Environment, FileSystemLoader env = Environment(loader=FileSystemLoader('templates/'), autoescape=True) template = env.get_template('waf.html') +print('Content-type: text/html\n') + +try: + user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1) +except Exception: + pass + +try: + funct.check_login(user_id, token, service=1) +except Exception as e: + print(f'error {e}') + sys.exit() + form = funct.form manage_rules = form.getvalue('manage_rules') waf_rule_id = form.getvalue('waf_rule_id') @@ -21,13 +34,8 @@ config_read = '' rules = '' cfg = '' -print('Content-type: text/html\n') -funct.page_for_admin(level=2) -try: - user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1) -except Exception: - pass +funct.page_for_admin(level=2) if service == 'nginx': funct.check_login(service=2)