svn commit: r1056043 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu Jan  6 19:53:03 2011
New Revision: 1056043

URL: http://svn.apache.org/viewvc?rev=1056043&view=rev
Log:
Bug 5655: Bayes not considering add_header'ed information:
let the ASN plugin provide meta-information that can be
tokenized by bayes in a form of X-ASN and X-ASN-Route
header fields

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm?rev=1056043&r1=1056042&r2=1056043&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ASN.pm Thu Jan  6 19:53:03 2011
@@ -35,6 +35,8 @@
 #   "192.88.99.0/24 | AS1103 | SURFnet, The Netherlands | 2002-10-15 | EU"
 #   "15169 | 2a00:1450::/32 | IE | ripencc | 2009-10-05"
 #   "as1103"
+# Multiple routes are sometimes provided by returning multiple TXT records
+# (e.g. from cymru.com). This form of a response is handled as well.
 #
 # Some zones also support IPv6 lookups, for example:
 #   asn_lookup origin6.asn.cymru.com [_ASN_ _ASNCIDR_]
@@ -410,11 +412,13 @@ sub process_dns_result {
   }
 
   if ($any_asn_updates && @asn_tag_data) {
+    $pms->{msg}->put_metadata('X-ASN', join(' ',@asn_tag_data));
     my $prefix = $pms->{conf}->{asn_prefix};
     if (defined $prefix && $prefix ne '') { s/^/$prefix/ for @asn_tag_data }
     $pms->set_tag($asn_tag, join(' ',@asn_tag_data));
   }
   if ($any_route_updates && @route_tag_data) {
+    $pms->{msg}->put_metadata('X-ASN-Route', join(' ',@route_tag_data));
     $pms->set_tag($route_tag, join(' ',@route_tag_data));
   }
 }