You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/01/10 21:01:10 UTC

svn commit: r124829 - in spamassassin/trunk/lib/Mail/SpamAssassin: . Message/Metadata

Author: quinlan
Date: Mon Jan 10 12:01:08 2005
New Revision: 124829

URL: http://svn.apache.org/viewcvs?view=rev&rev=124829
Log:
bug 3968: don't trust that reserved networks are internal/private, only
  use private networks that are not publicly routeable

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&rev=124829&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm&r1=124828&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm&r2=124829
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm	Mon Jan 10 12:01:08 2005
@@ -1197,12 +1197,12 @@
 
 =item *
 
-if the address of the 'from' host is in a reserved network range,
+if the address of the 'from' host is in a private network range,
 then it's trusted
 
 =item *
 
-if any addresses of the 'by' host is in a reserved network range,
+if any addresses of the 'by' host is in a private network range,
 then it's trusted
 
 =back
@@ -2106,14 +2106,14 @@
 
 =over 4
 
-=item duplicated or reserved IPs
+=item duplicated or private IPs
 
 Duplicated IPs are only queried once and reserved IPs are not queried.
-Reserved IPs are those listed in
+Private IPs are those listed in
 <http://www.iana.org/assignments/ipv4-address-space>,
 <http://duxcw.com/faq/network/privip.htm>,
 <http://duxcw.com/faq/network/autoip.htm>, or
-<ftp://ftp.rfc-editor.org/in-notes/rfc3330.txt>
+<ftp://ftp.rfc-editor.org/in-notes/rfc3330.txt> as private.
 
 =item the 'set' argument
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm?view=diff&rev=124829&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm&r1=124828&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm&r2=124829
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm	Mon Jan 10 12:01:08 2005
@@ -27,7 +27,7 @@
 use base qw( Exporter );
 
 @IP_VARS = qw(
-	IP_IN_RESERVED_RANGE LOCALHOST IPV4_ADDRESS IP_ADDRESS
+	IP_IN_RESERVED_RANGE IP_PRIVATE LOCALHOST IPV4_ADDRESS IP_ADDRESS
 );
 @BAYES_VARS = qw(
 	DUMP_MAGIC DUMP_TOKEN DUMP_BACKUP 
@@ -109,6 +109,15 @@
   23[0-9]|			   # 230-239/8:        IANA Multicast
   24[0-9]|			   # 240-249/8:        IANA Reserved
   25[0-5]			   # 255/8:            IANA Reserved
+)\.}ox;
+
+use constant IP_PRIVATE => qr{^(?:
+# private use ranges
+  192\.168|			   # 192.168/16:       Private Use (3330)
+  10|				   # 10/8:             Private Use (3330)
+  172\.(?:1[6-9]|2[0-9]|3[01])|	   # 172.16-172.31/16: Private Use (3330)
+  169\.254|			   # 169.254/16:       Private Use (APIPA)
+  127				   # 127/8:            Private Use (localhost)
 )\.}ox;
 
 # ---------------------------------------------------------------------------

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?view=diff&rev=124829&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm&r1=124828&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm&r2=124829
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm	Mon Jan 10 12:01:08 2005
@@ -946,10 +946,10 @@
     return undef;
   }
 
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
 
