sisimai 4.22.4-java → 4.22.5-java

data/lib/sisimai/reason/contenterror.rb

@@ -19,22 +19,16 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             improper[ ]use[ ]of[ ]8-bit[ ]data[ ]in[ ]message[ ]header
-            |message[ ](?:
-               header[ ]size,[ ]or[ ]recipient[ ]list,[ ]exceeds[ ]policy[ ]limit
-              |mime[ ]complexity[ ]exceeds[ ]the[ ]policy[ ]maximum
-              )
-            |routing[ ]loop[ ]detected[ ][-][-][ ]too[ ]many[ ]received:[ ]headers
-            |this[ ]message[ ]contains?[ ](?:
-               invalid[ ]mime[ ]headers
-              |improperly[-]formatted[ ]binary[ ]content
-              |text[ ]that[ ]uses[ ]unnecessary[ ]base64[ ]encoding
-              )
-            )
-          }x
-
-          return true if argv1 =~ regex
+          index = [
+            'improper use of 8-bit data in message header',
+            'message header size, or recipient list, exceeds policy limit',
+            'message mime complexity exceeds the policy maximum',
+            'routing loop detected -- too many received: headers',
+            'this message contain invalid mime headers',
+            'this message contain improperly-formatted binary content',
+            'this message contain text that uses unnecessary base64 encoding',
+          ]
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/exceedlimit.rb

@@ -18,9 +18,9 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r/message too large/
+          index = ['message too large']
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/expired.rb

@@ -18,26 +18,24 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             connection[ ]timed[ ]out
-            |could[ ]not[ ]find[ ]a[ ]gateway[ ]for
-            |delivery[ ]time[ ]expired
-            |failed[ ]to[ ]deliver[ ]to[ ]domain[ ].+[ ]after[ ]\d+[ ]tries
-            |giving[ ]up[ ]on
-            |it[ ]has[ ]not[ ]been[ ]collected[ ]after
-            |message[ ](?:
-               expired[ ]after[ ]sitting[ ]in[ ]queue[ ]for
-              |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
-            |was[ ]not[ ]reachable[ ]within[ ]the[ ]allowed[ ]queue[ ]period
-            |your[ ]message[ ]could[ ]not[ ]be[ ]delivered[ ]for[ ]more[ ]than
-            )
-          }x
+          index = [
+            'connection timed out',
+            'could not find a gateway for',
+            'delivery time expired',
+            'failed to deliver to domain ',
+            'giving up on',
+            'has been delayed',
+            'it has not been collected after',
+            'message expired after sitting in queue for',
+            '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',
+            'was not reachable within the allowed queue period',
+            'your message could not be delivered for more than',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/hasmoved.rb

@@ -18,9 +18,9 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r/address[ ].+ has been replaced by /
+          index = [' has been replaced by ']
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/hostunknown.rb

@@ -18,31 +18,24 @@ module Sisimai
         # @since v4.0.0
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             domain[ ](?:
-               does[ ]not[ ]exist
-              |is[ ]not[ ]reachable
-              |must[ ]exist
-              )
-            |host[ ](?:
-               or[ ]domain[ ]name[ ]not[ ]found
-              |unknown
-              |unreachable
-              )
-            |mail[ ]domain[ ]mentioned[ ]in[ ]email[ ]address[ ]is[ ]unknown
-            |name[ ]or[ ]service[ ]not[ ]known
-            |no[ ]such[ ]domain
-            |recipient[ ](?:
-               address[ ]rejected:[ ]unknown[ ]domain[ ]name
-              |domain[ ]must[ ]exist
-              )
-            |the[ ]account[ ]or[ ]domain[ ]may[ ]not[ ]exist
-            |unknown[ ]host
-            |unrouteable[ ]address
-            )
-          }x
+          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',
+            'unrouteable address',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/mailboxfull.rb

