sisimai 5.0.3 → 5.2.0

data/lib/sisimai/reason/blocked.rb

@@ -39,6 +39,7 @@ module Sisimai
           'host network not allowed',
           'hosts with dynamic ip',
           'invalid ip for sending mail of domain',
+          'is in a black list',
           'is not allowed to send mail from',
           'no access from mail server',
           'no matches to nameserver query',
@@ -59,6 +60,7 @@ module Sisimai
           'to submit messages to this e-mail system has been rejected',
           'too many spams from your ip',  # free.fr
           'too many unwanted messages have been sent from the following ip address above',
+          'was blocked by ',
           'we do not accept mail from dynamic ips',   # @mail.ru
           'you are not allowed to connect',
           'you are sending spam',
@@ -67,16 +69,19 @@ module Sisimai
           'your server requires confirmation',
         ].freeze
         Pairs = [
+          ['(', '@', ':blocked)'],
           ['access from ip address ', ' blocked'],
           ['client host ', ' blocked using'],
           ['connections will not be accepted from ', " because the ip is in spamhaus's list"],
           ['dnsbl:rbl ', '>_is_blocked'],
           ['email blocked by ', '.barracudacentral.org'],
           ['email blocked by ', 'spamhaus'],
+          ['host ', ' refused to talk to me: ', ' blocked'],
           ['ip ', ' is blocked by earthlink'],    # Earthlink
           ['is in an ', 'rbl on '],
           ['mail server at ', ' is blocked'],
           ['mail from ',' refused:'],
+          ["mail from "," refused, see ", "orbs"],
           ['message from ', ' rejected based on blacklist'],
           ['messages from ', ' temporarily deferred due to user complaints'], # Yahoo!
           ['server ip ', ' listed as abusive'],
@@ -86,15 +91,9 @@ module Sisimai
           ['the ip', ' is blacklisted'],
           ['veuillez essayer plus tard. service refused, please try later. ', '103'],
           ['veuillez essayer plus tard. service refused, please try later. ', '510'],
+          ["your access ip", " has been rejected"],
           ["your sender's ip address is listed at ", '.abuseat.org'],
         ].freeze
-        Regex = %r{(?>
-           [(][^ ]+[@][^ ]+:blocked[)]
-          |host[ ][^ ]+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
-          |is[ ]in[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
-          |was[ ]blocked[ ]by[ ][^ ]+
-          )
-        }x.freeze
 
         def text; return 'blocked'; end
         def description; return 'Email rejected due to client IP address or a hostname'; end
@@ -107,7 +106,6 @@ module Sisimai
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
           return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
-          return true if argv1 =~ Regex
           return false
         end
 
@@ -119,8 +117,7 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'blocked'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'blocked'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/contenterror.rb

@@ -38,7 +38,13 @@ module Sisimai
         # @return   [True,False]            true: rejected due to content error
         #                                   false: is not content error
         # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs); return nil; end
+        def true(argvs)
+          require 'sisimai/reason/spamdetected'
+          return true  if argvs["reason"] == "blocked"
+          return false if Sisimai::Reason::SpamDetected.true(argvs)
+          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]).to_s == "contenterror"
+          return match(argvs["diagnosticcode"].downcase)
+        end
 
       end
     end

data/lib/sisimai/reason/exceedlimit.rb

@@ -38,10 +38,7 @@ module Sisimai
           # Status: 5.2.3
           # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'exceedlimit'
-
-          # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/failedstarttls.rb

@@ -0,0 +1,42 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::FailedSTARTTLS checks the bounce reason is "failedstarttls" or not.
+    # This class is called only Sisimai::Reason class.
+    module FailedSTARTTLS
+      class << self
+        # Email delivery failed due to STARTTLS related problem
+        Index = [
+          'starttls is required to send mail',
+          'tls required but not supported',   # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
+        ].freeze
+
+        def text; return 'failedstarttls'; end
+        def description; return "Email delivery failed due to STARTTLS related problem"; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          return true if Index.any? { |a| argv1.include?(a) }
+          return false
+        end
+
+        # Email delivery failed due to STARTTLS related problem
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
+        # @return   [True,False]            true: FailedSTARTTLS
+        #                                   false: Not FailedSTARTTLS
+        # @see http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return true if argvs["reason"] == "failedstarttls"
+          return true if argvs["command"] == "STARTTLS"
+          return true if [523, 524, 538].index(argvs["replycode"].to_i)
+          return match(argvs["diagnosticcode"].downcase)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/filtered.rb

