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

Die when an invalid dir is specified manually

Browse Source
This commit is contained in:
Jared Johnson 2015-02-24 12:34:13 -06:00
parent 6b13e24221
commit 84aa8e2328
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Qpsmtpd/DB/File/DBM.pm
View File

@ -180,9 +180,13 @@ sub flush {
} }
sub dir { sub dir {
my ( $self, @arg ) = @_; my ( $self, $dir ) = @_;
return $self->{dir} if $self->{dir} and ! @arg; if ( $dir ) {
for my $d ( $self->candidate_dirs(@arg) ) { die "Cannot use DB directory '$dir'\n" if !$self->validate_dir($dir);
return $self->{dir} = $dir;
}
return $self->{dir} if $self->{dir};
for my $d ( $self->candidate_dirs ) {
next if ! $self->validate_dir($d); next if ! $self->validate_dir($d);
return $self->{dir} = $d; # first match wins return $self->{dir} = $d; # first match wins
} }

13
plugins/greylisting
View File

@ -266,12 +266,17 @@ sub init_dbm {
name => 'greylist', name => 'greylist',
class => 'Qpsmtpd::DB::File::DBM' class => 'Qpsmtpd::DB::File::DBM'
); );
my $cdir = $self->{_args}{db_dir};
$cdir = $1 if $cdir and $cdir =~ m{^([-a-zA-Z0-9./_]+)$};
# greylisting-specific hints for where to store the greylist DB
my $db_dir = $self->db->dir( $cdir, '/var/lib/qpsmtpd/greylisting' );
$self->db->nfs_locking( $self->{_args}{nfslock} ); $self->db->nfs_locking( $self->{_args}{nfslock} );
# Add to the default list of possible DB directories
$self->db->candidate_dirs('/var/lib/qpsmtpd/greylisting');
if ( my $dir_arg = $self->{_args}{db_dir} ) {
# user-supplied db dir
$dir_arg = $1 if $dir_arg =~ m{^([-a-zA-Z0-9./_]+)$};
$self->db->dir($dir_arg);
}
my $db_dir = $self->db->dir;
# Work around old DBM filename # Work around old DBM filename
my $oldname = 'denysoft_greylist'; my $oldname = 'denysoft_greylist';
if ( ! -f "$db_dir/greylist.dbm" && -f "$db_dir/$oldname.dbm" ) { if ( ! -f "$db_dir/greylist.dbm" && -f "$db_dir/$oldname.dbm" ) {

10
t/qpsmtpd-db-file-dbm.t
View File

@ -137,11 +137,17 @@ sub __validate_dir {
sub __dir { sub __dir {
my $db2 = Qpsmtpd::DB::File::DBM->new( name => 'dirtest' ); my $db2 = Qpsmtpd::DB::File::DBM->new( name => 'dirtest' );
is( $db2->dir(), 't/config', 'default directory' ); is( $db2->dir(), 't/config', 'default directory' );
is( $db2->dir('_invalid','t/Test'), 't/Test', 'skip invalid candidate dirs' ); delete $db2->{dir};
$db2->candidate_dirs('_invalid','t/Test');
is( $db2->dir, 't/Test', 'skip invalid candidate dirs' );
$db2->{dir} = '_cached'; $db2->{dir} = '_cached';
is( $db2->dir(), '_cached', 'cached directory' ); is( $db2->dir(), '_cached', 'cached directory' );
is( $db2->dir('t/Test'), 't/Test', 'passing candidate dirs resets cache' ); is( $db2->dir('t/Test'), 't/Test', 'passing candidate dirs resets cache' );
is( $db2->dir('_invalid'), 't/config', 'invalid candidate dirs reverts to default' ); delete $db2->{dir};
$db2->candidate_dirs('_invalid');
is( $db2->dir, 't/config', 'invalid candidate dirs reverts to default' );
eval { $db2->dir('_invalid'); };
is( $@, "Cannot use DB directory '_invalid'\n", 'die on invalid dir' );
} }
sub __untie_gotcha { sub __untie_gotcha {