v6.2.0.0

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

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('<meta http-equiv="refresh" content="0; url=/app/login.py">')
+		return
+	try:
 		role = sql.get_user_role_by_uuid(user_uuid.value)
+	except Exception as e:
+		print('<meta http-equiv="refresh" content="0; url=/app/login.py">')
+		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:
+	except Exception as e:
-		user = ''
-		role = ''
-		user_uuid = ''
-		user_services = ''
-		token = ''
 		print('<meta http-equiv="refresh" content="0; url=/app/login.py">')
+		return
 
 	if kwargs.get('virt') and kwargs.get('haproxy'):
 		servers = sql.get_dick_permit(virt=1, haproxy=1)

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)

app/history.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import funct
 import sql
 from jinja2 import Environment, FileSystemLoader

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:
+except Exception as e:
-	error = '<center><div class="alert alert-danger">Cannot find "session_ttl" parameter. Check it into settings, "main" section</div>'
+	error = f'error: {e}'
 	pass
 
 try:

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')

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)

app/portscanner.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import funct
 import sql
 from jinja2 import Environment, FileSystemLoader

app/provisioning.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import funct
 import sql
 from jinja2 import Environment, FileSystemLoader

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)

app/sections.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+import sys
 
 from jinja2 import Environment, FileSystemLoader
 

app/servers.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import pytz
 
 import funct

app/smon.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import funct
 import sql
 from jinja2 import Environment, FileSystemLoader

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)
+	raise Exception('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
 
 
 def add_user(user, email, password, role, activeuser, group):

app/statsview.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import sys
+
 import funct
 import sql
 from jinja2 import Environment, FileSystemLoader

app/users.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import sys
+
 import pytz
 
 import funct

app/versions.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+import sys
 
 from jinja2 import Environment, FileSystemLoader
 

app/viewlogs.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+import sys
 import datetime
 
 from jinja2 import Environment, FileSystemLoader

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:
+funct.page_for_admin(level=2)
-	user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1)
-except Exception:
-	pass
 
 if service == 'nginx':
 	funct.check_login(service=2)