Notifications are only visible to valid server users

app/classes/minecraft/serverjars.py

@@ -12,6 +12,7 @@ from app.classes.shared.console import console
 from app.classes.models.servers import Servers
 from app.classes.minecraft.server_props import ServerProps
 from app.classes.web.websocket_helper import websocket_helper
+from app.classes.models.server_permissions import server_permissions
 
 logger = logging.getLogger(__name__)
 
@@ -190,7 +191,6 @@ class ServerJars:
             except Exception as e:
                 logger.error("Unable to save jar to {path} due to error:{error}".format(path=path, error=e))
                 pass
-        websocket_helper.broadcast('notification', "Executable download finished for server named: " + name)
         
 
         return False

app/classes/models/management.py

@@ -9,6 +9,8 @@ from app.classes.shared.main_models import db_helper
 from app.classes.models.users import Users, users_helper
 from app.classes.models.servers import Servers, servers_helper
 from app.classes.web.websocket_helper import websocket_helper
+from app.classes.models.server_permissions import server_permissions
+import time
 
 
 logger = logging.getLogger(__name__)
@@ -181,7 +183,9 @@ class helpers_management:
 
         audit_msg = "{} {}".format(str(user_data['username']).capitalize(), log_msg)
 
-        websocket_helper.broadcast('notification', audit_msg)
+        server_users = server_permissions.get_server_user_list(server_id)
+        for user in server_users:
+            websocket_helper.broadcast_user(user,'notification', audit_msg)
 
         Audit_Log.insert({
             Audit_Log.user_name: user_data['username'],

app/classes/models/server_permissions.py

@@ -7,7 +7,7 @@ from app.classes.shared.helpers import helper
 from app.classes.shared.console import console
 from app.classes.models.servers import Servers
 from app.classes.models.roles import Roles
-from app.classes.models.users import users_helper, ApiKeys, Users
+from app.classes.models.users import User_Roles, users_helper, ApiKeys, Users
 from app.classes.shared.permission_helper import permission_helper
 
 logger = logging.getLogger(__name__)
@@ -177,6 +177,21 @@ class Permissions_Servers:
             permissions_mask = role_server[0].permissions
         return permissions_mask
 
+    @staticmethod
+    def get_server_user_list(server_id):
+        final_users = []
+        server_roles = Role_Servers.select().where(Role_Servers.server_id == server_id)
+        super_users = Users.select().where(Users.superuser == True)
+        for role in server_roles:
+            users = User_Roles.select().where(User_Roles.role_id == role.role_id)
+            for user in users:
+                if user.user_id.user_id not in final_users:
+                        final_users.append(user.user_id.user_id)
+        for suser in super_users:
+            if suser.user_id not in final_users:
+                final_users.append(suser.user_id)
+        return final_users
+
     @staticmethod
     def get_user_id_permissions_list(user_id, server_id: str):
         user = users_helper.get_user_model(user_id)

app/classes/models/users.py

@@ -174,6 +174,15 @@ class helper_users:
         if up_data:
             Users.update(up_data).where(Users.user_id == user_id).execute()
 
+    @staticmethod
+    def get_super_user_list():
+        final_users = []
+        super_users = Users.select().where(Users.superuser == True)
+        for suser in super_users:
+            if suser.user_id not in final_users:
+                final_users.append(suser.user_id)
+        return final_users
+
     @staticmethod
     def remove_user(user_id):
         with database.atomic():

app/classes/shared/server.py

@@ -25,6 +25,7 @@ from app.classes.models.management import management_helper
 from app.classes.web.websocket_helper import websocket_helper
 from app.classes.shared.translation import translation
 from app.classes.models.users import users_helper
+from app.classes.models.server_permissions import server_permissions
 
 logger = logging.getLogger(__name__)
 
@@ -609,7 +610,9 @@ class Server:
                 if len(websocket_helper.clients) > 0:
                     # There are clients
                     self.check_update()
-                    websocket_helper.broadcast('notification', "Executable update finished for " + self.name)
+                    server_users = server_permissions.get_server_user_list(self.server_id)
+                    for user in server_users:
+                        websocket_helper.broadcast_user(user, 'notification', "Executable update finished for " + self.name)
                     time.sleep(3)
                     websocket_helper.broadcast_page('/panel/server_detail', 'update_button_status', {
                         'isUpdating': self.check_update(),
@@ -618,15 +621,18 @@ class Server:
                     })
                     websocket_helper.broadcast_page('/panel/dashboard', 'send_start_reload', {
                     })
-                websocket_helper.broadcast('notification', "Executable update finished for "+self.name)
+                server_users = server_permissions.get_server_user_list(self.server_id)
+                for user in server_users:
+                    websocket_helper.broadcast_user(user, 'notification', "Executable update finished for "+self.name)
 
                 management_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip'])
                 if wasStarted:
                     self.start_server()
             elif not downloaded and not self.is_backingup:
                 time.sleep(5)
-                servers_helper.set_update(self.server_id, False)
-                websocket_helper.broadcast('notification',
+                server_users = server_permissions.get_server_user_list(self.server_id)
+                for user in server_users:
+                    websocket_helper.broadcast_user(user,'notification',
                                            "Executable update failed for " + self.name + ". Check log file for details.")
                 logger.error("Executable download failed.")
             pass