sisimai 4.22.2 → 4.22.3

data/lib/sisimai/reason/expired.rb

@@ -20,18 +20,22 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?:
+          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
-            |Message[ ]timed[ ]out
+            |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
             )
           }ix
 

data/lib/sisimai/reason/filtered.rb

@@ -42,6 +42,7 @@ module Sisimai
             |we[ ]failed[ ]to[ ]deliver[ ]mail[ ]because[ ]the[ ]following[ ]address
                 [ ]recipient[ ]id[ ]refuse[ ]to[ ]receive[ ]mail    # Willcom
             )
+            |You[ ]have[ ]been[ ]blocked[ ]by[ ]the[ ]recipient
           }ix
 
           return true if argv1 =~ regex

data/lib/sisimai/reason/hostunknown.rb

@@ -16,14 +16,15 @@ module Sisimai
         # 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
+        #                           true:  Matched
+        # @since v4.0.0
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
              domain[ ](?:
                does[ ]not[ ]exist
-              |must[ ]exist
               |is[ ]not[ ]reachable
+              |must[ ]exist
               )
             |host[ ](?:
                or[ ]domain[ ]name[ ]not[ ]found
@@ -34,10 +35,12 @@ module Sisimai
             |name[ ]or[ ]service[ ]not[ ]known
             |no[ ]such[ ]domain
             |recipient[ ](?:
-            address[ ]rejected:[ ]unknown[ ]domain[ ]name
-              domain[ ]must[ ]exist
+               address[ ]rejected:[ ]unknown[ ]domain[ ]name
+              |domain[ ]must[ ]exist
               )
+            |The[ ]account[ ]or[ ]domain[ ]may[ ]not[ ]exist
             |unknown[ ]host
+            |Unrouteable[ ]address
             )
           }ix
 
@@ -65,7 +68,8 @@ module Sisimai
           if tempreason == reasontext
             # Status: 5.1.2
             # Diagnostic-Code: SMTP; 550 Host unknown
-            v = true
+            require 'sisimai/reason/networkerror'
+            v = true unless Sisimai::Reason::NetworkError.match(diagnostic)
           else
             # Check the value of Diagnosic-Code: header with patterns
             v = true if Sisimai::Reason::HostUnknown.match(diagnostic)

data/lib/sisimai/reason/mailboxfull.rb

@@ -21,19 +21,23 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             account[ ]is[ ](?:
+             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[ ]quota[ ]temporarily
-            |is[ ]over[ ]disk[ ]quota
+            |is[ ]over[ ](?:
+               disk[ ]quota
+              |quota[ ]temporarily
+              )
             |mail[ ](?:
                file[ ]size[ ]exceeds[ ]the[ ]maximum[ ]size[ ]allowed[ ]for[ ]mail[ ]delivery
               |quota[ ]exceeded
@@ -54,22 +58,26 @@ module Sisimai
             |mailfolder[ ]is[ ]full
             |not[ ]enough[ ]storage[ ]space[ ]in
             |over[ ]the[ ]allowed[ ]quota
-            |quota[ ]exceeded
-            |quota[ ]violation[ ]for
+            |quota[ ](?:
+               exceeded
+              |violation[ ]for
+              )
             |recipient[ ](?:
                reached[ ]disk[ ]quota
               |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[ ](?:
+               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[ ]quota
-              |is[ ]over[ ]the[ ]quota
+              |is[ ]over[ ](?:the[ ])?quota
               |over[ ]quota
               |over[ ]quota[.][ ][(][#]5[.]1[.]1[)]   # qmail-toaster
               )

data/lib/sisimai/reason/mailererror.rb

@@ -23,16 +23,17 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             command[ ](?:
+             \Aprocmail:[ ]    # procmail
+            |bin/(?:procmail|maildrop)
+            |command[ ](?:
                failed:[ ]
               |died[ ]with[ ]status[ ]\d+
               |output:
               )
-            |\Aprocmail:[ ]    # procmail
-            |bin/(?:procmail|maildrop)
+            |exit[ ]\d+
             |mailer[ ]error
+            |pipe[ ]to[ ][|][/].+
             |X[-]UNIX[;][ ]\d+  # X-UNIX; 127
-            |exit[ ]\d+
             )
           }ix
 

data/lib/sisimai/reason/mesgtoobig.rb

@@ -21,6 +21,7 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              exceeded[ ]maximum[ ]inbound[ ]message[ ]size
+            |Line[ ]limit[ ]exceeded
             |max[ ]message[ ]size[ ]exceeded
             |message[ ](?:
                file[ ]too[ ]big
@@ -34,6 +35,7 @@ module Sisimai
               |too[ ]large[ ]for[ ]this[ ].+
               )
             |size[ ]limit
+            |Taille[ ]limite[ ]du[ ]message[ ]atteinte.+[A-Z]{3}.+514
             )
           }ix
 

data/lib/sisimai/reason/networkerror.rb

@@ -24,7 +24,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?:
+          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
@@ -32,9 +32,17 @@ module Sisimai
             |mail[ ]forwarding[ ]loop[ ]for[ ]
             |malformed[ ]name[ ]server[ ]reply
             |maximum[ ]forwarding[ ]loop[ ]count[ ]exceeded
-            |message[ ]looping
-            |name[ ]service[ ]error
+            |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
             )
           }ix

