You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/04/21 12:28:07 UTC
svn commit: r1876795 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Message.pm
branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
trunk/lib/Mail/SpamAssassin/Message.pm
trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Author: hege
Date: Tue Apr 21 12:28:07 2020
New Revision: 1876795
URL: http://svn.apache.org/viewvc?rev=1876795&view=rev
Log:
Add some suppl_attrib debugging
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm?rev=1876795&r1=1876794&r2=1876795&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm Tue Apr 21 12:28:07 2020
@@ -132,6 +132,7 @@ sub new {
# $self->{pristine_body} size, e.g. when the caller passed a truncated
# message to SpamAssassin, or when counting line-endings differently.
$self->{pristine_body_length} = $self->{suppl_attrib}{body_size};
+ dbg("message: set pristine_body_length from suppl_attrib: %s", $self->{pristine_body_length});
}
if (ref $self->{suppl_attrib}{mimepart_digests}) {
# Optional info provided by a caller: an array of digest codes (e.g. SHA1)
@@ -139,6 +140,7 @@ sub new {
# As such it may differ from digests calculated by get_mimepart_digests(),
# e.g. when the caller passed a truncated message to SpamAssassin.
$self->{mimepart_digests} = $self->{suppl_attrib}{mimepart_digests};
+ dbg("message: set mimepart_digests from suppl_attrib");
}
}
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1876795&r1=1876794&r2=1876795&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Tue Apr 21 12:28:07 2020
@@ -55,13 +55,14 @@ use Mail::SpamAssassin::Constants qw(:ip
sub parse_received_headers {
my ($self, $permsgstatus, $msg) = @_;
- my $suppl_attrib = $msg->{suppl_attrib}; # out-of-band info from a caller
-
# a caller may assert that a message is coming from inside or from an
# authenticated roaming users; this info may not be available in mail
# header section, e.g. in case of nonstandard authentication mechanisms
my $originating; # boolean
- $originating = $suppl_attrib->{originating} if ref $suppl_attrib;
+ if (defined $msg->{suppl_attrib}->{originating}) {
+ $originating = $msg->{suppl_attrib}->{originating};
+ dbg("metadata: set originating from suppl_attrib: %s", $originating);
+ }
$self->{relays_trusted} = [ ];
$self->{num_relays_trusted} = 0;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=1876795&r1=1876794&r2=1876795&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Tue Apr 21 12:28:07 2020
@@ -129,6 +129,7 @@ sub new {
# $self->{pristine_body} size, e.g. when the caller passed a truncated
# message to SpamAssassin, or when counting line-endings differently.
$self->{pristine_body_length} = $self->{suppl_attrib}{body_size};
+ dbg("message: set pristine_body_length from suppl_attrib: %s", $self->{pristine_body_length});
}
if (ref $self->{suppl_attrib}{mimepart_digests}) {
# Optional info provided by a caller: an array of digest codes (e.g. SHA1)
@@ -136,6 +137,7 @@ sub new {
# As such it may differ from digests calculated by get_mimepart_digests(),
# e.g. when the caller passed a truncated message to SpamAssassin.
$self->{mimepart_digests} = $self->{suppl_attrib}{mimepart_digests};
+ dbg("message: set mimepart_digests from suppl_attrib");
}
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1876795&r1=1876794&r2=1876795&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Tue Apr 21 12:28:07 2020
@@ -59,13 +59,14 @@ my $LOCALHOST = LOCALHOST;
sub parse_received_headers {
my ($self, $pms, $msg) = @_;
- my $suppl_attrib = $msg->{suppl_attrib}; # out-of-band info from a caller
-
# a caller may assert that a message is coming from inside or from an
# authenticated roaming users; this info may not be available in mail
# header section, e.g. in case of nonstandard authentication mechanisms
my $originating; # boolean
- $originating = $suppl_attrib->{originating} if ref $suppl_attrib;
+ if (defined $msg->{suppl_attrib}->{originating}) {
+ $originating = $msg->{suppl_attrib}->{originating};
+ dbg("metadata: set originating from suppl_attrib: %s", $originating);
+ }
$self->{relays_trusted} = [ ];
$self->{num_relays_trusted} = 0;