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 logical issues with panel handler

Browse Source
This commit is contained in:
amcmanu3
2022-08-20 20:58:46 -04:00
parent 6b82170d6f
commit 02b6c3b545
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/controllers/users_controller.py
View File

@ -254,7 +254,7 @@ class UsersController:
def remove_user(self, user_id): def remove_user(self, user_id):
for user in self.get_managed_users(user_id): for user in self.get_managed_users(user_id):
self.update_user(user.user_id, {"manager": None}) self.update_user(user.user_id, {"manager": None})
for role in HelperRoles.get_managed_roles(user_id): for role in HelperUsers.get_managed_roles(user_id):
HelperRoles.update_role(role.role_id, {"manager": None}) HelperRoles.update_role(role.role_id, {"manager": None})
return self.users_helper.remove_user(user_id) return self.users_helper.remove_user(user_id)

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

@ -1313,7 +1313,7 @@ class PanelHandler(BaseHandler):
if ( if (
EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_crafty_permissions EnumPermissionsCrafty.ROLES_CONFIG not in exec_user_crafty_permissions
and exec_user["user_id"] != role["manager"] or exec_user["user_id"] != role["manager"]
and not exec_user["superuser"] and not exec_user["superuser"]
): ):
self.redirect( self.redirect(
@ -2042,7 +2042,10 @@ class PanelHandler(BaseHandler):
else: else:
manager = user["manager"] manager = user["manager"]
if not exec_user["superuser"] and exec_user["user_id"] != user["user_id"]: if (
not exec_user["superuser"]
and int(exec_user["user_id"]) != user["manager"]
):
if username is None or username == "": if username is None or username == "":
self.redirect("/panel/error?error=Invalid username") self.redirect("/panel/error?error=Invalid username")
return return
@ -2110,13 +2113,13 @@ class PanelHandler(BaseHandler):
user_id, user_data=user_data, user_crafty_data=user_crafty_data user_id, user_data=user_data, user_crafty_data=user_crafty_data
) )
self.controller.management.add_to_audit_log( self.controller.management.add_to_audit_log(
exec_user["user_id"], exec_user["user_id"],
f"Edited user {username} (UID:{user_id}) with roles {roles} " f"Edited user {username} (UID:{user_id}) with roles {roles} "
f"and permissions {permissions_mask}", f"and permissions {permissions_mask}",
server_id=0, server_id=0,
source_ip=self.get_remote_ip(), source_ip=self.get_remote_ip(),
) )
self.redirect("/panel/panel_config") self.redirect("/panel/panel_config")
elif page == "edit_user_apikeys": elif page == "edit_user_apikeys":