NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 01:35:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup restore

Browse Source
This commit is contained in:
amcmanu3 2022-03-07 21:36:23 -05:00
parent f2cc0e89fb
commit 9520858c22
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
import os import os
import pathlib import pathlib
from pathlib import Path
import shutil import shutil
import time import time
import logging import logging
@ -513,10 +514,13 @@ class Controller:
server_data = self.servers.get_server_data_by_id(old_server_id) server_data = self.servers.get_server_data_by_id(old_server_id)
old_bu_path = server_data['backup_path'] old_bu_path = server_data['backup_path']
Server_Perms_Controller.backup_role_swap(old_server_id, new_server_id) Server_Perms_Controller.backup_role_swap(old_server_id, new_server_id)
backup_path = helper.validate_traversal(helper.backup_path, old_bu_path) if not helper.is_os_windows():
backup_path = helper.validate_traversal(helper.backup_path, old_bu_path)
if helper.is_os_windows(): if helper.is_os_windows():
backup_path = helper.wtol_path(backup_path) backup_path = helper.validate_traversal(helper.wtol_path(helper.backup_path), helper.wtol_path(old_bu_path))
backup_path = helper.wtol_path(str(backup_path))
backup_path.replace(' ', '^ ') backup_path.replace(' ', '^ ')
backup_path = Path(backup_path)
backup_path_components = list(backup_path.parts) backup_path_components = list(backup_path.parts)
backup_path_components[-1] = new_uuid backup_path_components[-1] = new_uuid
new_bu_path = pathlib.PurePath(os.path.join(*backup_path_components)) new_bu_path = pathlib.PurePath(os.path.join(*backup_path_components))

41
app/classes/web/ajax_handler.py
View File

@ -337,19 +337,34 @@ class AjaxHandler(BaseHandler):
zip_name = bleach.clean(self.get_argument('zip_file', None)) zip_name = bleach.clean(self.get_argument('zip_file', None))
svr_obj = self.controller.servers.get_server_obj(server_id) svr_obj = self.controller.servers.get_server_obj(server_id)
server_data = self.controller.servers.get_server_data_by_id(server_id) server_data = self.controller.servers.get_server_data_by_id(server_id)
backup_path = svr_obj.backup_path if server_data['type'] == 'minecraft-java':
if helper.validate_traversal(backup_path, zip_name): backup_path = svr_obj.backup_path
tempDir = helper.unzip_backup_archive(backup_path, zip_name) if helper.validate_traversal(backup_path, zip_name):
new_server = self.controller.import_zip_server(svr_obj.server_name, tempDir = helper.unzip_backup_archive(backup_path, zip_name)
tempDir, new_server = self.controller.import_zip_server(svr_obj.server_name,
server_data['executable'], tempDir,
'1', '2', server_data['executable'],
server_data['server_port']) '1', '2',
new_server_id = new_server server_data['server_port'])
new_server = self.controller.get_server_data(new_server) new_server_id = new_server
self.controller.rename_backup_dir(server_id, new_server_id, new_server['server_uuid']) new_server = self.controller.get_server_data(new_server)
self.controller.remove_server(server_id, True) self.controller.rename_backup_dir(server_id, new_server_id, new_server['server_uuid'])
self.redirect('/panel/dashboard') self.controller.remove_server(server_id, True)
self.redirect('/panel/dashboard')
else:
backup_path = svr_obj.backup_path
if helper.validate_traversal(backup_path, zip_name):
tempDir = helper.unzip_backup_archive(backup_path, zip_name)
new_server = self.controller.import_bedrock_zip_server(svr_obj.server_name,
tempDir,
server_data['executable'],
server_data['server_port'])
new_server_id = new_server
new_server = self.controller.get_server_data(new_server)
self.controller.rename_backup_dir(server_id, new_server_id, new_server['server_uuid'])
self.controller.remove_server(server_id, True)
self.redirect('/panel/dashboard')
elif page == "unzip_server": elif page == "unzip_server":
path = self.get_argument('path', None) path = self.get_argument('path', None)