data/lib/sisimai/reason/norelaying.rb

@@ -29,8 +29,10 @@ module Sisimai
             |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
+            |not[ ](?:
+               allowed[ ]to[ ]relay[ ]through[ ]this[ ]machine
+              |an[ ]open[ ]relay,[ ]so[ ]get[ ]lost
+                   )
             |relay[ ](?:
                access[ ]denied
               |denied
@@ -38,6 +40,7 @@ module Sisimai
               )
             |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
             )
           }ix

data/lib/sisimai/reason/policyviolation.rb

@@ -31,15 +31,22 @@ module Sisimai
           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
-            |Header[ ]error
+            |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
             )
           }ix
 

data/lib/sisimai/reason/rejected.rb

@@ -26,43 +26,58 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
+          isnot = %r{(?:5[.]1[.]0[ ]Address
+            |Recipient[ ]address
+            |Sender[ ]IP[ ]address
+            )[ ]rejected
+          }xi
           regex = %r{(?>
              [<][>][ ]invalid[ ]sender
             |address[ ]rejected
+            |Administrative[ ]prohibition
             |batv[ ](?:
                failed[ ]to[ ]verify   # SoniWall
               |validation[ ]failure   # SoniWall
               )
             |backscatter[ ]protection[ ]detected[ ]an[ ]invalid[ ]or[ ]expired[ ]email[ ]address    # MDaemon
             |bogus[ ]mail[ ]from        # IMail - block empty sender
-            |closed[ ]mailing[ ]list    # Exim test mail
+            |Connections[ ]not[ ]accepted[ ]from[ ]servers[ ]without[ ]a[ ]valid[ ]sender[ ]domain
             |denied[ ]\[bouncedeny\]    # McAfee
+            |Delivery[ ]not[ ]authorized,[ ]message[ ]refused
+            |does[ ]not[ ]exist[ ]E2110
             |domain[ ]of[ ]sender[ ]address[ ].+[ ]does[ ]not[ ]exist
+            |Emetteur[ ]invalide.+[A-Z]{3}.+(?:403|405|415)
             |empty[ ]envelope[ ]senders[ ]not[ ]allowed
             |error:[ ]no[ ]third-party[ ]dsns               # SpamWall - block empty sender
+            |From:[ ]Domain[ ]is[ ]invalid[.][ ]Please[ ]provide[ ]a[ ]valid[ ]From:
             |fully[ ]qualified[ ]email[ ]address[ ]required # McAfee
             |invalid[ ]domain,[ ]see[ ][<]url:.+[>]
+            |Mail[ ]from[ ]not[ ]owned[ ]by[ ]user.+[A-Z]{3}.+421
             |Message[ ]rejected:[ ]Email[ ]address[ ]is[ ]not[ ]verified
             |mx[ ]records[ ]for[ ].+[ ]violate[ ]section[ ].+
-            |name[ ]service[ ]error[ ]for[ ]    # Malformed MX RR or host not found
             |Null[ ]Sender[ ]is[ ]not[ ]allowed
             |recipient[ ]not[ ]accepted[.][ ][(]batv:[ ]no[ ]tag
             |returned[ ]mail[ ]not[ ]accepted[ ]here
             |rfc[ ]1035[ ]violation:[ ]recursive[ ]cname[ ]records[ ]for
             |rule[ ]imposed[ ]mailbox[ ]access[ ]for        # MailMarshal
             |sender[ ](?:
-               verify[ ]failed        # Exim callout
+               email[ ]address[ ]rejected
+              |is[ ]Spammer
               |not[ ]pre[-]approved
               |rejected
               |domain[ ]is[ ]empty
+              |verify[ ]failed        # Exim callout
               )
             |syntax[ ]error:[ ]empty[ ]email[ ]address
             |the[ ]message[ ]has[ ]been[ ]rejected[ ]by[ ]batv[ ]defense
             |transaction[ ]failed[ ]unsigned[ ]dsn[ ]for
+            |Unroutable[ ]sender[ ]address
+            |you[ ]are[ ]sending[ ]to[/]from[ ]an[ ]address[ ]that[ ]has[ ]been[ ]blacklisted
             )
           }ix
 
-          return true if argv1 =~ regex
+          return false if argv1 =~ isnot
+          return true  if argv1 =~ regex
           return false
         end
 
@@ -74,23 +89,39 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::Rejected.text
 
           require 'sisimai/smtp/status'
           statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
           reasontext = Sisimai::Reason::Rejected.text
+
+          return true if argvs.reason == reasontext
+
+          tempreason = Sisimai::SMTP::Status.name(statuscode)
+          tempreason = 'undefined' if tempreason.empty?
+          diagnostic = argvs.diagnosticcode || ''
           v = false
 
-          if Sisimai::SMTP::Status.name(statuscode) == reasontext
-            # Delivery status code points C<rejected>.
+          if tempreason == reasontext
+            # Delivery status code points "rejected".
             v = true
           else
             # Check the value of Diagnosic-Code: header with patterns
             if argvs.smtpcommand == 'MAIL'
-              # Matched with a pattern in this class
+              # The session was rejected at 'MAIL FROM' command
               v = true if Sisimai::Reason::Rejected.match(diagnostic)
+
+            elsif argvs.smtpcommand == 'DATA'
+              # The session was rejected at 'DATA' command
+              if tempreason != 'userunknown'
+                # Except "userunknown"
+                v = true if Sisimai::Reason::Rejected.match(diagnostic)
+              end
+            else
+              if tempreason =~ /\A(?:onhold|undefined|securityerror|systemerror)\z/
+                # Try to match with message patterns when the temporary reason
+                # is "onhold", "undefined", "securityerror", or "systemerror"
+                v = true if Sisimai::Reason::Rejected.match(diagnostic)
+              end
             end
           end
 

data/lib/sisimai/reason/securityerror.rb

@@ -32,6 +32,7 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              Account[ ]not[ ]subscribed[ ]to[ ]SES
+            |Authentification[ ]requise.+[A-Z]{3}.+402
             |authentication[ ](?:
                Credentials Invalid
               |failure
@@ -40,6 +41,7 @@ module Sisimai
               |turned[ ]on[ ]in[ ]your[ ]email[ ]client
               )
             |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]Mode:[ ].+[)]
