ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: adapt usage of unsafe arguments for run_cmd

unsafe-filenames
Axel Burri 2021-08-15 12:28:56 +02:00
parent acc7f9fc83
commit 2933e65cbe
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
btrbk
View File

@ -785,12 +785,13 @@ sub _safe_cmd($$)
my $offending = shift; my $offending = shift;
foreach(@$aref) { foreach(@$aref) {
if(ref($_) eq 'HASH') { if(ref($_) eq 'HASH') {
my $prefix = $_->{prefix} // "";
$_ = $_->{unsafe}; # replace in-place $_ = $_->{unsafe}; # replace in-place
# NOTE: all files must be absolute (if not, check for leading dash '-' here!) # NOTE: all files must be absolute (if not, check for leading dash '-' here!)
unless(defined(check_file($_, { absolute => 1 }))) { unless(defined(check_file($_, { absolute => 1 }))) {
push @$offending, "\"$_\""; push @$offending, "\"$_\"";
} }
$_ = quoteshell($_); $_ = $prefix . quoteshell($_);
} }
} }
return join(' ', @$aref); return join(' ', @$aref);
@ -828,10 +829,6 @@ sub run_cmd(@)
$has_rsh = 1 if($href->{rsh}); $has_rsh = 1 if($href->{rsh});
$large_output = 1 if($href->{large_output}); $large_output = 1 if($href->{large_output});
if($href->{check_unsafe}) {
_safe_cmd($href->{check_unsafe}, \@unsafe_cmd);
}
if($href->{redirect_to_file}) { if($href->{redirect_to_file}) {
die unless($href->{stream_sink}); die unless($href->{stream_sink});
$href->{cmd_text} = _safe_cmd([ '>', $href->{redirect_to_file} ], \@unsafe_cmd); $href->{cmd_text} = _safe_cmd([ '>', $href->{redirect_to_file} ], \@unsafe_cmd);
@ -1862,8 +1859,7 @@ sub btrfs_send_to_file($$$;$$)
# NOTE: we do not append a ".split" suffix on $target_filename here, as this propagates to ".info" file # NOTE: we do not append a ".split" suffix on $target_filename here, as this propagates to ".info" file
$raw_info{split} = $split; $raw_info{split} = $split;
push @cmd_pipe, { push @cmd_pipe, {
cmd => [ 'split', '-b', uc($split), '-', "${target_path}/${target_filename}.split_" ], cmd => [ 'split', '-b', uc($split), '-', { unsafe => "${target_path}/${target_filename}.split_" } ],
check_unsafe => [ { unsafe => "${target_path}/${target_filename}.split_" } ],
rsh => vinfo_rsh($target, disable_compression => $stream_options->{stream_compress}), rsh => vinfo_rsh($target, disable_compression => $stream_options->{stream_compress}),
compressed_ok => ($compress ? 1 : 0), compressed_ok => ($compress ? 1 : 0),
} }
@ -1879,8 +1875,7 @@ sub btrfs_send_to_file($$$;$$)
# Another approach would be to always pipe through "cat", which # Another approach would be to always pipe through "cat", which
# uses st_blksize from fstat(2) (with a minimum of 128K) to # uses st_blksize from fstat(2) (with a minimum of 128K) to
# determine the block size. # determine the block size.
cmd => [ 'dd', 'status=none', 'bs=' . config_key($target, "raw_target_block_size"), "of=${target_path}/${target_filename}" ], cmd => [ 'dd', 'status=none', 'bs=' . config_key($target, "raw_target_block_size"), { prefix => "of=", unsafe => "${target_path}/${target_filename}" } ],
check_unsafe => [ { unsafe => "${target_path}/${target_filename}" } ],
#redirect_to_file => { unsafe => "${target_path}/${target_filename}" }, # alternative (use shell redirection), less overhead on local filesystems (barely measurable): #redirect_to_file => { unsafe => "${target_path}/${target_filename}" }, # alternative (use shell redirection), less overhead on local filesystems (barely measurable):
rsh => vinfo_rsh($target, disable_compression => $stream_options->{stream_compress}), rsh => vinfo_rsh($target, disable_compression => $stream_options->{stream_compress}),
compressed_ok => ($compress ? 1 : 0), compressed_ok => ($compress ? 1 : 0),