From acdf08ee74333c5275d9dc9aa0d18b1cb7c5b5a2 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 26 Oct 2021 20:26:19 +0600
Subject: [PATCH] v5.3.1.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_1
---
 app/funct.py           | 21 +++++++++++++++------
 app/templates/ovw.html |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/funct.py b/app/funct.py
index 3bf8773d..6fb61e49 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -9,7 +9,10 @@ def is_ip_or_dns(server_from_request: str) -> str:
 	ip_regex = "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
 	dns_regex = "^(?!-)[A-Za-z0-9-]+([\\-\\.]{1}[a-z0-9]+)*\\.[A-Za-z]{2,6}$"
 	try:
-		if 'roxy-wi' in server_from_request:
+		if ('roxy-wi' in server_from_request or
+			'fail2ban' in server_from_request or
+			'prometheus' in server_from_request or
+			'grafana-server' in server_from_request):
 			return server_from_request
 		if re.match(ip_regex, server_from_request):
 			return server_from_request
@@ -1456,11 +1459,17 @@ def get_users_params(**kwargs):
 	import sql
 	cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
 	user_uuid = cookie.get('uuid')
-	user = sql.get_user_name_by_uuid(user_uuid.value)
-	role = sql.get_user_role_by_uuid(user_uuid.value)
-	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)
+	try:
+		user = sql.get_user_name_by_uuid(user_uuid.value)
+		role = sql.get_user_role_by_uuid(user_uuid.value)
+		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:
+		user = ''
+		role = ''
+		user_services = ''
+		token = ''
 	if kwargs.get('virt'):
 		servers = sql.get_dick_permit(virt=1)
 	elif kwargs.get('disable'):
diff --git a/app/templates/ovw.html b/app/templates/ovw.html
index 8e0eb969..980593c3 100644
--- a/app/templates/ovw.html
+++ b/app/templates/ovw.html
@@ -39,7 +39,7 @@
 			</a>
 		</td>
 		<td class="padding10">
-			<a href="/app/hapservers.py?service=keepalived" title="Nginx servers overview" class="logs_link">
+			<a href="/app/hapservers.py?service=keepalived" title="Keepalived servers overview" class="logs_link">
 				Keepalived
 			</a>
 		</td>