sisimai 4.24.1 → 4.25.0

data/lib/sisimai/reason/suspend.rb

@@ -8,6 +8,22 @@ module Sisimai
     module Suspend
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Suspend.pm
       class << self
+        Index = [
+          ' is currently suspended',
+          ' temporary locked',
+          'boite du destinataire archivee',
+          'email account that you tried to reach is disabled',
+          'invalid/inactive user',
+          'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
+          'mailbox currently suspended',
+          'mailbox unavailable or access denied',
+          'recipient rejected: temporarily inactive',
+          'recipient suspend the service',
+          'this account has been disabled or discontinued',
+          'user suspended',   # http://mail.163.com/help/help_spam_16.htm
+          'vdelivermail: account is locked email bounced',
+        ]
+
         def text; return 'suspend'; end
         def description; return 'Email rejected due to a recipient account is being suspended'; end
 
@@ -17,23 +33,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            ' is currently suspended',
-            ' temporary locked',
-            'boite du destinataire archivee',
-            'email account that you tried to reach is disabled',
-            'invalid/inactive user',
-            'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
-            'mailbox currently suspended',
-            'mailbox unavailable or access denied',
-            'recipient rejected: temporarily inactive',
-            'recipient suspend the service',
-            'this account has been disabled or discontinued',
-            'user suspended',   # http://mail.163.com/help/help_spam_16.htm
-            'vdelivermail: account is locked email bounced',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/systemerror.rb

@@ -12,6 +12,27 @@ module Sisimai
     module SystemError
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemError.pm
       class << self
+        Index = [
+          "can't create user output file",
+          'could not load drd for domain',
+          'internal error reading data',  # Microsoft
+          'internal server error: operation now in progress', # Microsoft
+          'interrupted system call',
+          'it encountered an error while being processed',
+          'it would create a mail loop',
+          'local configuration error',
+          'local error in processing',
+          'loop was found in the mail exchanger',
+          'loops back to myself',
+          'mail system configuration error',
+          'server configuration error',
+          'service currently unavailable',
+          'system config error',
+          'temporary local problem',
+          'timeout waiting for input',
+          'transaction failed',
+        ]
+
         def text; return 'systemerror'; end
         def description; return 'Email returned due to system error on the remote host'; end
 
@@ -21,27 +42,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            "can't create user output file",
-            'could not load drd for domain',
-            'internal error reading data',  # Microsoft
-            'internal server error: operation now in progress', # Microsoft
-            'interrupted system call',
-            'it encountered an error while being processed',
-            'it would create a mail loop',
-            'local configuration error',
-            'local error in processing',
-            'loop was found in the mail exchanger',
-            'loops back to myself',
-            'mail system configuration error',
-            'server configuration error',
-            'service currently unavailable',
-            'system config error',
-            'temporary local problem',
-            'timeout waiting for input',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/systemfull.rb

@@ -9,6 +9,11 @@ module Sisimai
     module SystemFull
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemFull.pm
       class << self
+        Index = [
+          'mail system full',
+          'requested mail action aborted: exceeded storage allocation',   # MS Exchange
+        ]
+
         def text; return 'systemfull'; end
         def description; return "Email rejected due to a destination mail server's disk is full"; end
 
@@ -18,12 +23,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'mail system full',
-            'requested mail action aborted: exceeded storage allocation',   # MS Exchange
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/toomanyconn.rb

@@ -12,6 +12,23 @@ module Sisimai
     module TooManyConn
       # Imported from p5-Sisimail/lib/Sisimai/Reason/TooManyConn.pm
       class << self
+        Index = [
+          'all available ips are at maximum connection limit',    # SendGrid
+          'connection rate limit exceeded',
+          'exceeds per-domain connection limit for',
+          'has exceeded the max emails per hour ',
+          'throttling failure: daily message quota exceeded',
+          'throttling failure: maximum sending rate exceeded',
+          'too many connections',
+          'too many connections from your host.', # Microsoft
+          'too many concurrent smtp connections', # Microsoft
+          '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',
+        ]
+
         def text; return 'toomanyconn'; end
         def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
 
@@ -21,23 +38,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'all available ips are at maximum connection limit',    # SendGrid
-            'connection rate limit exceeded',
-            'exceeds per-domain connection limit for',
-            'has exceeded the max emails per hour ',
-            'throttling failure: daily message quota exceeded',
-            'throttling failure: maximum sending rate exceeded',
-            'too many connections',
-            'too many connections from your host.', # Microsoft
-            'too many concurrent smtp connections', # Microsoft
-            'too many errors from your ip',         # Free.fr
-            'too many smtp sessions for this host', # Sendmail(daemon.c)
-            'trop de connexions, ',
-            'we have already made numerous attempts to deliver this message',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -48,7 +49,7 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs.reason == 'toomanyconn'
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'toomanyconn'
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'toomanyconn'
           return true if match(argvs.diagnosticcode.downcase)
           return false
         end

