sisimai 4.25.8-java → 4.25.12-java

data/lib/sisimai/lhost/office365.rb

@@ -188,7 +188,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || e['status']
           end
 
           ReCommands.each_key do |p|

data/lib/sisimai/lhost/postfix.rb

@@ -110,8 +110,7 @@ module Sisimai::Lhost
             #           The mail system
             #
             # <userunknown@example.co.jp>: host mx.example.co.jp[192.0.2.153] said: 550
-            # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-            # command)
+            # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
             if readslices[-2].start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
               # Continued line of the value of Diagnostic-Code header
               v['diagnosis'] << ' ' << cv[1]
@@ -122,18 +121,12 @@ module Sisimai::Lhost
               emailsteak[1] << cv[1] << ': ' << cv[2] << "\n"
 
             else
-              if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
+              if cv = e.match(/[ \t][(]in reply to (?:end of )?([A-Z]{4}).*/) ||
+                 cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
                 # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                 commandset << cv[1]
                 anotherset['diagnosis'] ||= ''
                 anotherset['diagnosis'] << ' ' << e
-
-              elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                # to MAIL command)
-                commandset << cv[1]
-                anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] << ' ' << e
-
               else
                 # Alternative error message and recipient
                 if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)

data/lib/sisimai/lhost/qmail.rb

@@ -23,29 +23,29 @@ module Sisimai::Lhost
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
         'data' => %r{(?:
-           (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
+           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
+          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
       }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
+         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
         |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )

data/lib/sisimai/lhost/sendgrid.rb

@@ -86,7 +86,7 @@ module Sisimai::Lhost
               # Arrival-Date: 2012-12-31 23-59-59
               next unless cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
               o[1] << 'Thu, ' << cv[3] + ' '
-              o[1] << Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
+              o[1] << Sisimai::DateTime.monthname(false)[cv[2].to_i - 1]
               o[1] << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
               o[1] << ' ' << Sisimai::DateTime.abbr2tz('CDT')
             else
@@ -124,7 +124,7 @@ module Sisimai::Lhost
           if e['status'] == '5.0.0' || e['status'] == '4.0.0'
             # Get the value of D.S.N. from the error message or the value of
             # Diagnostic-Code header.
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || e['status']
           end
 
           if e['action'] == 'expired'

data/lib/sisimai/lhost/sendmail.rb

@@ -184,7 +184,7 @@ module Sisimai::Lhost
 
           if anotherset['status']
             # Check alternative status code
-            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d\z/
+            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d{1,3}\z/
               # Override alternative status code
               e['status'] = anotherset['status']
             end

data/lib/sisimai/lhost/verizon.rb

@@ -44,8 +44,8 @@ module Sisimai::Lhost
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 
@@ -93,8 +93,8 @@ module Sisimai::Lhost
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1)
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 

data/lib/sisimai/lhost/x3.rb

@@ -73,6 +73,10 @@ module Sisimai::Lhost
             elsif cv = e.match(/\ARouting: (.+)/)
               # Routing: Could not find a gateway for kijitora@example.co.jp
               v['diagnosis'] = cv[1]
+
+            elsif cv = e.match(/\ADiagnostic-Code: smtp; (.+)/)
+              # Diagnostic-Code: smtp; 552 5.2.2 Over quota
+              v['diagnosis'] = cv[1]
             end
           end
         end

data/lib/sisimai/lhost/x4.rb