@@ -18,73 +18,54 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             account[ ]disabled[ ]temporarly[ ]for[ ]exceeding[ ]receiving[ ]limits
-            |account[ ]is[ ](?:
-               exceeding[ ]their[ ]quota
-              |over[ ]quota
-              |temporarily[ ]over[ ]quota
-              )
-            |boite[ ]du[ ]destinataire[ ]pleine.+[a-z]{3}.+417
-            |delivery[ ]failed:[ ]over[ ]quota
-            |disc[ ]quota[ ]exceeded
-            |does[ ]not[ ]have[ ]enough[ ]space
-            |exceeded[ ]storage[ ]allocation
-            |exceeding[ ]its[ ]mailbox[ ]quota
-            |full[ ]mailbox
-            |is[ ]over[ ](?:
-               disk[ ]quota
-              |quota[ ]temporarily
-              )
-            |mail[ ](?:
-               file[ ]size[ ]exceeds[ ]the[ ]maximum[ ]size[ ]allowed[ ]for[ ]mail[ ]delivery
-              |quota[ ]exceeded
-              )
-            |mailbox[ ](?:
-              exceeded[ ]the[ ]local[ ]limit
-              |full
-              |has[ ]exceeded[ ]its[ ]disk[ ]space[ ]limit
-              |is[ ]full
-              |over[ ]quota
-              |quota[ ]usage[ ]exceeded
-              |size[ ]limit[ ]exceeded
-              )
-            |maildir[ ](?:
-               delivery[ ]failed:[ ](?:user|domain)disk[ ]quota[ ]?.*[ ]exceeded
-              |over[ ]quota
-              )
-            |mailfolder[ ]is[ ]full
-            |not[ ]enough[ ]storage[ ]space[ ]in
-            |over[ ]the[ ]allowed[ ]quota
-            |quota[ ](?:
-               exceeded
-              |violation[ ]for
-              )
-            |recipient[ ](?:
-               reached[ ]disk[ ]quota
-              |rejected:[ ]mailbox[ ]would[ ]exceed[ ]maximum[ ]allowed[ ]storage
-              )
-            |the[ ](?:
-               recipient[ ]mailbox[ ]has[ ]exceeded[ ]its[ ]disk[ ]space[ ]limit
-              |user[']s[ ]space[ ]has[ ]been[ ]used[ ]up
-              |user[ ]you[ ]are[ ]trying[ ]to[ ]reach[ ]is[ ]over[ ]quota
-              )
-            |too[ ]much[ ]mail[ ]data   # @docomo.ne.jp
-            |user[ ](?:
-               has[ ](?:
-                 exceeded[ ]quota,[ ]bouncing[ ]mail
-                |too[ ]many[ ]messages[ ]on[ ]the[ ]server
-                )
-              |is[ ]over[ ](?:the[ ])?quota
-              |over[ ]quota
-              |over[ ]quota[.][ ][(][#]5[.]1[.]1[)]   # qmail-toaster
-              )
-            |was[ ]automatically[ ]rejected:[ ]quota[ ]exceeded
-            |would[ ]be[ ]over[ ]the[ ]allowed[ ]quota
-            )
-          }x
+          index = [
+            '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',
+            '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',
+            'not enough storage space in',
+            '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',
+          ]            
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/mesgtoobig.rb

@@ -17,27 +17,22 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             exceeded[ ]maximum[ ]inbound[ ]message[ ]size
-            |line[ ]limit[ ]exceeded
-            |max[ ]message[ ]size[ ]exceeded
-            |message[ ](?:
-               file[ ]too[ ]big
-              |length[ ]exceeds[ ]administrative[ ]limit
-              |size[ ]exceeds[ ](?:
-                 fixed[ ]limit
-                |fixed[ ]maximum[ ]message[ ]size
-                |maximum[ ]value
-                )
-              |too[ ]big
-              |too[ ]large[ ]for[ ]this[ ].+
-              )
-            |size[ ]limit
-            |taille[ ]limite[ ]du[ ]message[ ]atteinte.+[a-z]{3}.+514
-            )
-          }x
+          index = [
+            'exceeded maximum inbound 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',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/networkerror.rb

@@ -22,30 +22,25 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             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
-            |mail[ ]forwarding[ ]loop[ ]for[ ]
-            |malformed[ ]name[ ]server[ ]reply
-            |maximum[ ]forwarding[ ]loop[ ]count[ ]exceeded
-            |message[ ](?:
-               looping
-              |probably[ ]in[ ]a[ ]routing[ ]loop
-              )
-            |name[ ]service[ ]error[ ]for[ ].+[ ](?:
-               malformed[ ]or[ ]unexpected[ ]name[ ]server[ ]reply
-              |host[ ]not[ ]found,[ ]try[ ]again
-              )
-            |no[ ]route[ ]to[ ]host
-            |too[ ]many[ ]hops
-            |unable[ ]to[ ]resolve[ ]route[ ].+[ ]
-            |unrouteable[ ]mail[ ]domain
-            )
-          }x
+          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 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',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/norelaying.rb

