v4.4.2.0

Changelog: https://haproxy-wi.org/changelog.py#4_4_2

app/add.py

@@ -222,6 +222,7 @@ if form.getvalue('new_userlist') is not None:
 	config_add = "\n" + name + new_userlist_groups + new_users_list
 	
 try:
+	funct.check_is_server_in_group(serv)
 	if config_add:
 		hap_configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
 		cfg = hap_configs_dir + serv + "-" + funct.get_data('config') + ".cfg"
@@ -250,5 +251,3 @@ try:
 		print('</div>')
 except:
 	pass
-
-	

app/funct.py

@@ -1157,7 +1157,21 @@ def check_user_group(**kwargs):
 	if sql.check_user_group(user_id, group_id):
 		return True
 	else:
-		logging('localhost', ' has tried to actions in not own group ', haproxywi=1, login=1)
+		logging('localhost', ' has tried to actions in not his group ', haproxywi=1, login=1)
+		print('Atata!')
+		sys.exit()
+		return False
+
+
+def check_is_server_in_group(serv):
+	import sql
+	group_id = get_user_group(id=1)
+	servers = sql.select_servers(server=serv)
+	for s in servers:
+		if s[2] == serv and int(s[3]) == int(group_id):
+			return True
+		else:
+			logging('localhost', ' has tried to actions in not his group server ', haproxywi=1, login=1)
 			print('Atata!')
 			sys.exit()
 			return False
@@ -1166,3 +1180,4 @@ def check_user_group(**kwargs):
 def check_service(serv, service_name):
 	commands = [ "systemctl status "+service_name+" |grep Active |awk '{print $1}'" ]
 	return ssh_command(serv, commands)
+

app/hapservers.py

@@ -26,6 +26,7 @@ if service == 'nginx':
 	servers = sql.get_dick_permit(virt=1, nginx=1)
 	service = 'nginx'
 	if serv:
+		if funct.check_is_server_in_group(serv):
 			servers = sql.select_servers(server=serv)
 			autorefresh = 1
 else:
@@ -34,6 +35,7 @@ else:
 	keep_alive, stderr = funct.subprocess_execute(cmd)
 	service = 'haproxy'
 	if serv:
+		if funct.check_is_server_in_group(serv):
 			servers = sql.select_servers(server=serv)
 			autorefresh = 1
 	else:

app/overview.py

@@ -18,10 +18,7 @@ funct.check_login()
 try:
 	user, user_id, role, token, servers = funct.get_users_params()
 	groups = sql.select_groups()
-	import http.cookies
+	user_group = funct.get_user_group(id=1)
-	cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
-	group = cookie.get('group')
-	user_group = group.value
 
 	if (role == 2 or role == 3) and int(user_group) != 1:
 		users = sql.select_users(group=user_group)