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

support more data_post hook return codes

Browse Source 
eval { } the hooks so we can handle them failing more gracefully (not
sure if this really adds anything... hmn).


git-svn-id: https://svn.perl.org/qpsmtpd/branches/v010@48 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Ask Bjørn Hansen 2002-09-08 09:58:47 +00:00
parent 21506e8025
commit 4ee8b164f9
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Qpsmtpd.pm
View File

@ -312,7 +312,8 @@ sub data {
$i++; $i++;
$self->respond(451, "See http://develooper.com/code/qpsmtpd/barelf.html"), exit $self->respond(451, "See http://develooper.com/code/qpsmtpd/barelf.html"), exit
if $_ eq ".\n"; if $_ eq ".\n";
unless ($self->transaction->blocked and ($max_size and $size > $max_size)) { # add a transaction->blocked check back here when we have line by line plugin access...
unless (($max_size and $size > $max_size)) {
s/\r\n$/\n/; s/\r\n$/\n/;
if ($in_header and m/^\s*$/) { if ($in_header and m/^\s*$/) {
$in_header = 0; $in_header = 0;
@ -361,14 +362,25 @@ sub data {
# probably dead. # probably dead.
$self->respond(451, "Incomplete DATA"), return 1 unless $complete; $self->respond(451, "Incomplete DATA"), return 1 unless $complete;
$self->respond(550, $self->transaction->blocked),return 1 if ($self->transaction->blocked); #$self->respond(550, $self->transaction->blocked),return 1 if ($self->transaction->blocked);
$self->respond(552, "Message too big!"),return 1 if $max_size and $size > $max_size; $self->respond(552, "Message too big!"),return 1 if $max_size and $size > $max_size;
my ($rc, $msg) = $self->run_hooks("data_post"); my ($rc, $msg) = $self->run_hooks("data_post");
if ($rc != DONE) { if ($rc == DONE) {
return 1;
}
elsif ($rc == DENY) {
$self->respond(552, $msg || "Message denied");
}
elsif ($rc == DENYSOFT) {
$self->respond(452, $msg || "Message denied temporarily");
}
else {
return $self->queue($self->transaction); return $self->queue($self->transaction);
} }
} }
sub queue { sub queue {
@ -379,7 +391,7 @@ sub queue {
pipe(ENVELOPE_READER, ENVELOPE_WRITER) or fault("Could not create envelope pipe"), exit; pipe(ENVELOPE_READER, ENVELOPE_WRITER) or fault("Could not create envelope pipe"), exit;
my $child = fork(); my $child = fork();
not defined $child and fault(451, "Could not fork"), exit; not defined $child and fault(451, "Could not fork"), exit;
if ($child) { if ($child) {
@ -469,6 +481,7 @@ sub load_plugins {
"require Qpsmtpd::Plugin;", "require Qpsmtpd::Plugin;",
'use vars qw(@ISA);', 'use vars qw(@ISA);',
'@ISA = qw(Qpsmtpd::Plugin);', '@ISA = qw(Qpsmtpd::Plugin);',
"sub plugin_name { qq[$plugin_name] }",
$line, $line,
$sub, $sub,
"\n", # last line comment without newline? "\n", # last line comment without newline?
@ -493,7 +506,9 @@ sub run_hooks {
if ($self->{_hooks}->{$hook}) { if ($self->{_hooks}->{$hook}) {
my @r; my @r;
for my $code (@{$self->{_hooks}->{$hook}}) { for my $code (@{$self->{_hooks}->{$hook}}) {
(@r) = &{$code}($self->transaction, @_); eval { (@r) = &{$code}($self->transaction, @_); };
$@ and $self->log(0, "FATAL PLUGIN ERROR: ", $@) and next;
$self->log(1, "a $hook hook returned undef!") and next unless defined $r[0];
last unless $r[0] == DECLINED; last unless $r[0] == DECLINED;
} }
return @r; return @r;