2004-07-15 01:58:47 +02:00
|
|
|
#!/usr/bin/perl
|
|
|
|
use strict;
|
2014-09-15 20:53:28 +02:00
|
|
|
use warnings;
|
2004-07-15 01:58:47 +02:00
|
|
|
|
2014-09-18 06:23:00 +02:00
|
|
|
use Data::Dumper;
|
2014-09-15 20:53:28 +02:00
|
|
|
use Test::More;
|
|
|
|
|
2014-09-12 09:42:08 +02:00
|
|
|
use lib 't';
|
2014-09-18 06:23:00 +02:00
|
|
|
use lib 'lib';
|
2014-09-12 09:42:08 +02:00
|
|
|
|
2014-09-18 06:23:00 +02:00
|
|
|
BEGIN {
|
|
|
|
use_ok('Qpsmtpd::Address');
|
|
|
|
use_ok('Qpsmtpd::Constants');
|
|
|
|
use_ok('Test::Qpsmtpd');
|
|
|
|
}
|
2014-09-12 09:42:08 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
__new();
|
2014-09-18 06:23:00 +02:00
|
|
|
__config();
|
2014-09-15 20:53:28 +02:00
|
|
|
__parse();
|
2014-09-22 01:52:30 +02:00
|
|
|
__canonify();
|
2004-07-15 01:58:47 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
done_testing();
|
2004-07-15 01:58:47 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
sub __new {
|
|
|
|
my ($as, $ao);
|
2005-11-08 19:18:02 +01:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
my @unsorted_list = map { Qpsmtpd::Address->new($_) } qw(
|
2014-09-16 00:57:12 +02:00
|
|
|
"musa_ibrah@caramail.comandrea.luger"@wifo.ac.at
|
|
|
|
foo@example.com
|
|
|
|
ask@perl.org
|
|
|
|
foo@foo.x.example.com
|
|
|
|
jpeacock@cpan.org
|
|
|
|
test@example.com
|
|
|
|
);
|
|
|
|
|
|
|
|
# NOTE that this is sorted by _host_ not by _domain_
|
2014-09-15 20:53:28 +02:00
|
|
|
my @sorted_list = map { Qpsmtpd::Address->new($_) } qw(
|
2014-09-16 00:57:12 +02:00
|
|
|
jpeacock@cpan.org
|
|
|
|
foo@example.com
|
|
|
|
test@example.com
|
|
|
|
foo@foo.x.example.com
|
|
|
|
ask@perl.org
|
|
|
|
"musa_ibrah@caramail.comandrea.luger"@wifo.ac.at
|
|
|
|
);
|
2004-07-16 04:51:39 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
my @test_list = sort @unsorted_list;
|
2004-07-15 01:58:47 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
is_deeply(\@test_list, \@sorted_list, "sort via overloaded 'cmp' operator");
|
Changes by jpeacock@cpan.org (John Peacock)
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
2005-01-28 04:30:50 +01:00
|
|
|
|
2014-09-16 00:57:12 +02:00
|
|
|
# RT#38746 - non-RFC compliant address should return undef
|
2005-11-02 19:48:32 +01:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
$as = '<user@example.com#>';
|
|
|
|
$ao = Qpsmtpd::Address->new($as);
|
|
|
|
is($ao, undef, "illegal $as");
|
2014-09-18 06:23:00 +02:00
|
|
|
is_deeply($ao, undef, "illegal $as, deeply");
|
|
|
|
|
|
|
|
$ao = Qpsmtpd::Address->new(undef);
|
2014-09-18 20:11:11 +02:00
|
|
|
is('<>', $ao, "new, user=undef, stringified");
|
|
|
|
is('<>', $ao->format, "new, user=undef, format");
|
2014-09-18 06:23:00 +02:00
|
|
|
is_deeply(bless({_user => undef, _host=>undef}, 'Qpsmtpd::Address'), $ao, "new, user=undef, deeply");
|
|
|
|
|
|
|
|
$ao = Qpsmtpd::Address->new('<matt@test.com>');
|
2014-09-18 20:11:11 +02:00
|
|
|
is('<matt@test.com>', $ao, 'new, user=matt@test.com, stringified');
|
|
|
|
is('<matt@test.com>', $ao->format, 'new, user=matt@test.com, format');
|
2014-09-18 06:23:00 +02:00
|
|
|
is_deeply(bless( { '_host' => 'test.com', '_user' => 'matt' }, 'Qpsmtpd::Address' ),
|
|
|
|
$ao,
|
|
|
|
'new, user=matt@test.com, deeply');
|
|
|
|
|
|
|
|
$ao = Qpsmtpd::Address->new('postmaster');
|
2014-09-18 20:11:11 +02:00
|
|
|
is('<>', $ao, "new, user=postmaster, stringified");
|
|
|
|
is('<>', $ao->format, "new, user=postmaster, format");
|
2014-09-18 06:23:00 +02:00
|
|
|
is_deeply(bless({_user => undef, _host=>undef}, 'Qpsmtpd::Address'), $ao, "new, user=postmaster, deeply");
|
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
}
|
2005-11-02 19:48:32 +01:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
sub __parse {
|
|
|
|
my ($as, $ao);
|
2005-11-02 19:48:32 +01:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
$as = '<>';
|
|
|
|
$ao = Qpsmtpd::Address->parse($as);
|
|
|
|
ok($ao, "parse $as");
|
|
|
|
is($ao->format, $as, "format $as");
|
2004-07-16 04:51:39 +02:00
|
|
|
|
2014-09-15 20:53:28 +02:00
|
|
|
$as = '<postmaster>';
|
|
|
|
$ao = Qpsmtpd::Address->parse($as);
|
|
|
|
ok($ao, "parse $as");
|
|
|
|
is($ao->format, $as, "format $as");
|
|
|
|
|
|
|
|
$as = '<foo@example.com>';
|
|
|
|
$ao = Qpsmtpd::Address->parse($as);
|
|
|
|
ok($ao, "parse $as");
|
|
|
|
is($ao->format, $as, "format $as");
|
|
|
|
|
|
|
|
is($ao->user, 'foo', 'user');
|
|
|
|
is($ao->host, 'example.com', 'host');
|
|
|
|
|
2014-09-16 00:57:12 +02:00
|
|
|
# the \ before the @ in the local part is not required, but
|
|
|
|
# allowed. For simplicity we add a backslash before all characters
|
|
|
|
# which are not allowed in a dot-string.
|
2014-09-15 20:53:28 +02:00
|
|
|
$as = '<"musa_ibrah@caramail.comandrea.luger"@wifo.ac.at>';
|
|
|
|
$ao = Qpsmtpd::Address->parse($as);
|
|
|
|
ok($ao, "parse $as");
|
|
|
|
is($ao->format, '<"musa_ibrah\@caramail.comandrea.luger"@wifo.ac.at>',
|
|
|
|
"format $as");
|
2006-03-20 17:47:05 +01:00
|
|
|
|
2014-09-16 00:57:12 +02:00
|
|
|
# email addresses with spaces
|
2014-09-15 20:53:28 +02:00
|
|
|
$as = '<foo bar@example.com>';
|
|
|
|
$ao = Qpsmtpd::Address->parse($as);
|
|
|
|
ok($ao, "parse $as");
|
|
|
|
is($ao->format, '<"foo\ bar"@example.com>', "format $as");
|
|
|
|
|
|
|
|
$as = 'foo@example.com';
|
|
|
|
$ao = Qpsmtpd::Address->new($as);
|
|
|
|
ok($ao, "new $as");
|
|
|
|
is($ao->address, $as, "address $as");
|
|
|
|
|
|
|
|
$as = '<foo@example.com>';
|
|
|
|
$ao = Qpsmtpd::Address->new($as);
|
|
|
|
ok($ao, "new $as");
|
|
|
|
is($ao->address, 'foo@example.com', "address $as");
|
|
|
|
|
|
|
|
$as = '<foo@foo.x.example.com>';
|
|
|
|
$ao = Qpsmtpd::Address->new($as);
|
|
|
|
ok($ao, "new $as");
|
|
|
|
is($ao->format, $as, "format $as");
|
|
|
|
|
|
|
|
$as = 'foo@foo.x.example.com';
|
|
|
|
ok($ao = Qpsmtpd::Address->parse('<' . $as . '>'), "parse $as");
|
|
|
|
is($ao && $ao->address, $as, "address $as");
|
|
|
|
|
2014-09-16 00:57:12 +02:00
|
|
|
# Not sure why we can change the address like this, but we can so test it ...
|
2014-09-15 20:53:28 +02:00
|
|
|
is($ao && $ao->address('test@example.com'),
|
|
|
|
'test@example.com', 'address(test@example.com)');
|
|
|
|
|
|
|
|
$as = '<foo@foo.x.example.com>';
|
|
|
|
$ao = Qpsmtpd::Address->new($as);
|
|
|
|
ok($ao, "new $as");
|
|
|
|
is($ao->format, $as, "format $as");
|
|
|
|
is("$ao", $as, "overloaded stringify $as");
|
|
|
|
|
|
|
|
$as = 'foo@foo.x.example.com';
|
|
|
|
ok($ao = Qpsmtpd::Address->parse("<$as>"), "parse <$as>");
|
|
|
|
is($ao && $ao->address, $as, "address $as");
|
|
|
|
ok($ao eq $as, "overloaded 'cmp' operator");
|
2014-09-16 00:57:12 +02:00
|
|
|
}
|
2014-09-12 20:09:20 +02:00
|
|
|
|
|
|
|
sub __config {
|
2014-09-16 00:57:12 +02:00
|
|
|
ok(my ($qp, $cxn) = Test::Qpsmtpd->new_conn(), "get new connection");
|
|
|
|
ok($qp->command('HELO test'));
|
|
|
|
ok($qp->command('MAIL FROM:<test@example.com>'));
|
2014-09-12 20:09:20 +02:00
|
|
|
my $sender = $qp->transaction->sender;
|
2014-09-14 05:04:07 +02:00
|
|
|
my @test_data = (
|
2014-09-16 00:57:12 +02:00
|
|
|
{
|
|
|
|
pref => 'size_threshold',
|
2014-12-18 21:16:23 +01:00
|
|
|
result => undef,
|
2014-09-16 00:57:12 +02:00
|
|
|
expected => 10000,
|
|
|
|
descr => 'fall back to global config when user_config is absent',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
pref => 'test_config',
|
2014-12-18 21:16:23 +01:00
|
|
|
result => undef,
|
2014-09-16 00:57:12 +02:00
|
|
|
expected => undef,
|
|
|
|
descr => 'return nothing when no user_config plugins exist',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
pref => 'test_config',
|
|
|
|
result => [DECLINED],
|
|
|
|
expected => undef,
|
|
|
|
descr => 'return nothing when user_config plugins return DECLINED',
|
|
|
|
},
|
|
|
|
{
|
|
|
|
pref => 'test_config',
|
|
|
|
result => [OK, 'test value'],
|
|
|
|
expected => 'test value',
|
|
|
|
descr => 'return results when user_config plugin returns a value',
|
|
|
|
},
|
2014-09-14 05:04:07 +02:00
|
|
|
);
|
|
|
|
for (@test_data) {
|
2014-12-18 21:16:23 +01:00
|
|
|
$qp->fake_hook( 'user_config', sub { return @{$_->{result}} } )
|
|
|
|
if $_->{result};
|
2014-09-16 00:57:12 +02:00
|
|
|
is($sender->config($_->{pref}), $_->{expected}, $_->{descr});
|
2014-09-14 05:04:07 +02:00
|
|
|
}
|
2014-12-18 21:16:23 +01:00
|
|
|
$qp->unfake_hook('user_config');
|
2014-09-14 05:04:07 +02:00
|
|
|
}
|
2014-09-22 01:52:30 +02:00
|
|
|
|
|
|
|
sub __canonify {
|
|
|
|
|
|
|
|
my $as = 'foo@x.example.com';
|
|
|
|
my $ao = Qpsmtpd::Address->new($as);
|
|
|
|
ok( ! defined $Qpsmtpd::Address::domain_expr, "domain_expr is undef");
|
|
|
|
ok( $Qpsmtpd::Address::subdomain_expr, "subdomain_expr is defined, $Qpsmtpd::Address::subdomain_expr");
|
|
|
|
|
|
|
|
my @r = Qpsmtpd::Address->canonify('sample@path');
|
|
|
|
is_deeply(\@r, [ undef, undef, "missing delimiters" ], 'canonify, missing delimiters');
|
|
|
|
|
|
|
|
@r = Qpsmtpd::Address->canonify('');
|
|
|
|
is_deeply(\@r, [ undef, undef, "missing delimiters" ], 'canonify, empty path');
|
|
|
|
|
|
|
|
@r = Qpsmtpd::Address->canonify('<postmaster>');
|
|
|
|
is_deeply(\@r, [ 'postmaster', undef, "bare postmaster" ], 'canonify, bare postmaster');
|
|
|
|
|
|
|
|
@r = Qpsmtpd::Address->canonify('<postmaster@test>');
|
|
|
|
is_deeply(\@r, [ 'postmaster', 'test', 'local matches atom' ], 'canonify, postmaster@test');
|
|
|
|
|
2014-09-22 19:33:15 +02:00
|
|
|
@r = Qpsmtpd::Address->canonify('<@a:postmaster@test>');
|
|
|
|
is_deeply(\@r, [ 'postmaster', 'test', 'local matches atom' ], 'canonify, @a:postmaster@test (source route)');
|
|
|
|
|
2014-09-22 01:52:30 +02:00
|
|
|
@r = Qpsmtpd::Address->canonify('<postmáster@test>');
|
|
|
|
is_deeply(\@r, [ 'postmáster', 'test', 'local matches atom' ], 'canonify, postmáster@test, local matches atom');
|
2014-09-22 19:33:15 +02:00
|
|
|
|
|
|
|
@r = Qpsmtpd::Address->canonify('<@192.168.1.1>');
|
|
|
|
is_deeply(\@r, [ undef, undef, 'fall through' ], 'canonify, fall through, @192.168.1.1')
|
|
|
|
or diag Data::Dumper::Dumper(@r);
|
2014-09-22 01:52:30 +02:00
|
|
|
}
|