@@ -19,7 +19,7 @@ module Sisimai::Lhost
         # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
         #  K = success, Z = temporary error, D = permanent error
         message: %r{\A(?>
-           He/Her[ ]is[ ]not.+[ ]user
+           He/Her[ ]is[ ]not[ ].+[ ]user
           |Hi[.][ ].+[ ]unable[ ]to[ ]deliver[ ]your[ ]message[ ]to[ ]
             the[ ]following[ ]addresses
           |Su[ ]mensaje[ ]no[ ]pudo[ ]ser[ ]entregado
@@ -41,29 +41,29 @@ module Sisimai::Lhost
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
         'data' => %r{(?:
-           (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
+           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
+          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
       }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
+         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
         |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )

data/lib/sisimai/mail.rb

@@ -4,7 +4,6 @@ module Sisimai
   # Sisimai::Mail::Memory classes.
   class Mail
     # Imported from p5-Sisimail/lib/Sisimai/Mail.pm
-    Until = 'v4.25.10'
 
     # :path [String] path to mbox or Maildir/
     # :kind [String] Data type: mailbox, maildir, or stdin
@@ -25,7 +24,7 @@ module Sisimai
           # Sisimai::Mail.new('<STDIN>')
           classname = self.class.to_s << '::STDIN'
           parameter['kind'] = 'stdin'
-          parameter['path'] = $stdin
+          parameter['path'] = '<STDIN>'
         else
           # The argumenet is a mailbox or a Maildir/.
           mediatype = argv1.include?("\n") ? 'memory' : File.ftype(argv1)
@@ -52,6 +51,7 @@ module Sisimai
         # The argument neither a mailbox nor a Maildir/.
         classname = self.class.to_s << '::STDIN'
         parameter['kind'] = 'stdin'
+        parameter['path'] = '<STDIN>'
       end
       return nil unless classname
 
@@ -64,16 +64,6 @@ module Sisimai
       @data = parameter['data']
     end
 
-    def mail
-      warn " ***warning: Sisimai::Mail.mail will be removed at #{Until}. Use Sisimai::Mail.data instead"
-      return data
-    end
-
-    def type
-      warn " ***warning: Sisimai::Mail.type will be removed at #{Until}. Use Sisimai::Mail.kind instead"
-      return kind
-    end
-
     # Alias method of Sisimai::Mail.data.read()
     # @return   [String] Contents of mbox/Maildir
     def read
@@ -81,15 +71,6 @@ module Sisimai
       return data.read
     end
 
-    # Close the handle
-    # @return   [True,False]  true:  Successfully closed the handle
-    #                         false: Mail handle is not defined
-    def close
-      warn " ***warning: Sisimai::Mail.close will be removed at #{Until}. The handle automatically closes at the EOF"
-      return false unless data.handle
-      data.handle = nil
-      return true
-    end
   end
 end
 

data/lib/sisimai/mda.rb

@@ -7,7 +7,7 @@ module Sisimai
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
         # 12: "Your message to <%t> was automatically rejected:%n%r"
-        'dovecot'    => %r/\AYour message to .+ was automatically rejected:\z/,
+        'dovecot'    => %r/\AYour message to [^ ]+ was automatically rejected:\z/,
         'mail.local' => %r/\Amail[.]local: /,
         'procmail'   => %r/\Aprocmail: /,
         'maildrop'   => %r/\Amaildrop: /,
@@ -16,7 +16,7 @@ module Sisimai
       }.freeze
       MarkingsOf = {
         message: %r{\A(?>
-           Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
+           Your[ ]message[ ]to[ ][^ ]+[ ]was[ ]automatically[ ]rejected:\z
           |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
           )
         }x

data/lib/sisimai/mime.rb

@@ -225,7 +225,7 @@ module Sisimai
 
         plain = nil
         if cv = argv1.match(%r|([+/\=0-9A-Za-z\r\n]+)|) then plain = Base64.decode64(cv[1]) end
-        return plain.force_encoding('UTF-8')
+        return plain.scrub('?')
       end
 
       # Get boundary string

data/lib/sisimai/reason/blocked.rb

@@ -10,8 +10,10 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Blocked.pm
       class << self
         Regex = %r{(?>
-           access[ ]denied[.][ ]ip[ ]name[ ]lookup[ ]failed
-          |access[ ]from[ ]ip[ ]address[ ].+[ ]blocked
+           [ ]said:[ ]550[ ]blocked
+          |[(][^ ]+[@][^ ]+:blocked[)]
+          |access[ ]denied[.][ ]ip[ ]name[ ]lookup[ ]failed
+          |access[ ]from[ ]ip[ ]address[ ][^ ]+[ ]blocked
           |all[ ]mail[ ]servers[ ]must[ ]have[ ]a[ ]ptr[ ]record[ ]with[ ]a[ ]valid[ ]reverse[ ]dns[ ]entry
           |bad[ ](:?dns[ ]ptr[ ]resource[ ]record|sender[ ]ip[ ]address)
           |banned[ ]sending[ ]ip  # Office365
@@ -24,7 +26,7 @@ module Sisimai
             |resolve[ ]your[ ]address
             )
           |client[ ]host[ ](?:
-             .+[ ]blocked[ ]using
+             [^ ]+[ ]blocked[ ]using
             |rejected:[ ](?:
                abus[ ]detecte[ ]gu_eib_0[24]      # SFR
               |cannot[ ]find[ ]your[ ]hostname    # Yahoo!
@@ -41,22 +43,24 @@ module Sisimai
             )
           |connections[ ](?:
              not[ ]accepted[ ]from[ ]ip[ ]addresses[ ]on[ ]spamhaus[ ]xbl
-            |will[ ]not[ ]be[ ]accepted[ ]from[ ].+because[ ]the[ ]ip[ ]is[ ]in[ ]spamhaus's[ ]list
+            |will[ ]not[ ]be[ ]accepted[ ]from[ ][^ ]+,[ ]because[ ]the[ ]ip[ ]is[ ]in[ ]spamhaus's[ ]list
             )
           |currently[ ]sending[ ]spam[ ]see:[ ]
           |domain[ ](?:
-             .+[ ]mismatches[ ]client[ ]ip
+             [^ ]+[ ]mismatches[ ]client[ ]ip
             |does[ ]not[ ]exist:
             )
-          |dns[ ]lookup[ ]failure:[ ].+[ ]try[ ]again[ ]later
+          |dns[ ]lookup[ ]failure:[ ][^ ]+[ ]try[ ]again[ ]later
           |dnsbl:attrbl
           |dynamic/zombied/spam[ ]ips[ ]blocked
-          |email[ ]blocked[ ]by[ ](?:.+[.]barracudacentral[.]org|spamhaus)
+          |email[ ]blocked[ ]by[ ](?:[^ ]+[.]barracudacentral[.]org|spamhaus)
+          |error:[ ]no[ ]valid[ ]recipients[ ]from[ ]
           |esmtp[ ]not[ ]accepting[ ]connections  # icloud.com
-          |fix[ ]reverse[ ]dns[ ]for[ ].+
+          |fix[ ]reverse[ ]dns[ ]for[ ][^ ]+
           |go[ ]away
           |helo[ ]command[ ]rejected:
-          |host[ ].+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
+          |host[ ]+[^ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
+          |host[ ]network[ ]not[ ]allowed
           |hosts[ ]with[ ]dynamic[ ]ip
           |http://(?:
              spf[.]pobox[.]com/why[.]html
@@ -66,17 +70,18 @@ module Sisimai
           |ip[ ]\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3}[ ]is[ ]blocked[ ]by[ ]EarthLink # Earthlink
           |ip[/]domain[ ]reputation[ ]problems
           |is[ ](?:
-             in[ ]a[ ]black[ ]list[ ]at[ ].+[.]
-            |in[ ]an[ ].*rbl[ ]on[ ].+
+             in[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
+            |in[ ]an[ ][^ ]+rbl[ ]on[ ][^ ]+
             |not[ ]allowed[ ]to[ ]send[ ](?:
                mail[ ]from
-              |from[ ].+[ ]per[ ]it's[ ]spf[ ]record
+              |from[ ][<][^ ]+[>][ ]per[ ]it's[ ]spf[ ]record
               )
             )
-          |mail[ ]server[ ]at[ ].+[ ]is[ ]blocked
+          |mail[ ]server[ ]at[ ][^ ]+[ ]is[ ]blocked
           |mail[ ]from[ ]\d+[.]\d+[.]\d+[.]\d[ ]refused:
-          |message[ ]from[ ].+[ ]rejected[ ]based[ ]on[ ]blacklist
-          |messages[ ]from[ ].+[ ]temporarily[ ]deferred[ ]due[ ]to[ ]user[ ]complaints   # Yahoo!
+          |message[ ]from[ ][^ ]+[ ]rejected[ ]based[ ]on[ ]blacklist
+          |message[ ]was[ ]rejected[ ]for[ ]possible[ ]spam/virus[ ]content
+          |messages[ ]from[ ][^ ]+[ ]temporarily[ ]deferred[ ]due[ ]to[ ]user[ ]complaints   # Yahoo!
           |no[ ](?:
              access[ ]from[ ]mail[ ]server
             |ptr[ ]record[ ]found[.]
@@ -89,21 +94,26 @@ module Sisimai
             |use[ ]the[ ]smtp[ ]server[ ]of[ ]your[ ]isp
             )
           |ptr[ ]record[ ]setup
+          |rejected[ ]because[ ]the[ ]sending[ ]mta[ ]or[ ]the[ ]sender[ ]has[ ]not[ ]passed[ ]validation
+          |rejected[ ]due[ ]to[ ](?:
+             a[ ]poor[ ]email[ ]reputation[ ]score
+            |the[ ]sending[ ]mta's[ ]poor[ ]reputation
+            )
           |rejecting[ ]open[ ]proxy   # Sendmail(srvrsmtp.c)
           |reverse[ ]dns[ ](?:
              failed
             |required
-            |lookup[ ]for[ ]host[ ].+[ ]failed[ ]permanently
+            |lookup[ ]for[ ]host[ ][^ ]+[ ]failed[ ]permanently
             )
           |sender[ ]ip[ ](?:
              address[ ]rejected
             |reverse[ ]lookup[ ]rejected
             )
           |server[ ]access[ ](?:
-             .+[ ]forbidden[ ]by[ ]invalid[ ]rdns[ ]record[ ]of[ ]your[ ]mail[ ]server
+             [^ ]+[ ]forbidden[ ]by[ ]invalid[ ]rdns[ ]record[ ]of[ ]your[ ]mail[ ]server
             |forbidden[ ]by[ ]your[ ]ip[ ]
             )
-          |server[ ]ip[ ].+[ ]listed[ ]as[ ]abusive
+          |server[ ]ip[ ][^ ]+[ ]listed[ ]as[ ]abusive
           |service[ ]not[ ]available,[ ]closing[ ]transmission[ ]channel
           |service[ ]permits[ ]\d+[ ]unverifyable[ ]sending[ ]ips
           |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]initial[ ]connection:   # Exim
@@ -112,25 +122,27 @@ module Sisimai
             |your[ ]remotehost[ ]looks[ ]suspiciously[ ]like[ ]spammer
             )
           |spf[ ](?:
-             .+[ ]domain[ ]authentication[ ]fail
+             [(]sender[ ]policy[ ]framework[)][ ]domain[ ]authentication[ ]fail
             |record
             |check:[ ]fail
             )
-          |spf:[ ].+[ ]is[ ]not[ ]allowed[ ]to[ ]send[ ]mail.+[a-z]{3}.+401
-          |the[ ](?:email|domain|ip).+[ ]is[ ]blacklisted
+          |spf:[ ][^ ]+[ ]is[ ]not[ ]allowed[ ]to[ ]send[ ]mail[.][ ][a-z0-9]_401
+          |temporarily[ ]deferred[ ]due[ ]to[ ]unexpected[ ]volume[ ]or[ ]user[ ]complaints
+          |the[ ](?:email|domain|ip)[ ][^ ]+[ ]is[ ]blacklisted
           |this[ ]system[ ]will[ ]not[ ]accept[ ]messages[ ]from[ ]servers[/]devices[ ]with[ ]no[ ]reverse[ ]dns
+          |to[ ]submit[ ]messages[ ]to[ ]this[ ]e-mail[ ]system[ ]has[ ]been[ ]rejected
           |too[ ]many[ ](?:
              spams[ ]from[ ]your[ ]ip  # free.fr
             |unwanted[ ]messages[ ]have[ ]been[ ]sent[ ]from[ ]the[ ]following[ ]ip[ ]address[ ]above
             )
           |unresolvable[ ]relay[ ]host[ ]name
-          |veuillez[ ]essayer[ ]plus[ ]tard.+[a-z]{3}.+(?:103|510)
+          |veuillez[ ]essayer[ ]plus[ ]tard[.][ ]service[ ]refused,[ ]please[ ]try[ ]later[.][ ][0-9a-z_]+(?:103|510)
           |your[ ](?:
              network[ ]is[ ]temporary[ ]blacklisted
-            |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ].+[.]abuseat[.]org
+            |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ][^ ]+[.]abuseat[.]org
             |server[ ]requires[ ]confirmation
             )
-          |was[ ]blocked[ ]by[ ].+
+          |was[ ]blocked[ ]by[ ][^ ]+
           |we[ ]do[ ]not[ ]accept[ ]mail[ ]from[ ](?: # @mail.ru
              dynamic[ ]ips
             |hosts[ ]with[ ]dynamic[ ]ip[ ]or[ ]generic[ ]dns[ ]ptr-records
@@ -140,8 +152,10 @@ module Sisimai
             |sending[ ]spam
             )
           |your[ ](?:
-             access[ ]to[ ]submit[ ]messages[ ]to[ ]this[ ]e-mail[ ]system[ ]has[ ]been[ ]rejected
-            |message[ ]was[ ]rejected[ ]for[ ]possible[ ]spam/virus[ ]content
+             email[ ]address[ ]has[ ]been[ ]blacklisted
+            |network[ ]is[ ]temporary[ ]blacklisted
+            |sender's[ ]ip[ ]address[ ]is[ ]listed[ ]at[ ][^ ]+[.]abuseat[.]org
+            |server[ ]requires[ ]confirmation
             )
           )
         }x

