dbaa9dbd6c
on files in plugins dir: fixed a number of POD errors formatted some # comments into POD removed bare 1; (these are plugins, not perl modules) most instances of this were copy/pasted from a previous plugin that had it removed instances of # vim ts=N ... they weren't consistent, many didn't match .perltidyrc on modules that failed perl -c tests, added 'use Qpsmtpd::Constants;' Conflicts: plugins/async/check_earlytalker plugins/async/dns_whitelist_soft plugins/async/dnsbl plugins/async/queue/smtp-forward plugins/async/require_resolvable_fromhost plugins/async/rhsbl plugins/async/uribl plugins/auth/auth_checkpassword plugins/auth/auth_cvm_unix_local plugins/auth/auth_flat_file plugins/auth/auth_ldap_bind plugins/auth/auth_vpopmail plugins/auth/auth_vpopmail_sql plugins/auth/authdeny plugins/check_badmailfromto plugins/check_badrcptto_patterns plugins/check_bogus_bounce plugins/check_earlytalker plugins/check_norelay plugins/check_spamhelo plugins/connection_time plugins/dns_whitelist_soft plugins/dnsbl plugins/domainkeys plugins/greylisting plugins/hosts_allow plugins/http_config plugins/logging/adaptive plugins/logging/apache plugins/logging/connection_id plugins/logging/transaction_id plugins/logging/warn plugins/milter plugins/queue/exim-bsmtp plugins/queue/maildir plugins/queue/postfix-queue plugins/queue/smtp-forward plugins/quit_fortune plugins/random_error plugins/rcpt_map plugins/rcpt_regexp plugins/relay_only plugins/require_resolvable_fromhost plugins/rhsbl plugins/sender_permitted_from plugins/spamassassin plugins/tls plugins/tls_cert plugins/uribl plugins/virus/aveclient plugins/virus/bitdefender plugins/virus/clamav plugins/virus/clamdscan plugins/virus/hbedv plugins/virus/kavscanner plugins/virus/klez_filter plugins/virus/sophie plugins/virus/uvscan
151 lines
3.9 KiB
Perl
151 lines
3.9 KiB
Perl
#!perl -Tw
|
|
use Qpsmtpd::DSN;
|
|
use Net::DNS qw(mx);
|
|
use Socket;
|
|
use Net::IP qw(:PROC);
|
|
use Qpsmtpd::TcpServer;
|
|
|
|
my %invalid = ();
|
|
my $has_ipv6 = Qpsmtpd::TcpServer::has_ipv6();
|
|
|
|
sub hook_mail {
|
|
my ($self, $transaction, $sender, %param) = @_;
|
|
|
|
return DECLINED
|
|
if ($self->qp->connection->notes('whitelisthost'));
|
|
|
|
foreach my $i ($self->qp->config("invalid_resolvable_fromhost")) {
|
|
$i =~ s/^\s*//;
|
|
$i =~ s/\s*$//;
|
|
if ($i =~ m#^((\d{1,3}\.){3}\d{1,3})/(\d\d?)#) {
|
|
$invalid{$1} = $3;
|
|
}
|
|
}
|
|
|
|
if ($sender ne "<>"
|
|
and $self->qp->config("require_resolvable_fromhost")
|
|
and !$self->check_dns($sender->host)) {
|
|
if ($sender->host) {
|
|
$transaction->notes('temp_resolver_failed', $sender->host);
|
|
}
|
|
else {
|
|
# default of addr_bad_from_system is DENY, we use DENYSOFT here to
|
|
# get the same behaviour as without Qpsmtpd::DSN...
|
|
return Qpsmtpd::DSN->addr_bad_from_system(DENYSOFT,
|
|
"FQDN required in the envelope sender");
|
|
}
|
|
}
|
|
return DECLINED;
|
|
|
|
}
|
|
|
|
sub hook_rcpt {
|
|
my ($self, $transaction, $recipient, %args) = @_;
|
|
|
|
if (my $host = $transaction->notes('temp_resolver_failed')) {
|
|
# default of temp_resolver_failed is DENYSOFT
|
|
return Qpsmtpd::DSN->temp_resolver_failed("Could not resolve " . $host);
|
|
}
|
|
|
|
return DECLINED;
|
|
}
|
|
|
|
sub check_dns {
|
|
my ($self, $host) = @_;
|
|
my @host_answers;
|
|
|
|
# for stuff where we can't even parse a hostname out of the address
|
|
return 0 unless $host;
|
|
|
|
return 1 if $host =~ m/^\[(\d{1,3}\.){3}\d{1,3}\]$/;
|
|
|
|
my $res = new Net::DNS::Resolver(dnsrch => 0);
|
|
$res->tcp_timeout(30);
|
|
$res->udp_timeout(30);
|
|
my @mx = mx($res, $host);
|
|
foreach my $mx (@mx) {
|
|
# if any MX is valid, then we consider the domain
|
|
# resolvable
|
|
return 1 if mx_valid($self, $mx->exchange, $host);
|
|
}
|
|
# if there are MX records, and we got here,
|
|
# then none of them are valid
|
|
return 0 if (@mx > 0);
|
|
|
|
my $query = $res->search($host);
|
|
if ($query) {
|
|
foreach my $rrA ($query->answer) {
|
|
push(@host_answers, $rrA);
|
|
}
|
|
}
|
|
if ($has_ipv6) {
|
|
my $query = $res->search($host, 'AAAA');
|
|
if ($query) {
|
|
foreach my $rrAAAA ($query->answer) {
|
|
push(@host_answers, $rrAAAA);
|
|
}
|
|
}
|
|
}
|
|
if (@host_answers) {
|
|
foreach my $rr (@host_answers) {
|
|
return is_valid($rr->address) if $rr->type eq "A" or $rr->type eq "AAAA";
|
|
return mx_valid($self, $rr->exchange, $host) if $rr->type eq "MX";
|
|
}
|
|
}
|
|
else {
|
|
$self->log(LOGWARN, "$$ query for $host failed: ", $res->errorstring)
|
|
unless $res->errorstring eq "NXDOMAIN";
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
sub is_valid {
|
|
my $ip = shift;
|
|
my ($net,$mask);
|
|
### while (($net,$mask) = each %invalid) {
|
|
### ... does NOT reset to beginning, will start on
|
|
### 2nd invocation after where it denied the first time..., so
|
|
### 2nd time the same "MAIL FROM" would be accepted!
|
|
foreach $net (keys %invalid) {
|
|
$mask = $invalid{$net};
|
|
$mask = pack "B32", "1"x($mask)."0"x(32-$mask);
|
|
return 0
|
|
if join(".", unpack("C4", inet_aton($ip) & $mask)) eq $net;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
sub mx_valid {
|
|
my ($self, $name, $host) = @_;
|
|
my $res = new Net::DNS::Resolver(dnsrch => 0);
|
|
# IP in MX
|
|
return is_valid($name) if ip_is_ipv4($name) or ip_is_ipv6($name);
|
|
|
|
my @mx_answers;
|
|
my $query = $res->search($name, 'A');
|
|
if ($query) {
|
|
foreach my $rrA ($query->answer) {
|
|
push(@mx_answers, $rrA);
|
|
}
|
|
}
|
|
if ($has_ipv6) {
|
|
my $query = $res->search($name, 'AAAA');
|
|
if ($query) {
|
|
foreach my $rrAAAA ($query->answer) {
|
|
push(@mx_answers, $rrAAAA);
|
|
}
|
|
}
|
|
}
|
|
if (@mx_answers) {
|
|
foreach my $rr (@mx_answers) {
|
|
next unless $rr->type eq "A" or $rr->type eq "AAAA";
|
|
return is_valid($rr->address);
|
|
}
|
|
}
|
|
else {
|
|
$self->log(LOGWARN, "$$ query for $host failed: ", $res->errorstring)
|
|
unless $res->errorstring eq "NXDOMAIN";
|
|
}
|
|
return 0;
|
|
}
|