byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

content_log_enabled: Accept multiple 'true' values

Browse Source
This commit is contained in:
Jared Johnson 2014-12-03 09:57:27 -06:00
parent c77a3344d7
commit 64c7519d7c
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/content_log
View File

@ -41,7 +41,7 @@ sub content_log_enabled {
my ( $self ) = @_;
my $enabled = $self->qp->config('content_log_enabled');
$enabled = 'true' if ! defined $enabled;
return 1 if lc($enabled) eq 'true';
return 1 if $enabled =~ /^(?:true|1|yes)\s*$/i;
return 0;
}

69
t/plugin_tests/content_log
View File

@ -18,6 +18,75 @@ sub test_content_log_file {
sub test_content_log_enabled {
my ( $self ) = @_;
ok( ! $self->content_log_enabled, 'content_log_enabled() returns false' );
my @test_data = (
{
config => 'true',
expected => 1,
},
{
config => undef,
expected => 1,
},
{
config => '1',
expected => 1,
},
{
config => 'yes',
expected => 1,
},
{
config => 'yes ',
expected => 1,
},
{
config => '0',
expected => 0,
},
{
config => 'false',
expected => 0,
},
{
config => 'no',
expected => 0,
},
{
config => 'asdf ',
expected => 0,
},
);
$self->save_hook;
for ( @test_data ) {
my $descr = "content_log_enabled="
. ( defined $_->{config } ? "'$_->{config }'" : 'undef' )
. ( $_->{expected} ? ' enables' : ' disables' )
. ' content logging';
$self->fake_config( $_->{config } );
is( $self->content_log_enabled, $_->{expected}, $descr );
}
$self->restore_hook;
}
our $oldhook;
sub save_hook {
my ( $self ) = @_;
$oldhook = $self->qp->hooks->{config};
}
sub restore_hook {
my ( $self ) = @_;
$self->qp->hooks->{config} = $oldhook;
}
sub fake_config {
my ( $self, $value ) = @_;
$self->qp->hooks->{config} = [
{
name => 'test hook',
code => sub { return OK, $value },
},
];
}
sub test_exclude {