Use BSMTP response code; misc cleanups
Exim's BSMTP interface will indicate the SMTP response to the exchange; actually use it rather than assuming all errors are 400-class soft ones. Tolerate $transaction->header returning undef (since it evidently can under some conditions). Convert a few errant tabs to spaces. Fix vi modeline. Signed-off-by: Robert <rspier@pobox.com>
This commit is contained in:
parent
d77244e487
commit
3889821d16
@ -80,6 +80,10 @@ sub register {
|
|||||||
sub hook_queue {
|
sub hook_queue {
|
||||||
my ($self, $transaction) = @_;
|
my ($self, $transaction) = @_;
|
||||||
|
|
||||||
|
unless ($transaction->header) {
|
||||||
|
$self->log(LOGERROR, "No header parsed for transaction; can't enqueue");
|
||||||
|
return (DENY, 'Mail unqueuable');
|
||||||
|
}
|
||||||
my $tmp_dir = $self->qp->config('spool_dir') || '/tmp';
|
my $tmp_dir = $self->qp->config('spool_dir') || '/tmp';
|
||||||
$tmp_dir = $1 if ($tmp_dir =~ /(.*)/);
|
$tmp_dir = $1 if ($tmp_dir =~ /(.*)/);
|
||||||
my ($tmp, $tmpfn) = tempfile("exim-bsmtp.$$.XXXXXX", DIR => $tmp_dir);
|
my ($tmp, $tmpfn) = tempfile("exim-bsmtp.$$.XXXXXX", DIR => $tmp_dir);
|
||||||
@ -112,9 +116,13 @@ sub hook_queue {
|
|||||||
# Normally exim produces no output in BSMTP mode; anything that
|
# Normally exim produces no output in BSMTP mode; anything that
|
||||||
# does come out is an error worth logging.
|
# does come out is an error worth logging.
|
||||||
my $start = time;
|
my $start = time;
|
||||||
|
my ($bsmtp_error, $bsmtp_msg);
|
||||||
while (<$exim>) {
|
while (<$exim>) {
|
||||||
chomp;
|
chomp;
|
||||||
$self->log(LOGERROR, "exim: $_");
|
$self->log(LOGERROR, "exim: $_");
|
||||||
|
if (/(\d\d\d)\s(\S.*)/) {
|
||||||
|
($bsmtp_error, $bsmtp_msg) = ($1, $2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$self->log(LOGDEBUG, "BSMTP finished (".(time - $start)." sec)");
|
$self->log(LOGDEBUG, "BSMTP finished (".(time - $start)." sec)");
|
||||||
$exim->close;
|
$exim->close;
|
||||||
@ -122,7 +130,12 @@ sub hook_queue {
|
|||||||
unlink $tmpfn or $self->log(LOGERROR, "unlink: $tmpfn: $!");
|
unlink $tmpfn or $self->log(LOGERROR, "unlink: $tmpfn: $!");
|
||||||
|
|
||||||
$self->log(LOGDEBUG, "Exitcode from exim: $exit");
|
$self->log(LOGDEBUG, "Exitcode from exim: $exit");
|
||||||
if (($exit >> 8) != 0) {
|
if ($bsmtp_error && $bsmtp_error >= 400 && $bsmtp_error < 600) {
|
||||||
|
$self->log(LOGERROR, "BSMTP enqueue failed; response $bsmtp_error".
|
||||||
|
" ($bsmtp_msg)");
|
||||||
|
return ($bsmtp_error < 400 ? DECLINED : DENY, $bsmtp_msg);
|
||||||
|
}
|
||||||
|
elsif (($exit >> 8) != 0 || $bsmtp_error) {
|
||||||
$self->log(LOGERROR, 'BSMTP enqueue failed; exitcode '.($exit >> 8).
|
$self->log(LOGERROR, 'BSMTP enqueue failed; exitcode '.($exit >> 8).
|
||||||
" from $self->{_exim_path} -bS");
|
" from $self->{_exim_path} -bS");
|
||||||
return (DECLINED, 'Internal error enqueuing mail');
|
return (DECLINED, 'Internal error enqueuing mail');
|
||||||
@ -135,5 +148,4 @@ sub hook_queue {
|
|||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
||||||
# vi: ts=4 sw=4 expandtab syn=perl
|
# vi: ts=4 sw=4 expandtab syn=perl:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user