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

push changes to fix loading server pages as regular user. Creating new api keys as a regular user does not work - get a white traceback.

Browse Source
This commit is contained in:
Andrew 2022-01-19 16:22:22 -05:00
parent 6f860e967c
commit dff7c4890b
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/classes/controllers/servers_controller.py
View File

@ -100,9 +100,7 @@ class Servers_Controller:
@staticmethod
def get_authorized_servers_stats(user_id):
server_data = []
print('test 1')
authorized_servers = Servers_Controller.get_authorized_servers(user_id)
print('test 2')
for s in authorized_servers:
latest = servers_helper.get_latest_server_stats(s.get('server_id'))
@ -137,11 +135,10 @@ class Servers_Controller:
@staticmethod
def server_id_authorized(server_id_a, user_id):
print("Server id authorized: ")
user_roles = users_helper.user_role_query(user_id)
for role in user_roles:
for server_id_b in server_permissions.get_role_servers_from_role_id(role.role_id):
if server_id_a == server_id_b:
if str(server_id_a) == str(server_id_b.server_id):
return True
return False

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

@ -172,7 +172,7 @@ class Permissions_Servers:
if user.superuser:
permissions_mask = '1' * len(server_permissions.get_permissions_list())
else:
roles_list = users_helper.get_user_roles_id(user['user_id'])
roles_list = users_helper.get_user_roles_id(user.user_id)
role_server = Role_Servers.select().where(Role_Servers.role_id.in_(roles_list)).where(Role_Servers.server_id == server_id).execute()
permissions_mask = role_server[0].permissions
return permissions_mask

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

@ -130,7 +130,7 @@ class PanelHandler(BaseHandler):
# increasing and will eat up the RAM
del chunk
def check_server_id(self) -> Optional[str]:
def check_server_id(self):
server_id = self.get_argument('id', None)
api_key, _, exec_user = self.current_user