c840a1d04f
o plugins/check_badmailfromto - New plugin in the style of check_badmailfrom, which matches a pair of FROM/TO and makes it seem like the recipient's address no longer exists (but only from the matching sender's point of view). Useful for stalkers and other harassment cases. o plugins/dns_whitelist_soft - New plugin to provide a DNS-based whitelist (good for distributed sites). o various files - Replaced tab character with 8 spaces and adjusted line breaks for better readability. Changes by mct@toren.net (Michael C. Toren) o lib/Qpsmtpd/SMTP.pm - Assumes a MAIL FROM value of "<#@[]>" (utilized by qmail to indicate a null sender when generating a doublebounce message) is equivalent to "<>". Previously qpsmtpd complained that the value could not be parsed. - Adds LOGIN to the default list of supported auth mechanisms. The documentation in Auth.pm indicated that auth-login was not currently supported due to lack of functionality, however I can confirm that LOGIN appears to work fine as tested by using msmtp (http://msmtp.sourceforge.net/). Are there any indications that LOGIN support is actually broken in the current implementation? - Removes the "X-Qpsmtpd-Auth: True" header appended when a message has been sent by an authenticated user. One problem with such a header is that it's impossible to say which SMTP hop added it, and it provides no information which could be used to backtrack the transaction. I grepped through my mail archives a bit looking for how other MTAs handled the problem, and decided it would be best to place this information in the Received: header: Received: from remotehost (HELO remotehost) (192.168.42.42) (smtp-auth username foo, mechanism cram-md5) by mail.netisland.net (qpsmtpd/0.28) with ESMTP; <date> o lib/Qpsmtpd/Auth.pm: - Documentation update for the arguments passed to an auth handler; previously the $mechanism argument was not mentioned, which threw off the argument offsets. - Documentation update for auth-login removing the warning that auth-login is not currently supported due to lack of functionality. - Fix to execute a generic auth hook when a more specific auth-$mechanism hook does not exist. (Previously posted to the list last week.) - Upon authentication, sets $session->{_auth_user} and $session->{_auth_mechanism} so that SMTP.pm can include them in the Received: header. o plugins/queue/qmail-queue - Added a timestamp and the qmail-queue qp identifier to the "Queued!" 250 message, for compatibility with qmail-smtpd, which can be very useful for tracking message delivery from machine to machine. For example, the new 250 message might be: 250 Queued! 1105927468 qp 3210 <1105927457@netisland.net> qmail-smtpd returns: 250 ok 1106546213 qp 7129 Additionally, for consistency angle brackets are placed around the Message-ID displayed in the 250 if they were missing in the message header. o plugins/check_badmailfrom: - Changed the error message from "Mail from $bad not accepted here" to "sorry, your envelope sender is in my badmailfrom list", for compatibility with qmail-smtpd. I didn't see any reason to share with the sender the value of $bad, especially for situations where the sender was rejected resulting from a wildcard. o plugins/check_earlytalker: o plugins/require_resolvable_fromhost: - No longer checks for earlytalkers or resolvable senders if the connection note "whitelistclient" is set, which is nice for helping backup MX hosts empty their queue faster. o plugins/count_unrecognized_commands: - Return code changed from DENY_DISCONNECT, which isn't valid in an unrecognized_command hook, to DENY, which in this context drops the connection anyway. (Previously posted to the list last week.) git-svn-id: https://svn.perl.org/qpsmtpd/trunk@356 958fd67b-6ff1-0310-b445-bb7760255be9
111 lines
3.3 KiB
Perl
111 lines
3.3 KiB
Perl
# -*- perl -*-
|
|
=head1 NAME
|
|
|
|
qmail-queue
|
|
|
|
=head1 DESCRIPTION
|
|
|
|
This is the most common plugin used to queue incoming mails. A
|
|
variation of this plugin would maybe forward the mail via smtp.
|
|
|
|
=head1 CONFIG
|
|
|
|
It takes one optional parameter, the location of qmail-queue. This
|
|
makes it easy to use a qmail-queue replacement.
|
|
|
|
queue/qmail-queue /var/qmail/bin/another-qmail-queue
|
|
|
|
If set the environment variable QMAILQUEUE overrides this setting.
|
|
|
|
=cut
|
|
|
|
use POSIX ();
|
|
|
|
sub register {
|
|
my ($self, $qp, @args) = @_;
|
|
$self->register_hook("queue", "queue_handler");
|
|
|
|
if (@args > 0) {
|
|
$self->{_queue_exec} = $args[0];
|
|
$self->log(LOGWARN, "WARNING: Ignoring additional arguments.") if (@args > 1);
|
|
}
|
|
else {
|
|
$self->{_queue_exec} = ($ENV{QMAIL} || '/var/qmail') . "/bin/qmail-queue";
|
|
}
|
|
|
|
$self->{_queue_exec} = $ENV{QMAILQUEUE} if $ENV{QMAILQUEUE};
|
|
}
|
|
|
|
sub queue_handler {
|
|
my ($self, $transaction) = @_;
|
|
|
|
# these bits inspired by Peter Samuels "qmail-queue wrapper"
|
|
pipe(MESSAGE_READER, MESSAGE_WRITER) or fault("Could not create message pipe"), exit;
|
|
pipe(ENVELOPE_READER, ENVELOPE_WRITER) or fault("Could not create envelope pipe"), exit;
|
|
|
|
my $child = fork();
|
|
|
|
not defined $child and fault(451, "Could not fork"), exit;
|
|
|
|
if ($child) {
|
|
# Parent
|
|
my $oldfh = select(MESSAGE_WRITER); $| = 1;
|
|
select(ENVELOPE_WRITER); $| = 1;
|
|
select($oldfh);
|
|
|
|
close MESSAGE_READER or fault("close msg reader fault"),exit;
|
|
close ENVELOPE_READER or fault("close envelope reader fault"), exit;
|
|
|
|
$transaction->header->print(\*MESSAGE_WRITER);
|
|
$transaction->body_resetpos;
|
|
while (my $line = $transaction->body_getline) {
|
|
print MESSAGE_WRITER $line;
|
|
}
|
|
close MESSAGE_WRITER;
|
|
|
|
my @rcpt = map { "T" . $_->address } $transaction->recipients;
|
|
my $from = "F".($transaction->sender->address|| "" );
|
|
print ENVELOPE_WRITER "$from\0", join("\0",@rcpt), "\0\0"
|
|
or return(DECLINED,"Could not print addresses to queue");
|
|
|
|
close ENVELOPE_WRITER;
|
|
waitpid($child, 0);
|
|
my $exit_code = $? >> 8;
|
|
$exit_code and return(DECLINED, "Unable to queue message ($exit_code)");
|
|
|
|
my $msg_id = $transaction->header->get('Message-Id') || '';
|
|
$msg_id =~ s/[\r\n].*//s; # don't allow newlines in the Message-Id here
|
|
$msg_id = "<$msg_id>" unless $msg_id =~ /^<.*>$/; # surround in <>'s
|
|
return (OK, "Queued! " . time . " qp $child $msg_id");
|
|
}
|
|
elsif (defined $child) {
|
|
# Child
|
|
close MESSAGE_WRITER or exit 1;
|
|
close ENVELOPE_WRITER or exit 2;
|
|
|
|
# Untaint $self->{_queue_exec}
|
|
my $queue_exec = $self->{_queue_exec};
|
|
if ($queue_exec =~ /^(\/[\/\-\_\.a-z0-9A-Z]*)$/) {
|
|
$queue_exec = $1;
|
|
} else {
|
|
$self->log(LOGERROR, "FATAL ERROR: Unexpected characters in qmail-queue plugin argument");
|
|
# This exit is ok as we're exiting a forked child process.
|
|
exit 3;
|
|
}
|
|
|
|
# save the original STDIN and STDOUT in case exec() fails below
|
|
open(SAVE_STDIN, "<&STDIN");
|
|
open(SAVE_STDOUT, ">&STDOUT");
|
|
|
|
POSIX::dup2(fileno(MESSAGE_READER), 0) or die "Unable to dup MESSAGE_READER: $!";
|
|
POSIX::dup2(fileno(ENVELOPE_READER), 1) or die "Unable to dup ENVELOPE_READER: $!";
|
|
|
|
my $ppid = getppid();
|
|
$self->log(LOGNOTICE, "(for $ppid ) Queuing qp $$ to $queue_exec");
|
|
|
|
my $rc = exec $queue_exec;
|
|
|
|
exit 6; # we'll only get here if the exec fails
|
|
}
|
|
}
|