sisimai 5.5.0 → 5.6.0

data/lib/sisimai/reason/{mesgtoobig.rb → emailtoolarge.rb}

@@ -2,27 +2,25 @@ module Sisimai
   module Reason
     # This is the error that a sent email size is too big for a destination mail server. In many
     # case, There are many attachment files with email, or the file size is too large. Sisimai will
-    # set "mesgtoobig" to the reason of email bounce if the value of Status: field in a bounce email
-    # is "5.3.4".
-    module MesgTooBig
+    # set "emailtoolarge" to the reason of email bounce if the value of Status: field in a bounce
+    # email is "5.2.3" or "5.3.4".
+    module EmailTooLarge
       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',
-          'message length exceeds administrative limit',
-          'message size exceeds fixed limit',
-          'message size exceeds fixed maximum message size',
-          'message size exceeds maximum value',
-          'message too big',
-          'message too large for this ',
-          'size limit',
-          'taille limite du message atteinte',
+          "line limit exceeded",
+          "mail file size exceeds the maximum size allowed for mail delivery",
+          "message too large",
+          "size limit",
+          "taille limite du message atteinte",
+        ].freeze
+        Pairs = [
+          ["exceeded", "message size"],
+          ["message ", "exceeds ", "limit"],
+          ["message ", "size", "exceed"],
+          ["message ", "too", "big"],
         ].freeze
 
-        def text; return 'mesgtoobig'; end
+        def text; return 'emailtoolarge'; end
         def description; return 'Email rejected due to an email size is too big for a destination mail server'; end
 
         # Try to match that the given text and regular expressions
@@ -31,6 +29,7 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
@@ -40,18 +39,18 @@ module Sisimai
         #                                   false: is not big
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'mesgtoobig'
+          return true if argvs['reason'] == 'emailtoolarge'
 
           statuscode = argvs['deliverystatus'] || ''
           tempreason = Sisimai::SMTP::Status.name(statuscode)
 
-          # Delivery status code points "mesgtoobig".
+          # Delivery status code points "emailtoolarge".
           # Status: 5.3.4
           # Diagnostic-Code: SMTP; 552 5.3.4 Error: message file too big
-          return true if tempreason == 'mesgtoobig'
-
-          #  5.2.3   Message length exceeds administrative limit
-          return false if( tempreason == 'exceedlimit' || statuscode == '5.2.3' )
+          #
+          # Status: 5.2.3
+          # Deiagnostic-Code: Message length exceeds administrative limit
+          return true if tempreason == 'emailtoolarge'
           return match(argvs['diagnosticcode'].downcase)
         end
 
@@ -60,5 +59,3 @@ module Sisimai
   end
 end
 
-
-

data/lib/sisimai/reason/expired.rb

@@ -7,32 +7,25 @@ module Sisimai
     # the message you sent has been in the queue for long time.
     module Expired
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'connection timed out',
-          'could not find a gateway for',
-          'delivery attempts will continue to be',
-          'delivery expired',
-          'delivery time expired',
-          'failed to deliver to domain ',
-          'giving up on',
-          'have been failing for a long time',
-          'has been delayed',
-          'it has not been collected after',
-          'message expired after sitting in queue for',
-          'message expired, cannot connect to remote server',
-          'message expired, connection refulsed',
-          'message timed out',
-          'retry time not reached for any host after a long failure period',
-          'server did not respond',
-          'this message has been in the queue too long',
-          'unable to deliver message after multiple retries',
-          'was not reachable within the allowed queue period',
-          'your message could not be delivered for more than',
+          "connection timed out",
+          "could not find a gateway for",
+          "delivery attempts will continue to be",
+          "failed to deliver to domain ",
+          "have been failing for a long time",
+          "has been delayed",
+          "it has not been collected after",
+          "message could not be delivered for more than",
+          "message expired, ",
+          "message has been in the queue too long",
+          "message timed out",
+          "server did not respond",
+          "unable to deliver message after multiple retries",
         ].freeze
         Pairs = [
-          ['could not be delivered for', ' days'],
+          ["could not be delivered for", " days"],
+          ["delivery ", "expired"],
+          ["not", "reach", "period"],
         ].freeze
 
         def text; return 'expired'; end

data/lib/sisimai/reason/filtered.rb

