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

btrbk: strict input validation from raw sidecar

pull/504/merge
Axel Burri 2022-11-20 11:20:25 +01:00
parent f8280f591f
commit a622fded5a
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
btrbk
View File

@ -349,6 +349,8 @@ my %raw_info_sort = (
INCOMPLETE => 100, INCOMPLETE => 100,
); );
my $raw_info_value_match = qr/[0-9a-zA-Z_-]*/;
my %raw_url_cache; # map URL to (fake) btr_tree node my %raw_url_cache; # map URL to (fake) btr_tree node
my %mountinfo_cache; # map MACHINE_ID to mount points (sorted descending by file length) my %mountinfo_cache; # map MACHINE_ID to mount points (sorted descending by file length)
my %mount_source_cache; # map URL_PREFIX:mount_source (aka device) to btr_tree node my %mount_source_cache; # map URL_PREFIX:mount_source (aka device) to btr_tree node
@ -2023,8 +2025,8 @@ sub system_read_raw_info_dir($)
} }
my @raw_targets; my @raw_targets;
foreach (split "\000\000", join "\n", @$ret) { foreach my $info_text (split "\000\000", join "\n", @$ret) {
unless (s/^(.*?)\000//s) { unless($info_text =~ s/^(.*?)\000//s) {
ERROR("Error while parsing command output for: $droot->{PATH}"); ERROR("Error while parsing command output for: $droot->{PATH}");
return undef; return undef;
} }
@ -2032,12 +2034,23 @@ sub system_read_raw_info_dir($)
// return undef; // return undef;
my $name = ($info_file =~ s/^.*\///r); my $name = ($info_file =~ s/^.*\///r);
$name =~ s/\.info$//; $name =~ s/\.info$//;
my $raw_info = { my $raw_info = {
INFO_FILE => $info_file, INFO_FILE => $info_file,
NAME => $name, NAME => $name,
}; };
foreach (split "\n") { foreach my $line (split "\n", $info_text) {
$raw_info->{$1} = $2 if /^([a-zA-Z_]+)=(.*)/; my ($key, $value) = ($line =~ /^([a-zA-Z_]+)=(.*)/);
next unless $key;
if($key eq "FILE") {
WARN("Ignoring ambiguous \"FILE=$value\" from raw info file, using \"$name\": $info_file") if($value ne $name);
next;
}
unless($value =~ /^$raw_info_value_match$/) {
ERROR("Failed to parse \"$key=$value\" in raw info file: $info_file");
return undef;
}
$raw_info->{$key} = $value;
} }
# input validation (we need to abort here, or the backups will be resumed) # input validation (we need to abort here, or the backups will be resumed)
@ -2059,12 +2072,6 @@ sub system_read_raw_info_dir($)
$raw_info->{RECEIVED_PARENT_UUID} = '-'; $raw_info->{RECEIVED_PARENT_UUID} = '-';
} }
# FILE is informative only; if present, check against sidecar filename
if($raw_info->{FILE} && ($raw_info->{FILE} ne $raw_info->{NAME})) {
WARN("Ignoring ambiguous \"FILE=$raw_info->{FILE}\" from raw info file, using \"$raw_info->{NAME}\": $info_file");
}
delete $raw_info->{FILE};
push @raw_targets, $raw_info; push @raw_targets, $raw_info;
} }