From 7c39d4d394ee60c2ed79db5386c236ce08823a28 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 4 Jan 2022 20:12:21 +0300
Subject: [PATCH] v5.3.6.0

Changelog: https://haproxy-wi.org/changelog.py#5_3_6
---
 app/funct.py                                          |  1 +
 .../ansible/roles/haproxy/tasks/installation.yml      |  3 ++-
 app/sql.py                                            | 11 ++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/funct.py b/app/funct.py
index 0c0b72b7..1b4a954f 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -12,6 +12,7 @@ def is_ip_or_dns(server_from_request: str) -> str:
 		if ('roxy-wi' in server_from_request or
 			'fail2ban' in server_from_request or
 			'prometheus' in server_from_request or
+			'all' in server_from_request or
 			'grafana-server' in server_from_request):
 			return server_from_request
 		if re.match(ip_regex, server_from_request):
diff --git a/app/scripts/ansible/roles/haproxy/tasks/installation.yml b/app/scripts/ansible/roles/haproxy/tasks/installation.yml
index b73e1c9c..0061ade0 100644
--- a/app/scripts/ansible/roles/haproxy/tasks/installation.yml
+++ b/app/scripts/ansible/roles/haproxy/tasks/installation.yml
@@ -79,4 +79,5 @@
     daemon_reload: yes
     state: started
     enabled: yes
-    force: no
+    force: yes
+  ignore_errors: yes
diff --git a/app/sql.py b/app/sql.py
index e9652df7..eb50dcc2 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -740,16 +740,21 @@ def get_slack_by_id(slack_id):
 def get_dick_permit(**kwargs):
 	import http.cookies
 	import os
+
 	if kwargs.get('username'):
 		grp = kwargs.get('group_id')
 	else:
-		cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
-		group = cookie.get('group')
-		grp = group.value
+		try:
+			cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
+			group = cookie.get('group')
+			grp = group.value
+		except Exception as e:
+			print('error: ' + str(e))
 	if kwargs.get('token'):
 		token = kwargs.get('token')
 	else:
 		token = ''
+
 	only_group = kwargs.get('only_group')
 	disable = 'enable = 1'
 	haproxy = ''