+            |Codes?[ ]d'?[ ]*authentification[ ]invalide.+[A-Z]{3}.+305
             |domain[ ].+[ ]is[ ]a[ ]dead[ ]domain
             |Executable[ ]files[ ]are[ ]not[ ]allowed[ ]in[ ]compressed[ ]files
             |insecure[ ]mail[ ]relay

data/lib/sisimai/reason/spamdetected.rb

@@ -45,34 +45,40 @@ module Sisimai
             |denied[ ]due[ ]to[ ]spam[ ]list
             |dt:spm[ ]mx.+[ ]http://mail[.]163[.]com/help/help_spam_16[.]htm
             |greylisted.?.[ ]please[ ]try[ ]again[ ]in
-            |http://(?:
-               www[.]spamhaus[.]org
-              |dsbl[.]org
-              |www[.]sorbs[.]net
-              )
+            |http://(?:www[.]spamhaus[.]org|dsbl[.]org)
             |listed[ ]in[ ]work[.]drbl[.]imedia[.]ru
             |mail[ ](?:
                appears[ ]to[ ]be[ ]unsolicited    # rejected due to spam
               |content[ ]denied   # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000726
+              |rejete.+[A-Z]{3}.+506
               )
             |may[ ]consider[ ]spam
             |message[ ](?:
-               content[ ]rejected
+               considered[ ]as[ ]spam[ ]or[ ]virus
+              |content[ ]rejected
               |filtered
-              |filtered[.][ ]please[ ]see[ ]the[ ]faqs[ ]section[ ]on[ ]spam
-              |filtered[.][ ]Refer[ ]to[ ]the[ ]Troubleshooting[ ]page[ ]at[ ]
+              |filtered[.][ ](?:
+                 please[ ]see[ ]the[ ]faqs[ ]section[ ]on[ ]spam
+                |Refer[ ]to[ ]the[ ]Troubleshooting[ ]page[ ]at[ ]
+                )
               |looks[ ]like[ ]spam
               |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]See[ ]http:   # Yahoo!
               |refused[ ]by[ ]mailmarshal[ ]spamprofiler
