Strictly checks the valuie of "smtpcommand": Imported from #442

sisimai · Nov 19, 2021 · 57b468f · 57b468f
1 parent 0998d1a
commit 57b468f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/lib/Sisimai/Reason/Filtered.pm b/lib/Sisimai/Reason/Filtered.pm
@@ -49,15 +49,18 @@ sub true {
 
     require Sisimai::Reason::UserUnknown;
     my $alterclass = 'Sisimai::Reason::UserUnknown';
-    my $commandtxt = $argvs->smtpcommand // '';
     my $diagnostic = lc $argvs->diagnosticcode // '';
 
     if( $tempreason eq 'filtered' ) {
         # Delivery status code points "filtered".
-        return 1 if( $alterclass->match($diagnostic) || __PACKAGE__->match($diagnostic) );
+        return 1 if $alterclass->match($diagnostic);
+        return 1 if __PACKAGE__->match($diagnostic);
 
-    } elsif( $commandtxt ne 'RCPT' && $commandtxt ne 'MAIL' ) {
-        # Check the value of Diagnostic-Code and the last SMTP command
+    } else {
+        # The value of "reason" isn't "filtered" when the value of "smtpcommand" is an SMTP command
+        # to be sent before the SMTP DATA command because all the MTAs read the headers and the
+        # entire message body after the DATA command.
+        return 0 if $argvs->{'smtpcommand'} =~ /\A(?:CONN|EHLO|HELO|MAIL|RCPT)\z/;
         return 1 if __PACKAGE__->match($diagnostic);
         return 1 if $alterclass->match($diagnostic);
     }

diff --git a/lib/Sisimai/Reason/NoRelaying.pm b/lib/Sisimai/Reason/NoRelaying.pm
@@ -47,14 +47,9 @@ sub true {
     my $class = shift;
     my $argvs = shift // return undef;
 
-    if( my $r = $argvs->reason // '' ) {
-        # Do not overwrite the reason
-        return 0 if( $r eq 'securityerror' || $r eq 'systemerror' || $r eq 'undefined' );
-    } else {
-        # Check the value of Diagnosic-Code: header with patterns
-        return 1 if __PACKAGE__->match(lc $argvs->diagnosticcode);
-    }
-    return 0;
+    return 0 if $argvs->{'reason'}      =~ /\A(?:securityerror|systemerror|undefined)\z/;
+    return 0 if $argvs->{'smtpcommand'} =~ /\A(?:CONN|EHLO|HELO)\z/;
+    return 1 if __PACKAGE__->match(lc $argvs->{'diagnosticcode'});return 0;
 }
 
 1;

diff --git a/lib/Sisimai/Reason/SpamDetected.pm b/lib/Sisimai/Reason/SpamDetected.pm
@@ -157,6 +157,11 @@ sub true {
     return undef unless $argvs->deliverystatus;
     return 1 if $argvs->reason eq 'spamdetected';
     return 1 if (Sisimai::SMTP::Status->name($argvs->deliverystatus) || '') eq 'spamdetected';
+
+    # The value of "reason" isn't "spamdetected" when the value of "smtpcommand" is an SMTP command
+    # to be sent before the SMTP DATA command because all the MTAs read the headers and the entire
+    # message body after the DATA command.
+    return 0 if $argvs->{'smtpcommand'} =~ /\A(?:CONN|EHLO|HELO|MAIL|RCPT)\z/;
     return 1 if __PACKAGE__->match(lc $argvs->diagnosticcode);
     return 0;
 }

diff --git a/lib/Sisimai/Reason/VirusDetected.pm b/lib/Sisimai/Reason/VirusDetected.pm
@@ -32,7 +32,16 @@ sub true {
     #                                   0: virus was not detected
     # @since v4.22.0
     # @see http://www.ietf.org/rfc/rfc2822.txt
-    return undef;
+    my $class = shift;
+    my $argvs = shift // return undef;
+
+    # The value of "reason" isn't "virusdetected" when the value of "smtpcommand" is an SMTP com-
+    # mand to be sent before the SMTP DATA command because all the MTAs read the headers and the
+    # entire message body after the DATA command.
+    return 1 if $argvs->{'reason'} eq 'virusdetected';
+    return 0 if $argvs->{'smtpcommand'} =~ /\A(?:CONN|EHLO|HELO|MAIL|RCPT)\z/;
+    return 1 if __PACKAGE__->match(lc $argvs->{'diagnosticcode'});
+    return 0;
 }
 
 1;
@@ -90,7 +99,7 @@ azumakuniyuki
 
 =head1 COPYRIGHT
 
-Copyright (C) 2017-2019 azumakuniyuki, All rights reserved.
+Copyright (C) 2017-2019,2021 azumakuniyuki, All rights reserved.
 
 =head1 LICENSE
 

diff --git a/xt/619-lhost-ezweb.t b/xt/619-lhost-ezweb.t
@@ -114,7 +114,7 @@ my $isexpected = [
     { 'n' => '01105', 'r' => qr/filtered/    },
     { 'n' => '01106', 'r' => qr/userunknown/ },
     { 'n' => '01107', 'r' => qr/filtered/    },
-    { 'n' => '01108', 'r' => qr/userunknown/ },
+    { 'n' => '01108', 'r' => qr/norelaying/  },
     { 'n' => '01109', 'r' => qr/userunknown/ },
     { 'n' => '01110', 'r' => qr/filtered/    },
     { 'n' => '01111', 'r' => qr/suspend/     },