data/lib/sisimai/reason/exceedlimit.rb

@@ -9,7 +9,10 @@ module Sisimai
     module ExceedLimit
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ExceedLimit.pm
       class << self
-        Index = ['message too large']
+        Index = [
+          'message header size exceeds limit',
+          'message too large',
+        ]
 
         def text; return 'exceedlimit'; end
         def description; return 'Email rejected due to an email exceeded the limit'; end

data/lib/sisimai/reason/expired.rb

@@ -12,9 +12,11 @@ module Sisimai
         Index = [
           'connection timed out',
           'could not find a gateway for',
+          'delivery attempts will continue to be',
           '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',

data/lib/sisimai/reason/filtered.rb

@@ -18,6 +18,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 rejected due to user rules',
           'refused due to recipient preferences', # Facebook
           'resolver.rst.notauthorized',   # Microsoft Exchange
           'this account is protected by',
@@ -40,7 +41,7 @@ module Sisimai
           return false
         end
 
-        # Rejected by domain or address filter ?
+        # Rejected by a sender domain or a sender address by a filter ?
         # @param    [Sisimai::Data] argvs   Object to be detected the reason
         # @return   [True,False]            true: is filtered
         #                                   false: is not filtered
@@ -52,18 +53,18 @@ module Sisimai
           tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || ''
           return false if tempreason == 'suspend'
 
-          commandtxt = argvs.smtpcommand || ''
           diagnostic = argvs.diagnosticcode.downcase || ''
-          alterclass = Sisimai::Reason::UserUnknown
-
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
-            return true if alterclass.match(diagnostic) || match(diagnostic)
-
-          elsif commandtxt != 'RCPT' && commandtxt != 'MAIL'
-            # Check the value of Diagnostic-Code and the last SMTP command
+            return true if Sisimai::Reason::UserUnknown.match(diagnostic)
             return true if match(diagnostic)
-            return true if alterclass.match(diagnostic)
+          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.
+            return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs.smtpcommand)
+            return true  if match(diagnostic)
+            return true  if Sisimai::Reason::UserUnknown.match(diagnostic)
           end
           return false
         end

