Changeset 18 for trunk

Timestamp:

03/04/10 17:10:13 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Update extract-data based on live version

File:

• trunk/dnsbl/extract-data (modified) (4 diffs)

trunk/dnsbl/extract-data

@@ -26 +26 @@
 # hmm. can't make (enough) sense of the docs.  gonna have to parse headers for IPs myself...  :/
 # but we did find enough to extract the URIs...
-use lib '/opt/spamassassin/share/perl/5.8.8';
+use lib '/opt/spamassassin/share/perl/5.10.0';
 use Mail::SpamAssassin;
 use Mail::SpamAssassin::PerMsgStatus;
@@ -90 +90 @@
 my @dontlistme = (
     # Hotmail/Windows Live Mail
+#IP-Network                    207.68.128.0/18
+#IP-Network                    207.68.192.0/20
+#IP-Network-Block              207.068.128.000 - 207.068.207.255
         NetAddr::IP->new("65.52.0.0/14"),
+        NetAddr::IP->new("207.68.176.96/27"),
 
     # AOL - note only some IPs show mail-ish rDNS
     #IP-Network                    205.188.0.0/16
     #IP-Network                    64.12.0.0/16 
-        NetAddr::IP->new("205.188.105.140/29"),
+        NetAddr::IP->new("205.188.91.96/29"),
+        NetAddr::IP->new("205.188.105.143"),
+        NetAddr::IP->new("205.188.105.144/30"),
         NetAddr::IP->new("205.188.169.196/29"),
         NetAddr::IP->new("205.188.249.128/29"),
         NetAddr::IP->new("205.188.249.64/29"),
+        NetAddr::IP->new("64.12.78.136/30"),
+        NetAddr::IP->new("64.12.78.142"),
         NetAddr::IP->new("64.12.143.144/30"),
+        NetAddr::IP->new("64.12.143.152/30"),
+        NetAddr::IP->new("64.12.206.40/30"),
 
     # Google/GMail
         NetAddr::IP->new("209.85.128.0/17"),
         NetAddr::IP->new("72.14.192.0/18"),
+        NetAddr::IP->new("74.125.0.0/16"),
 
     # Yahoo!/Inktomi
@@ -121 +132 @@
         NetAddr::IP->new("212.82.104.0/21"),
         NetAddr::IP->new("66.163.160.0/19"),
+#inetnum:        87.248.110.0 - 87.248.111.255
+#route:          87.248.104.0/21
+        NetAddr::IP->new("87.248.110.0/23"),
+        NetAddr::IP->new("203.188.200.0/22"),
+        NetAddr::IP->new("217.12.0.0/20"),
+
+    # MessageLabs - may add these to trusted_networks instead
+        NetAddr::IP->new("85.158.139.0/24"),
 
     # Bell Canada - note only some IPs show mail-ish rDNS
@@ -152 +171 @@
         NetAddr::IP->new("216.221.81.96/30"),
 
+    # seznam.cz
+    #route:          77.75.72.0/23
+        NetAddr::IP->new("77.75.72.44"),
+
+    # Facebook - only exclude mail-ish hostnames
+    #IP-Network                    69.63.176.0/20
+        # .178.160/27 plus a few more to 199 show mailish rDNS
+        NetAddr::IP->new("69.63.178.160/27"),
+        NetAddr::IP->new("69.63.178.192/29"),
+
+    # T-Online - only mail-ish hostnames
+#route:        194.25.0.0/16
+#inetnum:      194.25.134.0 - 194.25.134.255
+#netname:      DTOS-ULM-001
+#descr:        www.t-online.de
+#descr:        mail.t-online.de
+#descr:        php.t-online.de
+        NetAddr::IP->new("194.25.134.80/29"),
+
+## Edumactional places
+
     # UAlberta - only one IP observed with mail-ish rDNS
     #IP-Network                    129.128.0.0/16
         NetAddr::IP->new("129.128.5.19"),
 
-    # seznam.cz
-    #route:          77.75.72.0/23
-        NetAddr::IP->new("77.75.72.44"),
+    # University of Maryland Baltimore County - mail servers only
+    #CIDR:       130.85.0.0/16
+        NetAddr::IP->new("130.85.25.76/30"),
+
+    # University of Florida
+    #IP-Network                    128.227.0.0/16
+        NetAddr::IP->new("128.227.74.165"),
 
     ); # done def for @dontlistme