@@ -15,6 +15,7 @@ module Sisimai
           'due to extended inactivity new mail is not currently being accepted for this mailbox',
           'has restricted sms e-mail',    # AT&T
           'is not accepting any mail',
+          "message filtered",
           'message rejected due to user rules',
           'not found recipient account',
           'refused due to recipient preferences', # Facebook
@@ -53,15 +54,15 @@ module Sisimai
           return false if tempreason == 'suspend'
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
-          thecommand = argvs['smtpcommand']             || ''
+          thecommand = argvs['command']                 || ''
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
             return true if Sisimai::Reason::UserUnknown.match(issuedcode)
             return true if match(issuedcode)
           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.
+            # The value of "reason" isn't "filtered" when the value of "command" 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 false if %w[CONN EHLO HELO MAIL RCPT].include?(thecommand)
             return true  if match(issuedcode)
             return true  if Sisimai::Reason::UserUnknown.match(issuedcode)

data/lib/sisimai/reason/hasmoved.rb

@@ -30,8 +30,7 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs['reason'] == 'hasmoved'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/hostunknown.rb

@@ -54,12 +54,12 @@ module Sisimai
           statuscode = argvs['deliverystatus'] || ''
 
           if Sisimai::SMTP::Status.name(statuscode).to_s == 'hostunknown'
-            # Status: 5.1.2
-            # Diagnostic-Code: SMTP; 550 Host unknown
+            # To prevent classifying DNS errors as "HostUnknown"
             require 'sisimai/reason/networkerror'
             return true unless Sisimai::Reason::NetworkError.match(issuedcode)
           else
-            # Check the value of Diagnosic-Code: header with patterns
+            # Status: 5.1.2
+            # Diagnostic-Code: SMTP; 550 Host unknown
             return true if match(issuedcode)
           end
 

data/lib/sisimai/reason/mailboxfull.rb

@@ -37,6 +37,7 @@ module Sisimai
           'maildir delivery failed: domaindisk quota ',
           'mailfolder is full',
           'no space left on device',
+          'not enough disk space',
           'not enough storage space in',
           'not sufficient disk space',
           'over the allowed quota',
@@ -84,10 +85,7 @@ module Sisimai
           # Status: 4.2.2
           # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'mailboxfull'
-
-          # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/mailererror.rb

@@ -11,6 +11,7 @@ module Sisimai
     module MailerError
       class << self
         Index = [
+          ' || exit ',
           'procmail: ',
           'bin/procmail',
           'bin/maidrop',
@@ -21,7 +22,6 @@ module Sisimai
           'pipe to |/',
           'x-unix; ',
         ].freeze
-        Regex = %r/exit[ ]\d+/.freeze
 
         def text; return 'mailererror'; end
         def description; return 'Email returned due to a mailer program has not exited successfully'; end
@@ -33,7 +33,6 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
-          return true if argv1 =~ Regex
           return false
         end
 

data/lib/sisimai/reason/mesgtoobig.rb

