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

Don't use sprintf if there is only one argument

Browse source 
This avoids problems when logging a string that might have
metacharacters.
This commit is contained in:
Richard Hansen 2024-05-22 19:16:16 -04:00
parent bcd57b486b
commit ff39ce3874
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ddclient.in
View file

@ -2420,15 +2420,16 @@ sub logmsg {
}
}
}
sub msg { logmsg( sprintf(shift, @_)); }
sub verbose { logmsg(email => 1, pfx => pop, sprintf(shift, @_)) if opt('verbose'); }
sub info { logmsg(email => 1, pfx => 'INFO:', sprintf(shift, @_)) if opt('verbose'); }
sub debug { logmsg( pfx => 'DEBUG:', sprintf(shift, @_)) if opt('debug'); }
sub debug2 { logmsg( pfx => 'DEBUG:', sprintf(shift, @_)) if opt('debug') && opt('verbose'); }
sub warning { logmsg(email => 1, pfx => 'WARNING:', sprintf(shift, @_)); }
sub fatal { logmsg(email => 1, pfx => 'FATAL:', sprintf(shift, @_)); sendmail(); exit(1); }
sub success { logmsg(email => 1, pfx => 'SUCCESS:', sprintf(shift, @_)); }
sub failed { logmsg(email => 1, pfx => 'FAILED:', sprintf(shift, @_)); $result = 'FAILED'; }
sub _logmsg_fmt { return (@_ > 1) ? sprintf(shift, @_) : shift; }
sub msg { logmsg( _logmsg_fmt(@_)); }
sub verbose { logmsg(email => 1, pfx => shift, _logmsg_fmt(@_)) if opt('verbose'); }
sub info { logmsg(email => 1, pfx => 'INFO:', _logmsg_fmt(@_)) if opt('verbose'); }
sub debug { logmsg( pfx => 'DEBUG:', _logmsg_fmt(@_)) if opt('debug'); }
sub debug2 { logmsg( pfx => 'DEBUG:', _logmsg_fmt(@_)) if opt('debug') && opt('verbose'); }
sub warning { logmsg(email => 1, pfx => 'WARNING:', _logmsg_fmt(@_)); }
sub fatal { logmsg(email => 1, pfx => 'FATAL:', _logmsg_fmt(@_)); sendmail(); exit(1); }
sub success { logmsg(email => 1, pfx => 'SUCCESS:', _logmsg_fmt(@_)); }
sub failed { logmsg(email => 1, pfx => 'FAILED:', _logmsg_fmt(@_)); $result = 'FAILED'; }
sub prettytime { return scalar(localtime(shift)); }
sub prettyinterval {

18
t/logmsg.pl
View file

@ -118,4 +118,22 @@ for my $tc (@test_cases) {
}
}
{
my $output;
open(my $fh, '>', \$output);
local *STDERR = $fh;
ddclient::msg('%%');
close($fh);
is($output, "%%\n", 'single argument is printed directly, not via sprintf');
}
{
my $output;
open(my $fh, '>', \$output);
local *STDERR = $fh;
ddclient::msg('%s', 'foo');
close($fh);
is($output, "foo\n", 'multiple arguments are formatted via sprintf');
}
done_testing();