@@ -10,22 +10,18 @@ module Sisimai
     module Filtered
       class << self
         Index = [
-          'because the recipient is only accepting mail from specific email addresses',   # AOL Phoenix
-          'bounced address',  # SendGrid|a message to an address has previously been Bounced.
-          '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',
+          "account is protected by",
+          "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
-          'resolver.rst.notauthorized',   # Microsoft Exchange
-          'this account is protected by',
-          'user not found',   # Filter on MAIL.RU
-          'user refuses to receive this mail',
-          'user reject',
-          'we failed to deliver mail because the following address recipient id refuse to receive mail',  # Willcom
-          'you have been blocked by the recipient',
+          "message rejected due to user rules",
+          "not found recipient account",
+          "recipient id refuse to receive mail", # Willcom
+          "recipient is only accepting mail from specific email addresses", # AOL Phoenix
+          "refused due to recipient preferences", # Facebook
+          "user refuses to receive this mail",
+          "user reject",
+          "you have been blocked by the recipient",
         ].freeze
 
         def text; return 'filtered'; end
@@ -48,7 +44,6 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'filtered'
 
-          require 'sisimai/reason/userunknown'
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
           return false if tempreason == 'suspend'
 
@@ -56,12 +51,13 @@ module Sisimai
           thecommand = argvs['command']                 || ''
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
+            require 'sisimai/reason/userunknown'
             return true if Sisimai::Reason::UserUnknown.match(issuedcode) || match(issuedcode)
           else
             # 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 false if Sisimai::SMTP::Command::ExceptDATA.include?(thecommand)
             return true  if match(issuedcode) || Sisimai::Reason::UserUnknown.match(issuedcode)
           end
           return false

data/lib/sisimai/reason/hasmoved.rb

@@ -28,7 +28,8 @@ module Sisimai
         #                                   false: Has not moved
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'hasmoved'
+          return true  if argvs['reason'] == 'hasmoved'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/hostunknown.rb

@@ -6,26 +6,22 @@ module Sisimai
     # Status: field in a bounce mail is "5.1.2".
     module HostUnknown
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'domain does not exist',
-          'domain is not reachable',
-          'domain must exist',
-          'host or domain name not found',
-          'host unknown',
-          'host unreachable',
-          'mail domain mentioned in email address is unknown',
-          'name or service not known',
-          'no such domain',
-          'recipient address rejected: unknown domain name',
-          'recipient domain must exist',
-          'the account or domain may not exist',
-          'unknown host',
-          'unroutable address',
-          'unrouteable address',
+          "domain is not reachable",
+          "domain mentioned in email address is unknown",
+          "domain must exist",
+          "host or domain name not found",
+          "host unknown",
+          "host unreachable",
+          "name or service not known",
+          "no such domain",
+          "recipient address rejected: unknown domain name",
+          "unknown host",
+        ].freeze
+        Pairs = [
+          ["domain ", "not exist"],
+          ["unrout", "able ", "address"],
         ].freeze
-        Pairs = [['553 ', ' does not exist']].freeze
 
         def text; return 'hostunknown'; end
         def description; return "Delivery failed due to a domain part of a recipient's email address does not exist"; end
@@ -47,7 +43,8 @@ module Sisimai
         #                                   false: is not unknown host.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'hostunknown'
+          return true  if argvs['reason'] == 'hostunknown'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
           statuscode = argvs['deliverystatus'] || ''

data/lib/sisimai/reason/mailboxfull.rb

@@ -8,55 +8,32 @@ module Sisimai
     module MailboxFull
       class << self
         Index = [
-          '452 insufficient disk space',
-          'account disabled temporarly for exceeding receiving limits',
-          'account is exceeding their quota',
-          'account is over quota',
-          'account is temporarily over quota',
-          'boite du destinataire pleine',
-          'delivery failed: over quota',
-          'disc quota exceeded',
-          'diskspace quota',
-          'does not have enough space',
-          'exceeded storage allocation',
-          'exceeding its mailbox quota',
-          'full mailbox',
-          'is over disk quota',
-          'is over quota temporarily',
-          'mail file size exceeds the maximum size allowed for mail delivery',
-          'mail quota exceeded',
-          'mailbox exceeded the local limit',
-          'mailbox full',
-          'mailbox has exceeded its disk space limit',
-          'mailbox is full',
-          'mailbox over quota',
-          'mailbox quota usage exceeded',
-          'mailbox size limit exceeded',
-          'maildir over quota',
-          'maildir delivery failed: userdisk quota ',
-          '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',
-          'quota exceeded',
-          'quota violation for',
-          'recipient reached disk quota',
-          'recipient rejected: mailbox would exceed maximum allowed storage',
-          'the recipient mailbox has exceeded its disk space limit',
-          "the user's space has been used up",
-          'the user you are trying to reach is over quota',
-          'too much mail data',   # @docomo.ne.jp
-          'user has exceeded quota, bouncing mail',
-          'user has too many messages on the server',
-          'user is over quota',
-          'user is over the quota',
-          'user over quota',
-          'user over quota. (#5.1.1)',    # qmail-toaster
-          'was automatically rejected: quota exceeded',
-          'would be over the allowed quota',
+          "452 insufficient disk space",
+          "account disabled temporarly for exceeding receiving limits",
+          "boite du destinataire pleine",
+          "exceeded storage allocation",
+          "full mailbox",
+          "mailbox size limit exceeded",
+          "mailbox would exceed maximum allowed storage",
+          "mailfolder is full",
+          "no space left on device",
+          "not sufficient disk space",
+          "quota violation for",
+          "too much mail data", # @docomo.ne.jp
+          "user has exceeded quota, bouncing mail",
+          "user has too many messages on the server",
+          "user's space has been used up",
+        ].freeze
+        Pairs = [
+          ["account is ", " quota"],
+          ["disk", "quota"],
+          ["enough ", " space"],
+          ["mailbox ", "exceeded", " limit"],
+          ["mailbox ", "full"],
+          ["mailbox ", "quota"],
+          ["maildir ", "quota"],
+          ["over ", "quota"],
+          ["quota ", "exceeded"],
         ].freeze
 
         def text; return 'mailboxfull'; end