@@ -8,6 +8,7 @@ module Sisimai
       class << self
         Index = [
           'exceeded maximum inbound message size',
+          'exceeded the maximum incoming message size',
           'line limit exceeded',
           'max message size exceeded',
           'message file too big',
@@ -52,10 +53,7 @@ module Sisimai
 
           #  5.2.3   Message length exceeds administrative limit
           return false if( tempreason == 'exceedlimit' || statuscode == '5.2.3' )
-
-          # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/norelaying.rb

@@ -15,6 +15,7 @@ module Sisimai
           'insecure mail relay',
           'is not permitted to relay through this server without authentication',
           'mail server requires authentication when attempting to send to a non-local e-mail address', # MailEnable
+          'no relaying',
           'not a gateway',
           'not allowed to relay through this machine',
           'not an open relay, so get lost',
@@ -52,9 +53,8 @@ module Sisimai
         def true(argvs)
           r = argvs['reason'] || ''
           return false if r.start_with?('securityerror', 'systemerror', 'undefined')
-          return false if %w[CONN EHLO HELO].include?(argvs['smtpcommand'])
-          return true  if match(argvs['diagnosticcode'].downcase)
-          return false
+          return false if %w[CONN EHLO HELO].include?(argvs['command'])
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/notaccept.rb

@@ -44,9 +44,8 @@ module Sisimai
 
           # SMTP Reply Code is 554 or 556
           return true  if [521, 554, 556].index(argvs['replycode'].to_i)
-          return false if argvs['smtpcommand'] != 'MAIL'
-          return true  if match(argvs['diagnosticcode'].downcase)
-          return false
+          return false if argvs['command'] != 'MAIL'
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -7,10 +7,16 @@ module Sisimai
     # example, there are multiple "Subject" headers in the email.
     module NotCompliantRFC
       class << self
+        require 'sisimai/string'
         Index = [
-        'this message is not rfc 5322 compliant',
-        'https://support.google.com/mail/?p=rfcmessagenoncompliant',
+          'duplicate header',
+          'this message is not rfc 5322 compliant',
+          'https://support.google.com/mail/?p=rfcmessagenoncompliant',
         ].freeze
+        Pairs = [
+          [' multiple ', ' header'],
+        ].freeze
+        
 
         def text; return 'notcompliantrfc'; end
         def description; return 'Email rejected due to non-compliance with RFC'; end
@@ -22,6 +28,7 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
@@ -32,8 +39,7 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc5322.txt
         def true(argvs)
           return true if argvs['reason'] == 'notcompliantrfc'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/rejected.rb

@@ -63,6 +63,7 @@ module Sisimai
           'sender rejected',
           'sender domain is empty',
           'sender verify failed',     # Exim callout
+          'sender was rejected',      # qmail
           'spam reporting address',   # SendGrid|a message to an address has previously been marked as Spam by the recipient.
           'syntax error: empty email address',
           'the message has been rejected by batv defense',
@@ -101,7 +102,7 @@ module Sisimai
 
           # Check the value of Diagnosic-Code: header with patterns
           issuedcode = argvs['diagnosticcode'].downcase
-          thecommand = argvs['smtpcommand'] || ''
+          thecommand = argvs['command'] || ''
           if thecommand == 'MAIL'
             # The session was rejected at 'MAIL FROM' command
             return true if match(issuedcode)

data/lib/sisimai/reason/requireptr.rb

@@ -13,6 +13,7 @@ module Sisimai
           'all mail servers must have a ptr record with a valid reverse dns entry',
           'bad dns ptr resource record',
           'cannot find your hostname',
+          "cannot resolve your address.",
           'client host rejected: cannot find your hostname',  # Yahoo!
           'fix reverse dns for ',
           'ips with missing ptr records',
@@ -58,8 +59,7 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'requireptr'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'requireptr'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/securityerror.rb

@@ -29,8 +29,6 @@ module Sisimai
           'insecure mail relay',
           'recipient address rejected: access denied',
           "sorry, you don't authenticate or the domain isn't in my list of allowed rcpthosts",
-          'starttls is required to send mail',
-          'tls required but not supported',   # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
           'unauthenticated senders not allowed',
           'verification failure',
           'you are not authorized to send mail, authentication is required',
@@ -57,7 +55,7 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is security error or not
+        # The bounce reason is SecurityError or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is security error
         #                                   false: is not security error

data/lib/sisimai/reason/spamdetected.rb

@@ -104,6 +104,7 @@ module Sisimai
         ].freeze
         Pairs = [
           ['greylisted', ' please try again in'],
+          ['mail score (', ' over '],
           ['mail rejete. mail rejected. ', '506'],
           ['our filters rate at and above ', ' percent probability of being spam'],
           ['rejected by ', ' (spam)'],
@@ -113,7 +114,6 @@ module Sisimai
           ['spam ', ' exceeded'],
           ['this message scored ', ' spam points'],
         ].freeze
