Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backups: use more restrictive pattern for directory canonicalization (#840)

Browse Source 
The --xform option affects all the names - including symlink targets. So
make the pattern as precise as possible to not break symlinks in dom0
home backup. Still not ideal, but at least limit damage to relative
symlinks pointing at <username> directory (which hopefully user will
not create). Previous version broke all relative symlinks...
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-13 03:11:06 +02:00
parent 6566d4f57c
commit 39496bf65a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/backup.py
View File

@ -511,7 +511,9 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
"-f", backup_pipe, "-f", backup_pipe,
'--tape-length', str(100000), '--tape-length', str(100000),
'-C', os.path.dirname(filename["path"]), '-C', os.path.dirname(filename["path"]),
'--xform', 's:^[^/]:%s\\0:' % filename["subdir"], '--xform', 's:^%s:%s\\0:' % (
os.path.basename(filename["path"]),
filename["subdir"]),
os.path.basename(filename["path"]) os.path.basename(filename["path"])
] ]
@ -1674,7 +1676,7 @@ def backup_restore_do(restore_info,
if format_version == 2: if format_version == 2:
if 'dom0' in restore_info.keys() and restore_info['dom0']['good-to-go']: if 'dom0' in restore_info.keys() and restore_info['dom0']['good-to-go']:
vms_dirs.append('dom0-home') vms_dirs.append(os.path.dirname(restore_info['dom0']['subdir']))
vms_size += restore_info['dom0']['size'] vms_size += restore_info['dom0']['size']
restore_vm_dirs (backup_location, restore_vm_dirs (backup_location,