data/lib/sisimai/reason/userunknown.rb

@@ -16,6 +16,125 @@ module Sisimai
     module UserUnknown
       # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
+        Regex = %r{(?>
+           .+[ ]user[ ]unknown
+          |[#]5[.]1[.]1[ ]bad[ ]address
+          |[<].+[>][ ]not[ ]found
+          |[<].+[@].+[>][.][.][.][ ]blocked[ ]by[ ]
+          |5[.]0[.]0[.][ ]mail[ ]rejected[.]
+          |5[.]1[.]0[ ]address[ ]rejected[.]
+          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[a-z]{3}.+(?:416|418)
+          |address[ ](?:does[ ]not[ ]exist|unknown)
+          |archived[ ]recipient
+          |bad[-_ ]recipient
+          |can[']t[ ]accept[ ]user
+          |destination[ ](?:
+             addresses[ ]were[ ]unknown
+            |server[ ]rejected[ ]recipients
+            )
+          |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
+          |invalid[ ](?:
+             address
+            |mailbox:
+            |mailbox[ ]path
+            |recipient
+            )
+          |is[ ]not[ ](?:
+             a[ ]known[ ]user
+            |a[ ]valid[ ]mailbox
+            |an[ ]active[ ]address[ ]at[ ]this[ ]host
+            )
+          |mailbox[ ](?:
+             .+[ ]does[ ]not[ ]exist
+            |.+[@].+[ ]unavailable
+            |invalid
+            |is[ ](?:inactive|unavailable)
+            |not[ ](?:present|found)
+            |unavailable
+            )
+          |no[ ](?:
+             [ ].+[ ]in[ ]name[ ]directory
+            |account[ ]by[ ]that[ ]name[ ]here
+            |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
+            |mail[ ]box[ ]available[ ]for[ ]this[ ]user
+            |mailbox[ ](?:
+               by[ ]that[ ]name[ ]is[ ]currently[ ]available
+              |found
+              )
+            |matches[ ]to[ ]nameserver[ ]query
+            |such[ ](?:
+               address[ ]here
+              |mailbox
+              |person[ ]at[ ]this[ ]address
+              |recipient
+              |user(?:[ ]here)?
+              )
+            |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
+            |valid[ ]recipients[,][ ]bye    # Microsoft
+            )
+          |non[- ]?existent[ ]user
+          |not[ ](?:
+             a[ ]valid[ ]user[ ]here
+            |a[ ]local[ ]address
+            |email[ ]addresses
+            )
+          |rcpt[ ][<].+[>][ ]does[ ]not[ ]exist
+          |recipient[ ]address[ ]rejected[.][ ][(]in[ ]reply[ ]to[ ]rcpt[ ]to[ ]command[)]
+          |rece?ipient[ ](?:
+             .+[ ]was[ ]not[ ]found[ ]in
+            |address[ ]rejected:[ ](?:
+               access[ ]denied
+              |invalid[ ]user
+              |user[ ].+[ ]does[ ]not[ ]exist
+              |user[ ]unknown[ ]in[ ].+[ ]table
+              |unknown[ ]user
+              )
+            |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
+            |is[ ]not[ ]local
+            |not[ ](?:exist|found|ok)
+            |unknown
+            )
+          |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
+          |resolver[.]adr[.]recip(?:ient)notfound
+          |said:[ ]550[-[ ]]5[.]1[.]1[ ].+[ ]user[ ]unknown[ ]
+          |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
+          |sorry,[ ](?:
+             user[ ]unknown
+            |badrcptto
+            |no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
+            )
+          |the[ ](?:
+             email[ ]account[ ]that[ ]you[ ]tried[ ]to[ ]reach[ ]does[ ]not[ ]exist
+            |following[ ]recipients[ ]was[ ]undeliverable
+            |user[']s[ ]email[ ]name[ ]is[ ]not[ ]found
+            )
+          |there[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
+          |this[ ](?:
+             address[ ]no[ ]longer[ ]accepts[ ]mail
+            |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
+            |spectator[ ]does[ ]not[ ]exist
+            |user[ ]doesn[']?t[ ]have[ ]a[ ].+[ ]account
+            )
+          |unknown[ ](?:
+             e[-]?mail[ ]address
+            |local[- ]part
+            |mailbox
+            |recipient
+            |user
+            )
+          |user[ ](?:
+             .+[ ]was[ ]not[ ]found
+            |.+[ ]does[ ]not[ ]exist
+            |does[ ]not[ ]exist
+            |missing[ ]home[ ]directory
+            |not[ ](?:active|exist|found|known)
+            |unknown
+            )
+          |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
+          |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
+          )
+        }x
+
         def text; return 'userunknown'; end
         def description; return "Email rejected due to a local part of a recipient's email address does not exist"; end
 
@@ -25,125 +144,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             .+[ ]user[ ]unknown
-            |[#]5[.]1[.]1[ ]bad[ ]address
-            |[<].+[>][ ]not[ ]found
-            |[<].+[@].+[>][.][.][.][ ]blocked[ ]by[ ]
-            |5[.]0[.]0[.][ ]mail[ ]rejected[.]
-            |5[.]1[.]0[ ]address[ ]rejected[.]
-            |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[a-z]{3}.+(?:416|418)
-            |address[ ](?:does[ ]not[ ]exist|unknown)
-            |archived[ ]recipient
-            |bad[-_ ]recipient
-            |can[']t[ ]accept[ ]user
-            |destination[ ](?:
-               addresses[ ]were[ ]unknown
-              |server[ ]rejected[ ]recipients
-              )
-            |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
-            |invalid[ ](?:
-               address
-              |mailbox:
-              |mailbox[ ]path
-              |recipient
-              )
-            |is[ ]not[ ](?:
-               a[ ]known[ ]user
-              |a[ ]valid[ ]mailbox
-              |an[ ]active[ ]address[ ]at[ ]this[ ]host
-              )
-            |mailbox[ ](?:
-               .+[ ]does[ ]not[ ]exist
-              |.+[@].+[ ]unavailable
-              |invalid
-              |is[ ](?:inactive|unavailable)
-              |not[ ](?:present|found)
-              |unavailable
-              )
-            |no[ ](?:
-               [ ].+[ ]in[ ]name[ ]directory
-              |account[ ]by[ ]that[ ]name[ ]here
-              |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
-              |mail[ ]box[ ]available[ ]for[ ]this[ ]user
-              |mailbox[ ](?:
-                 by[ ]that[ ]name[ ]is[ ]currently[ ]available
-                |found
-                )
-              |matches[ ]to[ ]nameserver[ ]query
-              |such[ ](?:
-                 address[ ]here
-                |mailbox
-                |person[ ]at[ ]this[ ]address
-                |recipient
-                |user(?:[ ]here)?
-                )
-              |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-              |valid[ ]recipients[,][ ]bye    # Microsoft
-              )
-            |non[- ]?existent[ ]user
-            |not[ ](?:
-               a[ ]valid[ ]user[ ]here
-              |a[ ]local[ ]address
-              |email[ ]addresses
-              )
-            |rcpt[ ][<].+[>][ ]does[ ]not[ ]exist
-            |rece?ipient[ ](?:
-               .+[ ]was[ ]not[ ]found[ ]in
-              |address[ ]rejected:[ ](?:
-                 access[ ]denied
-                |invalid[ ]user
-                |user[ ].+[ ]does[ ]not[ ]exist
-                |user[ ]unknown[ ]in[ ].+[ ]table
-                |unknown[ ]user
-                )
-              |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
-              |is[ ]not[ ]local
-              |not[ ](?:exist|found|ok)
-              |unknown
-              )
-            |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-            |resolver[.]adr[.]recip(?:ient)notfound
-            |said:[ ]550[-[ ]]5[.]1[.]1[ ].+[ ]user[ ]unknown[ ]
-            |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
-            |sorry,[ ](?:
-               user[ ]unknown
-              |badrcptto
-              |no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
-              )
-            |the[ ](?:
-               email[ ]account[ ]that[ ]you[ ]tried[ ]to[ ]reach[ ]does[ ]not[ ]exist
-              |following[ ]recipients[ ]was[ ]undeliverable
-              |user[']s[ ]email[ ]name[ ]is[ ]not[ ]found
-              )
-            |there[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
-            |this[ ](?:
-               address[ ]no[ ]longer[ ]accepts[ ]mail
-              |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
-              |spectator[ ]does[ ]not[ ]exist
-              |user[ ]doesn[']?t[ ]have[ ]a[ ].+[ ]account
-              )
-            |unknown[ ](?:
-               e[-]?mail[ ]address
-              |local[- ]part
-              |mailbox
-              |recipient
-              |user
-              )
-            |user[ ](?:
-               .+[ ]was[ ]not[ ]found
-              |.+[ ]does[ ]not[ ]exist
-              |does[ ]not[ ]exist
-              |missing[ ]home[ ]directory
-              |not[ ](?:active|found|known)
-              |unknown
-              )
-            |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
-            |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
-            )
-          }x
-
-          return true if argv1 =~ regex
+          return true if argv1 =~ Regex
           return false
         end
 
@@ -155,10 +156,10 @@ module Sisimai
         def true(argvs)
           return true if argvs.reason == 'userunknown'
 
-          diagnostic = argvs.diagnosticcode.downcase;
-          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || ''
           return false if tempreason == 'suspend'
 
+          diagnostic = argvs.diagnosticcode.downcase;
           if tempreason == 'userunknown'
             # *.1.1 = 'Bad destination mailbox address'
             #   Status: 5.1.1