@@ -68,6 +45,7 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           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/networkerror.rb

@@ -11,22 +11,21 @@ module Sisimai
     module NetworkError
       class << self
         Index = [
-          'could not connect and send the mail to',
-          'dns records for the destination computer could not be found',
-          'hop count exceeded - possible mail loop',
-          'host is unreachable',
-          'host name lookup failure',
-          'host not found, try again',
-          'mail forwarding loop for ',
-          'malformed name server reply',
-          'malformed or unexpected name server reply',
-          'maximum forwarding loop count exceeded',
-          'message looping',
-          'message probably in a routing loop',
-          'no route to host',
-          'too many hops',
-          'unable to resolve route ',
-          'unrouteable mail domain',
+          "could not connect and send the mail to",
+          "dns records for the destination computer could not be found",
+          "host is unreachable",
+          "host name lookup failure",
+          "host not found, try again",
+          "maximum forwarding loop count exceeded",
+          "no route to host",
+          "too many hops",
+          "unable to resolve route ",
+          "unrouteable mail domain",
+        ].freeze
+        Pairs = [
+          ["malformed", "name server reply"],
+          ["mail ", "loop"],
+          ["message ", "loop"],
         ].freeze
 
         def text; return 'networkerror'; end
@@ -38,6 +37,7 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           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/norelaying.rb

@@ -10,27 +10,26 @@ module Sisimai
     module NoRelaying
       class << self
         Index = [
-          'as a relay',
-          'email address is not verified.',
-          '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',
-          'not local host',
-          'relay access denied',
-          'relay denied',
-          'relay not permitted',
-          'relaying denied',  # Sendmail
-          'relaying mail to ',
-          'specified domain is not allowed',
-          "that domain isn't in my list of allowed rcpthost",
-          'this system is not configured to relay mail',
-          'unable to relay ',
+          "as a relay",
+          "domain isn't in my list of allowed rcpthost",
+          "email address is not verified.",
+          "insecure mail relay",
+          "no relaying",
+          "not a gateway",
+          "not an open relay, so get lost",
+          "not local host",
+          "relay not permitted",
+          "relaying denied", # Sendmail
+          "relaying mail to ",
+          "send to a non-local e-mail address", # MailEnable
+          "specified domain is not allowed",
+          "unable to relay ",
           "we don't handle mail for",
         ].freeze
+        Pairs = [
+          ["relay ", "denied"],
+          [" not ", " to relay"],
+        ].freeze
 
         def text; return 'norelaying'; end
         def description; return 'Email rejected with error message "Relaying Denied"'; end
@@ -41,6 +40,7 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           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/notaccept.rb

@@ -11,13 +11,11 @@ module Sisimai
       class << self
         # Destination mail server does not accept any message
         Index = [
-          'does not accept mail',             # Sendmail
-          'host/domain does not accept mail', # iCloud
-          'mail receiving disabled',
-          'name server: .: host not found',   # Sendmail
-          'no mx record found for domain=',   # Oath(Yahoo!)
-          'no route for current request',
-          'smtp protocol returned a permanent error',
+          "does not accept mail",             # Sendmail, iCloud
+          "mail receiving disabled",
+          "name server: .: host not found",   # Sendmail
+          "no mx record found for domain=",   # Oath(Yahoo!)
+          "no route for current request",
         ].freeze
 
         def text; return 'notaccept'; end
