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

More useful exception on invalid db_dir

Browse Source
This commit is contained in:
Jared Johnson 2015-02-24 15:19:47 -06:00
parent 84aa8e2328
commit 1ae8ed206f
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,12 +182,16 @@ sub flush {
sub dir { sub dir {
my ( $self, $dir ) = @_; my ( $self, $dir ) = @_;
if ( $dir ) { if ( $dir ) {
die "Cannot use DB directory '$dir'\n" if !$self->validate_dir($dir); $self->validate_dir($dir);
return $self->{dir} = $dir; return $self->{dir} = $dir;
} }
return $self->{dir} if $self->{dir}; return $self->{dir} if $self->{dir};
for my $d ( $self->candidate_dirs ) { for my $d ( $self->candidate_dirs ) {
next if ! $self->validate_dir($d); # Ignore invalid directories for static default directories
my $is_valid;
eval { $is_valid = $self->validate_dir($d); };
next if $@;
next if !$is_valid;
return $self->{dir} = $d; # first match wins return $self->{dir} = $d; # first match wins
} }
} }
@ -203,9 +207,9 @@ sub candidate_dirs {
sub validate_dir { sub validate_dir {
my ( $self, $d ) = @_; my ( $self, $d ) = @_;
return 0 if ! $d; die "Empty DB directory supplied\n" if ! $d;
return 0 if ! -d $d; die "DB directory '$d' does not exist\n" if ! -d $d;
return 0 if ! -w $d; die "DB directory '$d' is not writeable\n" if ! -w $d;
return 1; return 1;
} }

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

@ -119,15 +119,24 @@ sub __candidate_dirs {
} }
sub __validate_dir { sub __validate_dir {
is( $db->validate_dir(), 0, 'validate_dir(): false on no input' ); eval { $db->validate_dir(); };
is( $db->validate_dir(undef), 0, 'validate_dir(): false on undef' ); is( $@, "Empty DB directory supplied\n",
is( $db->validate_dir('invalid'), 0, 'validate_dir(): die on no input' );
'validate_dir(): false for non-existent directory' ); eval { $db->validate_dir(undef); };
is( $@, "Empty DB directory supplied\n",
'validate_dir(): die on undef' );
eval { $db->validate_dir(''); };
is( $@, "Empty DB directory supplied\n",
'validate_dir(): die on empty string' );
eval { $db->validate_dir('invalid'); };
is( $@, "DB directory 'invalid' does not exist\n",
'validate_dir(): die on non-existent directory' );
is( $db->validate_dir('t/tmp'), 1, is( $db->validate_dir('t/tmp'), 1,
'validate_dir(): true for real directory' ); 'validate_dir(): true for real directory' );
mkdir 't/tmp/wtest', 0555; mkdir 't/tmp/wtest', 0555;
is( $db->validate_dir('t/tmp/wtest'), 0, eval { $db->validate_dir('t/tmp/wtest') };
'validate_dir(): false for non-writeable directory' ); is( $@, "DB directory 't/tmp/wtest' is not writeable\n",
'validate_dir(): die on non-writeable directory' );
chmod 0777, 't/tmp/wtest'; chmod 0777, 't/tmp/wtest';
is( $db->validate_dir('t/tmp/wtest'), 1, is( $db->validate_dir('t/tmp/wtest'), 1,
'validate_dir(): true for writeable directory' ); 'validate_dir(): true for writeable directory' );
@ -147,7 +156,7 @@ sub __dir {
$db2->candidate_dirs('_invalid'); $db2->candidate_dirs('_invalid');
is( $db2->dir, 't/config', 'invalid candidate dirs reverts to default' ); is( $db2->dir, 't/config', 'invalid candidate dirs reverts to default' );
eval { $db2->dir('_invalid'); }; eval { $db2->dir('_invalid'); };
is( $@, "Cannot use DB directory '_invalid'\n", 'die on invalid dir' ); is( $@, "DB directory '_invalid' does not exist\n", 'die on invalid dir' );
} }
sub __untie_gotcha { sub __untie_gotcha {