-              |rejected[ ]as[ ]spam
-              |rejected[ ]as[ ]spam[ ]by[ ]Content[ ]Filtering
-              |rejected[ ]due[ ]to[ ]suspected[ ]spam[ ]content
-              |rejected[ ]for[ ]policy[ ]reasons
+              |rejected[ ](?:
+                 as[ ]spam
+                |because[ ]of[ ]unacceptable[ ]content
+                |due[ ]to[ ]suspected[ ]spam[ ]content
+                |for[ ]policy[ ]reasons
+                )
+              )
+            |our[ ](?:
+               email[ ]server[ ]thinks[ ]this[ ]email[ ]is[ ]spam
+              |filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
+              |system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
               )
-            |our[ ]email[ ]server[ ]thinks[ ]this[ ]email[ ]is[ ]spam
-            |our[ ]filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
-            |our[ ]system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
             |probable[ ]spam
+            |REJECT[ ]bulk[.]advertising
+            |Reject,.+[ ][-][ ]SPAM[.][ ]
             |rejected(?:
                :[ ]spamassassin[ ]score[ ]
               |[ ]by[ ].+[ ][(]spam[)]
@@ -101,13 +107,24 @@ module Sisimai
             |spambouncer[ ]identified[ ]spam    # SpamBouncer identified SPAM
             |spamming[ ]not[ ]allowed
             |Too[ ]much[ ]spam[.]               # Earthlink
-            |the[ ]message[ ]was[ ]rejected[ ]due[ ]to[ ]classification[ ]as[ ]bulk[ ]mail
+            |the[ ]message[ ](?:
+               has[ ]been[ ]rejected[ ]by[ ]spam[ ]filtering[ ]engine
+              |was[ ]rejected[ ]due[ ]to[ ]classification[ ]as[ ]bulk[ ]mail
+              )
             |The[ ]content[ ]of[ ]this[ ]message[ ]looked[ ]like[ ]spam # SendGrid
+            |This[ ](?:e-mail|mail)[ ](?:
+               cannot[ ]be[ ]forwarded[ ]because[ ]it[ ]was[ ]detected[ ]as[ ]spam
+              |is[ ]classified[ ]as[ ]spam[ ]and[ ]is[ ]rejected
+              )
             |this[ ]message[ ](?:
                appears[ ]to[ ]be[ ]spam
-              |has[ ]been[ ]identified[ ]as[ ]spam
+              |has[ ]been[ ](?:
+                 identified[ ]as[ ]spam
+                |scored[ ]as[ ]spam[ ]with[ ]a[ ]probability
+                )
               |scored[ ].+[ ]spam[ ]points
               |was[ ]classified[ ]as[ ]spam
+              |was[ ]rejected[ ]by[ ]Recurrent[ ]Pattern[ ]Detection[ ]System
               )
             |transaction[ ]failed[ ]spam[ ]message[ ]not[ ]queued       # SendGrid
             |we[ ]dont[ ]accept[ ]spam
@@ -117,12 +134,12 @@ module Sisimai
                  appears[ ]similar[ ]to[ ]spam[ ]we[ ]have[ ]received[ ]before
                 |breaches[ ]local[ ]URIBL[ ]policy
                 |had[ ]spam[-]like[ ]
-                |is[ ]considered[ ]spam
-                |is[ ]probably[ ]spam
+                |is[ ](?:considered|probably)[ ]spam
                 |was[ ]detected[ ]as[ ]spam
                 )
               |message[ ](?:
-                 has[ ]been[ ](?:
+                 as[ ]spam[ ]and[ ]has[ ]prevented[ ]delivery
+                |has[ ]been[ ](?:
                    temporarily[ ]blocked[ ]by[ ]our[ ]filter
                   |rejected[ ]because[ ]it[ ]appears[ ]to[ ]be[ ]SPAM
                   )