Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

read_recap: Scrub recap values without var declarations

Browse source
This commit is contained in:
Richard Hansen 2024-09-01 03:06:46 -04:00
parent 70e2b51377
commit f2c9ef6641
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ddclient.in
View file

@ -1635,8 +1635,14 @@ sub read_recap {
%opt = %saved; %opt = %saved;
$recap{$_} //= {} for keys(%config); $recap{$_} //= {} for keys(%config);
for my $h (keys(%recap)) { for my $h (keys(%recap)) {
next if !exists($config{$h}); if (!exists($config{$h})) {
delete($recap{$h});
next;
}
my $vars = $protocols{opt('protocol', $h)}{variables}; my $vars = $protocols{opt('protocol', $h)}{variables};
for my $v (keys(%{$recap{$h}})) {
delete($recap{$h}{$v}) if !$vars->{$v} || !$vars->{$v}{recap};
}
# Only status variables are copied from `%recap` into `%config` because the recap should # Only status variables are copied from `%recap` into `%config` because the recap should
# not change the configuration. See the documenting comments for `%recap`. # not change the configuration. See the documenting comments for `%recap`.
# TODO: Hard-coding this list impairs readability and maintainability. In particular, # TODO: Hard-coding this list impairs readability and maintainability. In particular,

5
t/read_recap.pl
View file

@ -50,13 +50,11 @@ my @test_cases = (
desc => "unknown host", desc => "unknown host",
cachefile_lines => ["var_a=yes host_c"], cachefile_lines => ["var_a=yes host_c"],
want => {}, want => {},
want_TODO => "longstanding minor issue, doesn't affect functionality",
}, },
{ {
desc => "unknown var", desc => "unknown var",
cachefile_lines => ["var_b=123 host_a"], cachefile_lines => ["var_b=123 host_a"],
want => {host_a => {host => 'host_a'}}, want => {host_a => {host => 'host_a'}},
want_TODO => "longstanding minor issue, doesn't affect functionality",
}, },
{ {
desc => "invalid value", desc => "invalid value",
@ -142,21 +140,18 @@ my @test_cases = (
desc => "non-recap vars are not loaded to %recap or copied to %config", desc => "non-recap vars are not loaded to %recap or copied to %config",
cachefile_lines => ["mtime=1234567890 host_b"], cachefile_lines => ["mtime=1234567890 host_b"],
want => {host_b => {host => 'host_b'}}, want => {host_b => {host => 'host_b'}},
want_TODO => "longstanding minor issue, doesn't affect functionality",
}, },
{ {
desc => "non-recap vars are scrubbed from %recap", desc => "non-recap vars are scrubbed from %recap",
cachefile_lines => ["mtime=1234567890 host_b"], cachefile_lines => ["mtime=1234567890 host_b"],
recap => {host_b => {host => 'host_b', mtime => 1234567891}}, recap => {host_b => {host => 'host_b', mtime => 1234567891}},
want => {host_b => {host => 'host_b'}}, want => {host_b => {host => 'host_b'}},
want_TODO => "longstanding minor issue, doesn't affect functionality",
}, },
{ {
desc => "unknown hosts are scrubbed from %recap", desc => "unknown hosts are scrubbed from %recap",
cachefile_lines => ["host_a", "host_c"], cachefile_lines => ["host_a", "host_c"],
recap => {host_a => {host => 'host_a'}, host_c => {host => 'host_c'}}, recap => {host_a => {host => 'host_a'}, host_c => {host => 'host_c'}},
want => {host_a => {host => 'host_a'}}, want => {host_a => {host => 'host_a'}},
want_TODO => "longstanding minor issue, doesn't affect functionality",
}, },
); );