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

Fix for perms error thrown when posting api key from regular user

Browse Source
This commit is contained in:
Andrew 2022-01-20 14:14:03 -05:00
parent a745e6110d
commit 33984c9629
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,7 +882,6 @@ class PanelHandler(BaseHandler):
'Config': Enum_Permissions_Server.Config, 'Config': Enum_Permissions_Server.Config,
'Players': Enum_Permissions_Server.Players, 'Players': Enum_Permissions_Server.Players,
} }
user_perms = self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id)
exec_user_role = set() exec_user_role = set()
if superuser: if superuser:
# defined_servers = self.controller.list_defined_servers() # defined_servers = self.controller.list_defined_servers()
@ -896,7 +895,7 @@ class PanelHandler(BaseHandler):
exec_user_role.add(role['role_name']) exec_user_role.add(role['role_name'])
if page == 'server_detail': if page == 'server_detail':
if not permissions['Config'] in user_perms: if not permissions['Config'] in self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id):
if not superuser: if not superuser:
self.redirect("/panel/error?error=Unauthorized access to Config") self.redirect("/panel/error?error=Unauthorized access to Config")
return return
@ -986,7 +985,7 @@ class PanelHandler(BaseHandler):
backup_path = server_obj.backup_path backup_path = server_obj.backup_path
max_backups = bleach.clean(self.get_argument('max_backups', None)) max_backups = bleach.clean(self.get_argument('max_backups', None))
if not permissions['Backup'] in user_perms: if not permissions['Backup'] in self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id):
if not superuser: if not superuser:
self.redirect("/panel/error?error=Unauthorized access: User not authorized") self.redirect("/panel/error?error=Unauthorized access: User not authorized")
return return
@ -1062,7 +1061,7 @@ class PanelHandler(BaseHandler):
else: else:
one_time = False one_time = False
if not superuser and not permissions['Backup'] in user_perms: if not superuser and not permissions['Backup'] in self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id):
self.redirect("/panel/error?error=Unauthorized access: User not authorized") self.redirect("/panel/error?error=Unauthorized access: User not authorized")
return return
elif server_id is None: elif server_id is None:
@ -1182,7 +1181,7 @@ class PanelHandler(BaseHandler):
else: else:
one_time = False one_time = False
if not superuser and not permissions['Backup'] in user_perms: if not superuser and not permissions['Backup'] in self.controller.server_perms.get_user_id_permissions_list(exec_user["user_id"], server_id):
self.redirect("/panel/error?error=Unauthorized access: User not authorized") self.redirect("/panel/error?error=Unauthorized access: User not authorized")
return return
elif server_id is None: elif server_id is None: