Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update support logs to only download server logs for user permissions. Fix bug where updating user roles would update for all user roles with changes.

Browse Source
This commit is contained in:
Andrew 2022-01-13 16:44:57 -05:00
parent 3a3ee52f5c
commit 4a78f3c4bd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/models/server_permissions.py
View File

@ -133,7 +133,7 @@ class Permissions_Servers:
@staticmethod
def get_role_permissions_list(role_id):
permissions_mask = '00000000'
role_server = Role_Servers.get_or_none(role_id)
role_server = Role_Servers.get_or_none(Role_Servers.role_id == role_id)
if role_server is not None:
permissions_mask = role_server.permissions
permissions_list = server_permissions.get_permissions(permissions_mask)

8
app/classes/web/panel_handler.py
View File

@ -783,7 +783,13 @@ class PanelHandler(BaseHandler):
if exec_user['superuser']:
auth_servers = self.controller.servers.get_all_defined_servers()
else:
auth_servers = self.controller.servers.get_authorized_servers(int(exec_user_id))
user_servers = self.controller.servers.get_authorized_servers(int(exec_user_id))
auth_servers = []
for server in user_servers:
if Enum_Permissions_Server.Logs in self.controller.server_perms.get_user_permissions_list(exec_user['user_id'], server["server_id"]):
auth_servers.append(server)
else:
logger.info("Logs permission not available for server {}. Skipping.".format(server["server_name"]))
#we'll iterate through our list of log paths from auth servers.
for server in auth_servers:
final_path = os.path.join(server_path, str(server['server_name']))