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 support log delete order.

Browse Source 
Fix username uppercase.
This commit is contained in:
amcmanu3 2022-06-14 15:42:13 -04:00
parent 10474ffe9d
commit 50438c485b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/classes/shared/main_controller.py
View File

@ -82,6 +82,8 @@ class Controller:
if exec_user["preparing"]: if exec_user["preparing"]:
return return
self.users.set_prepare(exec_user["user_id"]) self.users.set_prepare(exec_user["user_id"])
# Delete previous instace of logs
self.del_support_file(exec_user["support_logs"])
# pausing so on screen notifications can run for user # pausing so on screen notifications can run for user
time.sleep(7) time.sleep(7)
self.helper.websocket_helper.broadcast_user( self.helper.websocket_helper.broadcast_user(
@ -177,6 +179,8 @@ class Controller:
FileHelpers.del_file(temp_zip_storage) FileHelpers.del_file(temp_zip_storage)
except FileNotFoundError: except FileNotFoundError:
logger.info("No temp file found. Assuming it's already been cleaned up") logger.info("No temp file found. Assuming it's already been cleaned up")
except PermissionError:
logger.error("Unable to remove old logs. Permission denied error.")
def add_system_user(self): def add_system_user(self):
self.users_helper.add_user( self.users_helper.add_user(

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

@ -1255,7 +1255,6 @@ class PanelHandler(BaseHandler):
# same time, the chunks in memory will keep # same time, the chunks in memory will keep
# increasing and will eat up the RAM # increasing and will eat up the RAM
del chunk del chunk
self.controller.del_support_file(temp_zip_storage)
self.redirect("/panel/dashboard") self.redirect("/panel/dashboard")
else: else:
self.redirect("/panel/error?error=No path found for support logs") self.redirect("/panel/error?error=No path found for support logs")
@ -1774,7 +1773,7 @@ class PanelHandler(BaseHandler):
self.redirect(f"/panel/server_detail?id={server_id}&subpage=schedules") self.redirect(f"/panel/server_detail?id={server_id}&subpage=schedules")
elif page == "edit_user": elif page == "edit_user":
if bleach.clean(self.get_argument("username", None)) == "system": if bleach.clean(self.get_argument("username", None)).lower() == "system":
self.redirect( self.redirect(
"/panel/error?error=Unauthorized access: " "/panel/error?error=Unauthorized access: "
"system user is not editable" "system user is not editable"