@@ -40,7 +38,7 @@ module Sisimai
         def true(argvs)
           return true  if argvs['reason'] == 'notaccept'
           return true  if [521, 556].index(argvs['replycode'].to_i) # SMTP Reply Code is 554 or 556
-          return false if argvs['command'] != 'MAIL'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -7,16 +7,13 @@ module Sisimai
     # example, there are multiple "Subject" headers in the email.
     module NotCompliantRFC
       class << self
-        require 'sisimai/string'
         Index = [
-          'duplicate header',
-          'this message is not rfc 5322 compliant',
-          'https://support.google.com/mail/?p=rfcmessagenoncompliant',
+          "duplicate header",
+          "message is not rfc 5322 compliant",
+          "multiple addresses in from: header are not accepted",
+          "rfc 1035 violation",
+          "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
@@ -27,7 +24,6 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           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/policyviolation.rb

@@ -14,34 +14,21 @@ module Sisimai
     #
     module PolicyViolation
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'an illegal attachment on your message',
-          'because the recipient is not accepting mail with ',    # AOL Phoenix
-          'closed mailing list',
-          'denied by policy',
-          'email not accepted for policy reasons',
+          "because the recipient is not accepting mail with ",    # AOL Phoenix
+          "closed mailing list",
+          "delivery not authorized, message refused",
+          "denied by policy",
           # http://kb.mimecast.com/Mimecast_Knowledge_Base/Administration_Console/Monitoring/Mimecast_SMTP_Error_Codes#554
-          'email rejected due to security policies',
-          'header are not accepted',
-          'header error',
-          'local policy violation',
-          'message bounced due to organizational settings',
-          'message given low priority',
-          'message not accepted for policy reasons',
-          'message rejected due to local policy',
-          'messages with multiple addresses',
-          'rejected for policy reasons',
-          'protocol violation',
-          'the message was rejected by organization policy',
-          'this message was blocked because its content presents a potential', # https://support.google.com/mail/answer/6590
-          'we do not accept messages containing images or other attachments',
+          "email rejected due to security policies",
+          "for policy reasons",
+          "local policy violation",
+          "message bounced due to organizational settings",
+          "message given low priority",
+          "message was rejected by organization policy",
+          "protocol violation",
           "you're using a mass mailer",
         ].freeze
-        Pairs = [
-          ['you have exceeded the', 'allowable number of posts without solving a captcha'],
-        ].freeze
 
         def text; return 'policyviolation'; end
         def description; return 'Email rejected due to policy violation on a destination host'; end
@@ -53,7 +40,6 @@ module Sisimai
         def match(argv1)
           return false if argv1.nil? || argv1.empty?
           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/ratelimited.rb

@@ -0,0 +1,62 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::RateLimited checks the bounce reason is "ratelimited" or not. This class is
+    # called only Sisimai::Reason class.
+    #
+    # This is the error that SMTP connection was rejected temporarily due to too many recipients or
+    # too many concurrency connections to the remote server. This reason has added in Sisimai 4.1.26.
+    #
+    #   <kijitora@example.ne.jp>: host mx02.example.ne.jp[192.0.1.20] said:
+    #     452 4.3.2 Connection rate limit exceeded. (in reply to MAIL FROM command)
+    module RateLimited
+      class << self
+        Index = [
+          "has exceeded the max emails per hour ",
+          "please try again slower",
+          "receiving mail at a rate that prevents additional messages from being delivered",
+          "temporarily deferred due to unexpected volume or user complaints",
+          "throttling failure: ",
+          "too many errors from your ip",         # Free.fr
+          "too many recipients",                  # ntt docomo
+          "too many smtp sessions for this host", # Sendmail(daemon.c)
+          "trop de connexions, ",
+          "we have already made numerous attempts to deliver this message",
+        ].freeze
+        Pairs = [
+          ["exceeded ", "allowable number of posts without solving a captcha"],
+          ["connection ", "limit"],
+          ["temporarily", "rate limited"],
+          ["too many con", "s"],
+        ].freeze
+
+        def text; return 'ratelimited'; end
+        def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [Boolean]       false: Did not match, true: Matched
+        def match(argv1)
+          return false if argv1.nil? || argv1.empty?
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false
+        end
+
+        # Rejected by domain or address filter ?
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
+        # @return   [Boolean]               true:  is rate limited
+        #                                   false: is not rate limited
+        # @see http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return true if argvs['reason'] == 'ratelimited'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'ratelimited'
+          return match(argvs['diagnosticcode'].downcase)
+        end
+
+      end
+    end
+  end
+end
+
+
+