data/lib/sisimai/reason/hostunknown.rb

@@ -22,8 +22,10 @@ module Sisimai
           'recipient domain must exist',
           'the account or domain may not exist',
           'unknown host',
+          'unroutable address',
           'unrouteable address',
         ]
+        Regex = %r/553[ ][^ ]+[ ]does[ ]not[ ]exist/
 
         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
@@ -36,6 +38,7 @@ 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/mailererror.rb

@@ -21,7 +21,7 @@ module Sisimai
             )
           |exit[ ]\d+
           |mailer[ ]error
-          |pipe[ ]to[ ][|][/].+
+          |pipe[ ]to[ ][|][/][^ ]+
           |x[-]unix[;][ ]\d+  # X-UNIX; 127
           )
         }x

data/lib/sisimai/reason/norelaying.rb

@@ -16,16 +16,21 @@ module Sisimai
         Index = [
           'as a relay',
           '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
+          '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 ',
           "that domain isn't in my list of allowed rcpthost",
           'this system is not configured to relay mail',
           'unable to relay for',
+          "we don't handle mail for",
         ]
 
         def text; return 'norelaying'; end
@@ -48,13 +53,9 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           r = argvs.reason || ''
-          if r.size > 0
-            # Do not overwrite the reason
-            return false if r.start_with?('securityerror', 'systemerror', 'undefined')
-          else
-            # Check the value of Diagnosic-Code: header with patterns
-            return true if match(argvs.diagnosticcode.downcase)
-          end
+          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
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -14,8 +14,10 @@ module Sisimai
         # Destination mail server does not accept any message
         Index = [
           'host/domain does not accept mail', # iCloud
+          'host does not accept mail',        # Sendmail
           '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',
         ]
 
@@ -41,9 +43,9 @@ module Sisimai
           return true if argvs.reason == 'notaccept'
 
           # 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 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
         end
 

data/lib/sisimai/reason/policyviolation.rb

@@ -19,14 +19,17 @@ module Sisimai
         Index = [
           'an illegal attachment on your message',
           'because the recipient is not accepting mail with ',    # AOL Phoenix
+          'by non-member to a members-only list',
           'closed mailing list',
           'denied by policy',
+          'dmarc 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',
           'local policy violation',
+          'message bounced due to organizational settings',
           'message given low priority',
           'message not accepted for policy reasons',
           'messages with multiple addresses',
@@ -34,6 +37,7 @@ module Sisimai
           'protocol violation',
           'the email address used to send your message is not subscribed to this group',
           'this message was blocked because its content presents a potential',
+          'we do not accept messages containing images or other attachments',
           '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',
         ]
@@ -52,7 +56,7 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is security error or not
+        # The bounce reason is "policyviolation" or not
         # @param    [Sisimai::Data] argvs   Object to be detected the reason
         # @return   [True,False]            true: is policy violation
         #                                   false: is not policy violation