-        Regex = %r/(?:\d[.]\d[.]\d|\d{3})[ ]spam\z/.freeze
 
         def text; return 'spamdetected'; end
         def description; return 'Email rejected by spam filter running on the remote host'; end
@@ -126,7 +126,6 @@ module Sisimai
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
           return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
-          return true if argv1 =~ Regex
           return false
         end
 
@@ -140,12 +139,11 @@ module Sisimai
           return true if argvs['reason'] == 'spamdetected'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == '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 false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['smtpcommand'])
-          return true  if match(argvs['diagnosticcode'].downcase)
-          return false
+          # The value of "reason" isn't "spamdetected" when the value of "command" 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 false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['command'])
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/speeding.rb

@@ -38,8 +38,7 @@ module Sisimai
           # Remote-MTA: dns; smtp.example.jp
           # Diagnostic-Code: smtp; 451 4.7.1 <mx.example.org[192.0.2.2]>: Client host rejected:
           #                  Please try again slower
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/suppressed.rb

@@ -0,0 +1,36 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::Suppressed checks the bounce reason is "suppressed" or not. This class is called
+    # only Sisimai::Reason class.
+    #
+    # This is the error that the recipient adddress is listed in the suppression list of the relay
+    # server, and was not delivered.
+    module Suppressed
+      class << self
+        def text; return 'suppressed'; end
+        def description; return "Email was not delivered due to being listed in the suppression list of MTA"; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          return false
+        end
+
+        # Whether the address is listed in the suppression list
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
+        # @return   [True,False]            true: The address is listed in the suppression list
+        #                                   false: is not listed in the suppression list
+        # @see http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return true if argvs['reason'] == 'suppressed'
+          return match(argvs['diagnosticcode'].downcase)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/reason/suspend.rb

@@ -50,11 +50,9 @@ module Sisimai
         #                                   false: is not suspended
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
           return true if argvs['reason'] == 'suspend'
           return true if argvs['replycode'].to_i == 525
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/systemerror.rb

@@ -9,6 +9,7 @@ module Sisimai
     #   message has been in the queue too long.
     module SystemError
       class << self
+        require 'sisimai/string'
         Index = [
           'aliasing/forwarding loop broken',
           "can't create user output file",
@@ -33,6 +34,9 @@ module Sisimai
           'timeout waiting for input',
           'transaction failed ',
         ].freeze
+        Pairs = [
+          ['unable to connect ', 'daemon'],
+        ].freeze
 
         def text; return 'systemerror'; end
         def description; return 'Email returned due to system error on the remote host'; end
@@ -44,6 +48,7 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/toomanyconn.rb

@@ -48,8 +48,7 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'toomanyconn'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'toomanyconn'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/userunknown.rb

@@ -191,7 +191,7 @@ module Sisimai
             end
             return true unless matchother # Did not match with other message patterns
 
-          elsif argvs['smtpcommand'] == 'RCPT'
+          elsif argvs['command'] == 'RCPT'
             # When the SMTP command is not "RCPT", the session rejected by other
             # reason, maybe.
             return true if match(issuedcode)

data/lib/sisimai/reason/virusdetected.rb

@@ -44,13 +44,12 @@ module Sisimai
         # @since 4.22.0
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          # The value of "reason" isn't "visusdetected" 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.
+          # The value of "reason" isn't "visusdetected" when the value of "command" 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 true  if argvs['reason'] == 'virusdetected'
-          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['smtpcommand'])
-          return true  if match(argvs['diagnosticcode'].downcase)
-          return false
+          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['command'])
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end