@@ -22,28 +22,22 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             as[ ]a[ ]relay
-            |insecure[ ]mail[ ]relay
-            |mail[ ]server[ ]requires[ ]authentication[ ]when[ ]attempting[ ]to[ ]
-              send[ ]to[ ]a[ ]non-local[ ]e-mail[ ]address    # MailEnable
-            |not[ ](?:
-               allowed[ ]to[ ]relay[ ]through[ ]this[ ]machine
-              |an[ ]open[ ]relay,[ ]so[ ]get[ ]lost
-                   )
-            |relay[ ](?:
-               access[ ]denied
-              |denied
-              |not[ ]permitted
-              )
-            |relaying[ ]denied  # Sendmail
-            |that[ ]domain[ ]isn[']t[ ]in[ ]my[ ]list[ ]of[ ]allowed[ ]rcpthost
-            |this[ ]system[ ]is[ ]not[ ]configured[ ]to[ ]relay[ ]mail
-            |unable[ ]to[ ]relay[ ]for
-            )
-          }x
+          index = [
+            'as a relay',
+            'insecure mail relay',
+            'mail server requires authentication when attempting to send to a non-local e-mail address',    # MailEnable 
+            'not allowed to relay through this machine',
+            'not an open relay, so get lost',
+            'relay access denied',
+            'relay denied',
+            'relay not permitted',
+            'relaying denied',  # Sendmail
+            "that domain isn't in my list of allowed rcpthost",
+            'this system is not configured to relay mail',
+            'unable to relay for',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -22,13 +22,12 @@ module Sisimai
           return nil unless argv1
 
           # Destination mail server does not accept any message
-          regex = %r{(?:
-               name[ ]server:[ ][.]:[ ]host[ ]not[ ]found # Sendmail
-              |55[46][ ]smtp[ ]protocol[ ]returned[ ]a[ ]permanent[ ]error
-            )
-          }x
+          index = [
+            'name server: .: host not found',   # Sendmail
+            'smtp protocol returned a permanent error',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/policyviolation.rb

@@ -26,29 +26,26 @@ module Sisimai
         # @since 4.22.0
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             because[ ]the[ ]recipient[ ]is[ ]not[ ]accepting[ ]mail[ ]with[ ](?:attachments|embedded[ ]images) # AOL Phoenix
-            |closed[ ]mailing[ ]list
-            |denied[ ]by[ ]policy
-            |email[ ](?:
-               not[ ]accepted[ ]for[ ]policy[ ]reasons
-              # http://kb.mimecast.com/Mimecast_Knowledge_Base/Administration_Console/Monitoring/Mimecast_SMTP_Error_Codes#554
-              |rejected[ ]due[ ]to[ ]security[ ]policies
-              )
-            |header[ ](?:are[ ]not[ ]accepted|error)
-            |mail[ ]from[ ].+[ ]rejected[ ]for[ ]policy[ ]reasons
-            |message[ ](?:
-               given[ ]low[ ]priority
-              |not[ ]accepted[ ]for[ ]policy[ ]reasons
-              )
-            |messages[ ]with[ ]multiple[ ]addresses
-            |you[ ]have[ ]exceeded[ ]the[ ]the[ ]allowable[ ]number[ ]of[ ]posts[ ]without[ ]solving[ ]a[ ]captcha
-            |protocol[ ]violation
-            |the[ ]email[ ]address[ ]used[ ]to[ ]send[ ]your[ ]message[ ]is[ ]not[ ]subscribed[ ]to[ ]this[ ]group
-            )
-          }x
+          index = [
+            'because the recipient is not accepting mail with ',    # AOL Phoenix
+            'closed mailing list',
+            'denied by policy',
+            'email not accepted for policy reasons',
+            # 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',
+            'message given low priority',
+            'message not accepted for policy reasons',
+            'messages with multiple addresses',
+            'rejected for policy reasons',
+            'protocol violation',
+            'the email address used to send your message is not subscribed to this group',
+            'you have exceeded the allowable number of posts without solving a captcha',
+            'you have exceeded the the allowable number of posts without solving a captcha',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end