You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/01/29 02:48:15 UTC
svn commit: r148968 - /spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm /spamassassin/trunk/t/ip_addrs.t
Author: jm
Date: Fri Jan 28 17:48:14 2005
New Revision: 148968
URL: http://svn.apache.org/viewcvs?view=rev&rev=148968
Log:
add support for Postfix-style IPv6 IP addresses
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
spamassassin/trunk/t/ip_addrs.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm?view=diff&rev=148968&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm&r1=148967&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm&r2=148968
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm Fri Jan 28 17:48:14 2005
@@ -101,7 +101,9 @@
127\.0\.0\.1 \b
|
# pure-IPv6 address
- (?<!:)
+ (?:IPv6: # with optional prefix
+ | (?<!:)
+ )
(?:0{0,4}\:){0,7} 1
)
/oxi;
@@ -138,7 +140,9 @@
|
# a pure-IPv6 address
# don't use \b here, it hits on :'s
- (?<!:)
+ (?:IPv6: # with optional prefix
+ | (?<!:)
+ )
(?:[a-f0-9]{0,4}\:){0,7} [a-f0-9]{0,4}
)
/oxi;
Modified: spamassassin/trunk/t/ip_addrs.t
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/t/ip_addrs.t?view=diff&rev=148968&p1=spamassassin/trunk/t/ip_addrs.t&r1=148967&p2=spamassassin/trunk/t/ip_addrs.t&r2=148968
==============================================================================
--- spamassassin/trunk/t/ip_addrs.t (original)
+++ spamassassin/trunk/t/ip_addrs.t Fri Jan 28 17:48:14 2005
@@ -26,7 +26,7 @@
rules_filename => "$prefix/rules",
});
-plan tests => 67;
+plan tests => 71;
sub tryone {
my ($pat, $testip) = @_;
@@ -79,6 +79,8 @@
ok (!tryone (Mail::SpamAssassin::Constants::IP_ADDRESS, "3ffe:fffff:100:f101:210:a4ff:fee3:9566"));
ok (tryone (Mail::SpamAssassin::Constants::IP_ADDRESS, "ff02:0:0:0:0:0:1"));
ok (tryone (Mail::SpamAssassin::Constants::IP_ADDRESS, "ff02:0:0:0:0:0:2"));
+ok (tryone (Mail::SpamAssassin::Constants::IP_ADDRESS, "IPv6:::1"));
+ok (tryone (Mail::SpamAssassin::Constants::IP_ADDRESS, "IPv6:3ffe:2500:310:3:20a:95ff:fef5:246e"));
ok (tryone (Mail::SpamAssassin::Constants::LOCALHOST, "localhost"));
ok (tryone (Mail::SpamAssassin::Constants::LOCALHOST, "localhost.localdomain"));
@@ -91,6 +93,8 @@
ok (!tryone (Mail::SpamAssassin::Constants::LOCALHOST, "3ffe:fffff:100:f101:210:a4ff:fee3:9566"));
ok (!tryone (Mail::SpamAssassin::Constants::LOCALHOST, "::192.168.0.1"));
ok (!tryone (Mail::SpamAssassin::Constants::LOCALHOST, "notlocalhost"));
+ok (tryone (Mail::SpamAssassin::Constants::LOCALHOST, "IPv6:::1"));
+ok (!tryone (Mail::SpamAssassin::Constants::LOCALHOST, "IPv6:3ffe:2500:310:3:20a:95ff:fef5:246e"));
sub tsttrim {
my $dom = shift;