v7.0.0.0

Changelog: https://roxy-wi.org/changelog#7.0.0

app/login.py

@@ -82,7 +82,7 @@ def login_page():
                     user_uuid, user_token = roxywi_auth.create_uuid_and_token(login)
                     return roxywi_auth.do_login(user_uuid, str(user.groups), user, next_url)
                 else:
-                    return 'Login or password is not correct'
+                    return 'ban', 200
         else:
             return 'ban', 200
 

app/modules/db/sql.py

@@ -533,6 +533,15 @@ def select_server_id_by_ip(server_ip):
 		return server_id
 
 
+def select_server_name_by_ip(server_ip):
+	try:
+		server_name = Server.get(Server.ip == server_ip).hostname
+	except Exception:
+		return None
+	else:
+		return server_name
+
+
 def select_server_group_by_ip(server_ip):
 	try:
 		groups = Server.get(Server.ip == server_ip).groups
@@ -2396,8 +2405,6 @@ def select_update_keep_alive_restart(server_id: int, service: str) -> int:
 		out_error(e)
 	else:
 		return restarted or 0
-	finally:
-		return 0
 
 
 def update_keep_alive_restart(server_id: int, service: str, restarted: int) -> None:

app/modules/roxywi/auth.py

@@ -5,7 +5,7 @@ from flask_login import login_user
 from datetime import datetime, timedelta
 
 import modules.db.sql as sql
-import app.modules.roxywi.common as roxywi_common
+import modules.roxywi.common as roxywi_common
 
 
 def check_login(user_uuid, token, **kwargs) -> str:

app/modules/roxywi/common.py

@@ -1,7 +1,6 @@
 import os
 import glob
 
-import distro
 from flask import request
 
 import modules.db.sql as sql
@@ -127,20 +126,8 @@ def logging(server_ip: str, action: str, **kwargs) -> None:
 		user_uuid = request.cookies.get('uuid')
 		login = sql.get_user_name_by_uuid(user_uuid)
 	except Exception:
-		login_name = kwargs.get('login')
-		try:
-			if len(login_name) > 1:
-				login = kwargs.get('login')
-		except Exception:
-			login = ''
-
-	try:
-		if distro.id() == 'ubuntu':
-			os.system('sudo chown www-data:www-data -R ' + log_path)
-		else:
-			os.system('sudo chown apache:apache -R ' + log_path)
-	except Exception:
-		pass
+		if kwargs.get('login'):
+			login = kwargs.get('login')
 
 	if kwargs.get('roxywi') == 1:
 		if kwargs.get('login'):

app/modules/tools/alerting.py

@@ -1,9 +1,7 @@
-import os
 import json
-import http.cookies
 
 import pika
-from flask import render_template
+from flask import render_template, request
 
 import modules.db.sql as sql
 import modules.common.common as common
@@ -259,14 +257,12 @@ def pd_send_mess(mess, level, server_ip=None, service_id=None, alert_type=None,
 
 def check_rabbit_alert() -> str:
 	try:
-		cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
-		user_group_id = cookie.get('group')
-		user_group_id1 = user_group_id.value
+		user_group_id = request.cookies.get('group')
 	except Exception as e:
 		return f'error: Cannot send a message {e}'
 
 	try:
-		json_for_sending = {"user_group": user_group_id1, "message": 'info: Test message'}
+		json_for_sending = {"user_group": user_group_id, "message": 'info: Test message'}
 		send_message_to_rabbit(json.dumps(json_for_sending))
 	except Exception as e:
 		return f'error: Cannot send a message {e}'
@@ -279,14 +275,12 @@ def check_email_alert() -> str:
 	message = 'Test message from Roxy-WI'
 
 	try:
-		cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
-		user_uuid = cookie.get('uuid')
-		user_uuid_value = user_uuid.value
+		user_uuid = request.cookies.get('uuid')
 	except Exception as e:
 		return f'error: Cannot send a message {e}'
 
 	try:
-		user_email = sql.select_user_email_by_uuid(user_uuid_value)
+		user_email = sql.select_user_email_by_uuid(user_uuid)
 	except Exception as e:
 		return f'error: Cannot get a user email: {e}'
 

app/routes/main/routes.py

@@ -13,7 +13,7 @@ import modules.db.sql as sql
 import modules.common.common as common
 import modules.roxywi.roxy as roxy
 import modules.roxywi.auth as roxywi_auth
-import modules.roxywi.nettools as nettools
+import modules.roxywi.nettools as nettools_mod
 import modules.roxywi.common as roxywi_common
 import modules.service.common as service_common
 import modules.service.haproxy as service_haproxy
@@ -104,11 +104,11 @@ def nettols_check(check):
     record_type = common.checkAjaxInput(request.form.get('nettools_nslookup_record_type'))
 
     if check == 'icmp':
-        return nettools.ping_from_server(server_from, server_to, action)
+        return nettools_mod.ping_from_server(server_from, server_to, action)
     elif check == 'tcp':
-        return nettools.telnet_from_server(server_from, server_to, port_to)
+        return nettools_mod.telnet_from_server(server_from, server_to, port_to)
     elif check == 'dns':
-        return nettools.nslookup_from_server(server_from, dns_name, record_type)
+        return nettools_mod.nslookup_from_server(server_from, dns_name, record_type)
     else:
         return 'error: Wrong check'
 

app/templates/login.html

@@ -83,11 +83,6 @@ body, .container {
 			{{error}}
 		</div>
 		{% endif %}
-		{% with messages = get_flashed_messages(with_categories=true) %}
-          {% for category, message in messages %}
-            <div class="{{ category }}" style="width: 15%;">{{ message }}</div>
-          {% endfor %}
-        {% endwith %}
 		<div class="alert alert-danger wrong-login alert-one-row" id="wrong-login">
 			{{lang.phrases.login_or_pass_incorrect}}
 			<br />