-  if ($dom =~ /${IP_IN_RESERVED_RANGE}/) {
-    dbg("dns: IP is reserved, not looking up PTR: $dom");
+  if ($dom =~ /${IP_PRIVATE}/) {
+    dbg("dns: IP is private, not looking up PTR: $dom");
     return undef;
   }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&rev=124829&p1=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r1=124828&p2=spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm&r2=124829
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm	Mon Jan 10 12:01:08 2005
@@ -218,7 +218,7 @@
   $self->{mismatch_helo} = 0;
   $self->{mismatch_ip_helo} = 0;
 
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
 
   my @fromip = map { $_->{ip} } @{$self->{relays_untrusted}};
   # just pick up domains for these
@@ -281,7 +281,7 @@
 	# allow private IP addrs here, could be a legit screwup
 	if ($hclassb && $fclassb && 
 		$hclassb ne $fclassb &&
-		!($hlo =~ /$IP_IN_RESERVED_RANGE/o))
+		!($hlo =~ /$IP_PRIVATE/o))
 	{
 	  dbg("eval: forged-HELO: massive mismatch on IP-addr HELO: '$hlo' != '$fip'");
 	  $self->{mismatch_ip_helo}++;
@@ -647,8 +647,8 @@
   for (my $i = 0; $i < $self->{num_relays_untrusted}; $i++) {
     my $rcvd = $self->{relays_untrusted}->[$i];
 
-    # Ignore where IP is in reserved IP space
-    next if ($rcvd->{ip_is_reserved});
+    # Ignore where IP is in private IP space
+    next if ($rcvd->{ip_private});
 
     my $from_host = $rcvd->{rdns};
     my $helo_host = $rcvd->{helo};
@@ -763,8 +763,8 @@
   # Ignore if the from host is domainless (has no dot)
   return 0 unless ($srcvd->{rdns} =~ /\./);
 
-  # Ignore if the from host is from a reserved IP range
-  return 0 if ($srcvd->{ip_is_reserved});
+  # Ignore if the from host is from a private IP range
+  return 0 if ($srcvd->{ip_private});
 
   return 1;
 } # check_for_sender_no_reverse()
@@ -882,11 +882,11 @@
     local $_ = lc $self->get('From:addr');
     return 0 unless /\S/;
 
-    # find the earliest usable "originating IP".  ignore reserved nets
+    # find the earliest usable "originating IP".  ignore private nets
     my $origip;
     foreach my $rly (reverse (@{$self->{relays_trusted}}, @{$self->{relays_untrusted}}))
     {
-      next if ($rly->{ip_is_reserved});
+      next if ($rly->{ip_private});
       if ($rly->{ip}) {
 	$origip = $rly->{ip}; last;
       }
@@ -1256,9 +1256,9 @@
     push (@originating, ($str =~ m/($IP_ADDRESS)/g));
   }
 
-  # Let's go ahead and trim away all Reserved ips (KLC)
+  # Let's go ahead and trim away all private ips (KLC)
   # also uniq the list and strip dups. (jm)
-  my @ips = $self->ip_list_uniq_and_strip_reserved (@fullips);
+  my @ips = $self->ip_list_uniq_and_strip_private(@fullips);
 
   # if there's no untrusted IPs, it means we trust all the open-internet
   # relays, so we can return right now.
@@ -1280,7 +1280,7 @@
       # specified some third-party relays as trusted.  Also, don't use
       # @originating; those headers are added by a phase of relaying through
       # a server like Hotmail, which is not going to be in dialup lists anyway.
-      @ips = $self->ip_list_uniq_and_strip_reserved(@fullexternal);
+      @ips = $self->ip_list_uniq_and_strip_private(@fullexternal);
       if (scalar @ips > 1) { pop @ips; }
     }
     # If name is foo-firsttrusted, check only the Received header just
@@ -1300,7 +1300,7 @@
     else
     {
       # add originating IPs as untrusted IPs
-      @ips = reverse $self->ip_list_uniq_and_strip_reserved (@ips, @originating);
+      @ips = reverse $self->ip_list_uniq_and_strip_private(@ips, @originating);
 
       # How many IPs max you check in the received lines
       my $checklast=$self->{conf}->{num_check_received};
@@ -1440,15 +1440,15 @@
   }
 }
 
