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
69 lines
1.6 KiB
Perl
69 lines
1.6 KiB
Perl
#!perl -Tw
|
|
|
|
=head1 NAME
|
|
|
|
parse_addr_withhelo
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
strict RFC 821 forbids parameters after the
|
|
|
|
MAIL FROM:<user@example.net>
|
|
and
|
|
RCPT TO:<someone@example.com>
|
|
|
|
load this plugin to enforce, else the default EHLO parsing with
|
|
parameters is done.
|
|
|
|
=cut
|
|
|
|
sub hook_mail_parse {
|
|
my $self = shift;
|
|
return (OK, \&_parse) if ($self->qp->connection->hello eq 'helo');
|
|
return (DECLINED);
|
|
}
|
|
|
|
sub hook_rcpt_parse {
|
|
my $self = shift;
|
|
return (OK, \&_parse) if ($self->qp->connection->hello eq 'helo');
|
|
return (DECLINED);
|
|
}
|
|
|
|
sub _parse {
|
|
my ($self,$cmd,$line) = @_;
|
|
$self->log(LOGDEBUG, "_parse() cmd=[$cmd], line=[$line]");
|
|
if ($cmd eq 'mail') {
|
|
return(DENY, "Syntax error in command")
|
|
unless ($line =~ s/^from:\s*//i);
|
|
}
|
|
else { # cmd eq 'rcpt'
|
|
return(DENY, "Syntax error in command")
|
|
unless ($line =~ s/^to:\s*//i);
|
|
}
|
|
|
|
if ($line =~ s/^(<.*>)\s*//) {
|
|
my $addr = $1;
|
|
return (DENY, "No parameters allowed in ".uc($cmd))
|
|
if ($line =~ /^\S/);
|
|
return (OK, $addr, ());
|
|
}
|
|
|
|
## now, no <> are given
|
|
$line =~ s/\s*$//;
|
|
if ($line =~ /\@/) {
|
|
return (DENY, "No parameters allowed in ".uc($cmd))
|
|
if ($line =~ /\@\S+\s+\S/);
|
|
return (OK, $line, ());
|
|
}
|
|
|
|
if ($cmd eq "mail") {
|
|
return (OK, "<>") unless $line; # 'MAIL FROM:' -> 'MAIL FROM:<>'
|
|
return (DENY, "Could not parse your MAIL FROM command");
|
|
}
|
|
else {
|
|
return (DENY, "Could not parse your RCPT TO command")
|
|
unless $line =~ /^(postmaster|abuse)$/i;
|
|
}
|
|
}
|
|
|