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 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
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 pathlib
from pathlib import Path
import shutil
import time
import logging
@ -513,10 +514,13 @@ class Controller:
server_data = self.servers.get_server_data_by_id(old_server_id)
old_bu_path = server_data['backup_path']
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():
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 = Path(backup_path)
backup_path_components = list(backup_path.parts)
backup_path_components[-1] = new_uuid
new_bu_path = pathlib.PurePath(os.path.join(*backup_path_components))