803a320127
2. If the name doesn't end in a dot then append each item in the search list to the name. This is only done if dnsrch is true. triggered by.. From: Charlie Brady <charlieb-qpsmtpd@budge.apana.org.au> Subject: [BUG] Default search path used in require_resolvable_fromhost Date: Sat, 17 Jul 2010 16:24:42 -0400 (EDT) Message-ID: <Pine.LNX.4.64.1007171623040.17109@e-smith.charlieb.ott.istop.com> http://bugs.contribs.org/show_bug.cgi?id=5808 Jesper Knudsen 2010-03-01 01:29:10 MST When using the require_resolvable_fromhost plugin for qpsmtpd I noticed that mails from user@localhost.localdomain was actually getting through this filter. I finally found out that the plugin has a bug that causes it to insert default search path if it cannot find the domain. This means in my case that localhost.localdomain was then tried resolved as localhost.localdomain.swerts-knudsen.dk and since I have a wilcard CNAME was resolved as my public IP. Since this plugin is only enabled for public interface the fix is to set the "dnsrch" flag when creating the Net::DNS object. In require_resolvable_fromhost: my $res = Net::DNS::Resolver->new ( dnsrch => 0 );
151 lines
3.9 KiB
Plaintext
151 lines
3.9 KiB
Plaintext
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 = $self->qp->connection->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;
|
|
}
|
|
|
|
# vim: ts=2 sw=2 expandtab syn=perl |