svn commit: r1429988 - /spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

[km...@apache.org]

Author: kmcgrail
Date: Mon Jan  7 20:12:44 2013
New Revision: 1429988

URL: http://svn.apache.org/viewvc?rev=1429988&view=rev
Log:
Disabled parsing of DKIM Header to extract URIs - Bug 6700

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1429988&r1=1429987&r2=1429988&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Jan  7 20:12:44 2013
@@ -1990,14 +1990,19 @@ sub get_uri_detail_list {
   # do this so we're sure metadata->html is setup
   my %parsed = map { $_ => 'parsed' } $self->_get_parsed_uri_list();
 
+
+  # This parses of DKIM for URIs disagrees with documentation and bug 6700 votes to disable
+  # this functionality
+  # 2013-01-07
+
   # Look for the domain in DK/DKIM headers
-  my $dk = join(" ", grep {defined} ( $self->get('DomainKey-Signature',undef),
-                                      $self->get('DKIM-Signature',undef) ));
-  while ($dk =~ /\bd\s*=\s*([^;]+)/g) {
-    my $dom = $1;
-    $dom =~ s/\s+//g;
-    $parsed{$dom} = 'domainkeys';
-  }
+  #my $dk = join(" ", grep {defined} ( $self->get('DomainKey-Signature',undef),
+  #                                    $self->get('DKIM-Signature',undef) ));
+  #while ($dk =~ /\bd\s*=\s*([^;]+)/g) {
+  #  my $dom = $1;
+  #  $dom =~ s/\s+//g;
+  #  $parsed{$dom} = 'domainkeys';
+  #}
 
   # get URIs from HTML parsing
   # use the metadata version since $self->{html} may not be setup