-sub ip_list_uniq_and_strip_reserved {
+sub ip_list_uniq_and_strip_private {
   my ($self, @origips) = @_;
   my @ips = ();
   my %seen = ();
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
   foreach my $ip (@origips) {
     next unless $ip;
     next if (exists ($seen{$ip})); $seen{$ip} = 1;
-    next if ($ip =~ /$IP_IN_RESERVED_RANGE/o);
+    next if ($ip =~ /$IP_PRIVATE/o);
     push(@ips, $ip);
   }
   return @ips;
@@ -2959,15 +2959,15 @@
 sub helo_ip_mismatch {
   my ($self) = @_;
   my $IP_ADDRESS = IPV4_ADDRESS;
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
 
   for my $relay (@{$self->{relays_untrusted}}) {
     # is HELO usable?
     next unless ($relay->{helo} =~ m/^$IP_ADDRESS$/ &&
-		 $relay->{helo} !~ /^$IP_IN_RESERVED_RANGE/);
+		 $relay->{helo} !~ /^$IP_PRIVATE/);
     # compare HELO with IP
     return 1 if ($relay->{ip} =~ m/^$IP_ADDRESS$/ &&
-		 $relay->{ip} !~ m/^$IP_IN_RESERVED_RANGE/ &&
+		 $relay->{ip} !~ m/^$IP_PRIVATE/ &&
 		 $relay->{helo} ne $relay->{ip} &&
 		 # different IP is okay if in same /24
 		 $relay->{helo} =~ /^(\d+\.\d+\.\d+\.)/ &&
@@ -3276,8 +3276,8 @@
 
   if ($rcvd) {
     my $IP_ADDRESS = IPV4_ADDRESS;
-    my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
-    if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /^$IP_IN_RESERVED_RANGE/) {
+    my $IP_PRIVATE = IP_PRIVATE;
+    if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /^$IP_PRIVATE/) {
       return 1;
     }
   }
@@ -3338,10 +3338,10 @@
   my ($self) = @_;
 
   my $IP_ADDRESS = IPV4_ADDRESS;
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
   for my $uri ($self->get_uri_list()) {
     if ($uri =~ m{^https?://[^/?]*\b($IP_ADDRESS)\b}i &&
-	$1 !~ /^$IP_IN_RESERVED_RANGE/)
+	$1 !~ /^$IP_PRIVATE/)
     {
       return 1;
     }

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?view=diff&rev=124829&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm&r1=124828&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm&r2=124829
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm	Mon Jan 10 12:01:08 2005
@@ -100,7 +100,7 @@
   my $did_user_specify_trust = ($trusted->get_num_nets() > 0);
   my $did_user_specify_internal = ($internal->get_num_nets() > 0);
 
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
   my $LOCALHOST = LOCALHOST;
 
   foreach my $line ( $msg->get_header('Received') ) {
@@ -165,8 +165,8 @@
 
       # if the 'from' IP addr is in a reserved net range, it's not on
       # the public internet.
-      if ($relay->{ip_is_reserved}) {
-	dbg("received-header: 'from' ".$relay->{ip}." has reserved IP");
+      if ($relay->{ip_private}) {
+	dbg("received-header: 'from' ".$relay->{ip}." has private IP");
 	$inferred_as_trusted = 1;
       }
 
@@ -207,11 +207,11 @@
 	foreach my $ip (@ips) {
 	  next if ($ip =~ /^${LOCALHOST}$/o);
 
-	  if ($ip !~ /${IP_IN_RESERVED_RANGE}/o) {
+	  if ($ip !~ /${IP_PRIVATE}/o) {
 	    dbg("received-header: 'by' ".$relay->{by}." has public IP $ip");
 	    $found_non_rsvd = 1;
 	  } else {
-	    dbg("received-header: 'by' ".$relay->{by}." has reserved IP $ip");
+	    dbg("received-header: 'by' ".$relay->{by}." has private IP $ip");
 	    $found_rsvd = 1;
 	  }
 	}
@@ -366,7 +366,7 @@
   my $envfrom = '';
   my $mta_looked_up_dns = 0;
   my $IP_ADDRESS = IP_ADDRESS;
-  my $IP_IN_RESERVED_RANGE = IP_IN_RESERVED_RANGE;
+  my $IP_PRIVATE = IP_PRIVATE;
   my $LOCALHOST = LOCALHOST;
   my $auth = '';
 
@@ -1140,8 +1140,8 @@
   dbg("received-header: parsed as $asstr");
   $relay->{as_string} = $asstr;
 
-  my $isrsvd = ($ip =~ /${IP_IN_RESERVED_RANGE}/o);
-  $relay->{ip_is_reserved} = $isrsvd;
+  my $is_private = ($ip =~ /${IP_PRIVATE}/o);
+  $relay->{ip_private} = $is_private;
 
   # add it to an internal array so Eval tests can use it
   return $relay;