sisimai 4.25.10 → 4.25.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba874891fd9c23f0d4cde6c02241a5e956a4202cfffbcfd0768761b073381597
-  data.tar.gz: 01cc1c85c60772b61e5d3e56917b4bf664e26d19a17a38cbb4be972475e4f295
+  metadata.gz: b96e6f5eb8587091c2902d4bdf83d63fd5d36606d80120428b509afeae37ab4b
+  data.tar.gz: 074ee81152220a51456a3a4d2236075715b1aa7045ddcace81aa0fd406676f4f
 SHA512:
-  metadata.gz: fdbba88ba982e6c93e35c79a95b20a073ef3e4bcfa84b261de0347fdfbcf1f3e430e7eebc0418fd54efb639f48118512e883b63dc85ade1ec71521f728198955
-  data.tar.gz: 616005c1de3152c7f5e501ecd8524d4eae0f7e1c95ae291849011b6c2baec01dbc29cdc4ed5a21abf306e3f29c86ca0690975daaee5b43afac860f08649620c6
+  metadata.gz: d3dbf3a7f80e30ef008b925c3f2105d005663a61e94bff2e361f9c9bf5bd80991cc9ca2e7ab522c657012ebe42a7f717de9d96a241c5b5b4e3d16921f8d6ac77
+  data.tar.gz: 8903044d48d468b905758a0b7c4abd8851d5609bbefb7f46c4f09379529f06751d6f0bec5214a50f782c7ea5902f2df33ea663a8806418584ff900cc13b5e019

data/.travis.yml

@@ -2,11 +2,12 @@ language: ruby
 rvm:
   # See http://rubies.travis-ci.org for Precompiled Ruby Versions
   - 2.1.1
-  - 2.2.4
+  - 2.2.10
 # - 2.3.0
-# - 2.4.0
+  - 2.4.9
 # - 2.5.0
-  - 2.6.0
+  - 2.6.6
+  - 2.7.0
 # - jruby-9.0.5.0
 # - jruby-9.1.9.0
 before_install:

data/ChangeLog.md

@@ -3,6 +3,20 @@ RELEASE NOTES for Ruby version of Sisimai
 - releases: "https://github.com/sisimai/rb-sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
 
+v4.25.11
+--------------------------------------------------------------------------------
+- release: "Mon, 22 Feb 2021 21:15:22 +0900 (JST)"
+- version: "4.25.11"
+- changes:
+  - Fix typo in `Sisimai::RFC3464`
+  - Import some commits from Sisimai version 5 preview #
+    - Improved code for getting an email address in `Sisimai::Address`
+    - Improved code for checking the day of month value, for converting a full
+      month name and a full day of the week at `Sisimai::DateTime`
+    - Improvement code for picking text blocks of message/rfc822 part in RFC5322
+    - Add 60+ error message patterns
+    - Improved code for encodings in `Sisimai::Lhost::Domino`, `Sisimai::String`
+
 v4.25.10
 --------------------------------------------------------------------------------
 - release: "Tue, 22 Dec 2020 13:22:22 +0900 (JST)"

data/lib/sisimai/address.rb

@@ -240,7 +240,7 @@ module Sisimai
 
         # Remove angle brackets, other brackets, and quotations: []<>{}'`
         # except a domain part is an IP address like neko@[192.0.2.222]
-        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/['`>})]\z/, '')
+        e[:address] = e[:address].sub(/\A[\[<{('`]/, '').sub(/[.'`>});]\z/, '')
         e[:address].chomp!(']') unless e[:address] =~ /[@]\[[0-9A-Za-z:\.]+\]\z/
         e[:address] = e[:address].sub(/\A["]/, '').chomp('"') unless e[:address] =~ /\A["].+["][@]/
 
@@ -321,13 +321,16 @@ module Sisimai
       addrs = Sisimai::Address.find(argv1)
       return nil unless addrs
       return nil if addrs.empty?
+
       thing = addrs.shift
+      heads = ['<']
+      tails = ['>', ',', '.', ';']
 
       if cv = thing[:address].match(/\A([^\s]+)[@]([^@]+)\z/) ||
               thing[:address].match(/\A(["].+?["])[@]([^@]+)\z/)
         # Get the local part and the domain part from the email address
-        lpart = cv[1]
-        dpart = cv[2]
+        lpart = cv[1]; heads.each { |e| lpart.gsub!(/\A#{e}/, '') if lpart.start_with?(e) }
+        dpart = cv[2]; tails.each { |e| dpart.gsub!(/#{e}\z/, '') if dpart.end_with?(e)   }        
         email = Sisimai::Address.expand_verp(thing[:address])
         aname = nil
 

data/lib/sisimai/datetime.rb

@@ -207,24 +207,24 @@ module Sisimai
       end
 
       # Month name list
-      # @param    [Integer] argv1  Require full name or not
+      # @param    [Boolean] argv1  Require full name or not
       # @return   [Array, String]  Month name list or month name
       # @example  Get the names of each month
-      #   monthname()  #=> [ 'Jan', 'Feb', ... ]
-      #   monthname(1) #=> [ 'January', 'February', 'March', ... ]
-      def monthname(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   monthname()     #=> [ 'Jan', 'Feb', ... ]
+      #   monthname(true) #=> [ 'January', 'February', 'March', ... ]
+      def monthname(argv1 = false)
+        value = argv1 ? :full : :abbr
         return MonthName[value]
       end
 
       # List of day of week
-      # @param    [Integer] argv1 Require full name
+      # @param    [Boolean] argv1 Require full name
       # @return   [Array, String] List of day of week or day of week
       # @example  Get the names of each day of week
-      #   dayofweek()  #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
-      #   dayofweek(1) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
-      def dayofweek(argv1 = 0)
-        value = argv1 > 0 ? :full : :abbr
+      #   dayofweek()     #=> [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]
+      #   dayofweek(true) #=> [ 'Sunday', 'Monday', 'Tuesday', ... ]
+      def dayofweek(argv1 = false)
+        value = argv1 ? :full : :abbr
         return DayOfWeek[value]
       end
 
@@ -257,9 +257,10 @@ module Sisimai
 
         while p = timetokens.shift do
           # Parse each piece of time
-          if p =~ /\A[A-Z][a-z]{2}[,]?\z/
+          if p =~ /\A[A-Z][a-z]{2,}[,]?\z/
             # Day of week or Day of week; Thu, Apr, ...
-            p.chop if p.size == 4 # Thu, -> Thu
+            p.gsub!(/,\z/, '') if p.end_with?(',')  # "Thu," => "Thu"
+            p = p[0,3] if p.size > 3
 
             if DayOfWeek[:abbr].include?(p)
               # Day of week; Mon, Thu, Sun,...
@@ -273,7 +274,7 @@ module Sisimai
             # Year or Day; 2005, 31, 04,  1, ...
             if p.to_i > 31
               # The piece is the value of an year
-              v[:Y] = p
+              v[:Y] = p.to_i
             else
               # The piece is the value of a day
               if v[:d]
@@ -441,7 +442,7 @@ module Sisimai
       # @example  Get timezone offset string of specified seconds
       #   second2tz(12345)    #=> '+0325'
       def second2tz(argv1)
-        return '+0000' unless argv1.is_a?(Number)
+        return '+0000' unless argv1.is_a?(::Integer)
         return nil if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
 
         digit = { :operator => '+' }

data/lib/sisimai/lhost/amazonses.rb

@@ -182,7 +182,7 @@ module Sisimai::Lhost
               v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
               v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
               v['reason']    = 'delivered'
-              v['action']    = 'deliverable'
+              v['action']    = 'delivered'
 
               v['date'] = o['timestamp'] || p['mail']['timestamp']
               v['date'].sub!(/[.]\d+Z\z/, '')

data/lib/sisimai/lhost/domino.rb

@@ -7,12 +7,13 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/delivery-status|.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
           'not listed in public Name & Address Book',
+          "dans l'annuaire Domino", # TODO: "non répertorié dans l'annuaire Domino",
           'Domino ディレクトリには見つかりません',
         ],
         'filtered' => ['Cannot route mail to user'],
@@ -25,7 +26,11 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:')
+        return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
+
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
@@ -87,6 +92,24 @@ module Sisimai::Lhost
             elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
               #   Subject: Nyaa
               subjecttxt = cv[1]
+
+            elsif f = Sisimai::RFC1894.match(e)
+              # There are some fields defined in RFC3464, try to match 
+              o = Sisimai::RFC1894.field(e) || next
+              next if o[-1] == 'addr'
+
+              if o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec']      = o[1] if v['spec'].to_s.empty?
+                v['diagnosis'] = o[2] if v['diagnosis'].to_s.empty?
+              else
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable[o[0]]
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
+              end
             end
           end
         end
@@ -95,12 +118,14 @@ module Sisimai::Lhost
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
+          e['lhost']   ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            e['status'] = Sisimai::SMTP::Status.code(r.to_s, false) || ''
+            e['reason']   = r
+            e['status'] ||= Sisimai::SMTP::Status.code(r.to_s, false) || ''
             break
           end
         end

data/lib/sisimai/lhost/einsundeins.rb

@@ -52,7 +52,7 @@ module Sisimai::Lhost
           # http://postmaster.1and1.com/en/error-messages?ip=%1s
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
+          if cv = e.match(/\A([^ ]+[@][^ ]+?)[:]?\z/)
             # general@example.eu
             if v['recipient']
               # There are multiple recipient addresses in the message body.

data/lib/sisimai/lhost/exim.rb

@@ -265,7 +265,10 @@ module Sisimai::Lhost
                   # Content-type: message/delivery-status
                   nextcursor = 1 if e.start_with?(StartingOf[:deliverystatus][0])
                   v['alterrors'] ||= ''
-                  v['alterrors'] << e + ' ' if e.start_with?(' ')
+                  if e.start_with?("\s", "\t")
+                    e.sub!(/\A[\s\t]+/, '')
+                    v['alterrors'] << e + ' ' unless v['alterrors'].include?(e)
+                  end
                 end
               else
                 if dscontents.size == recipients
@@ -375,7 +378,7 @@ module Sisimai::Lhost
                 rxdiagnosis = %r/e['diagnosis']/i
                 # Override the value of diagnostic code message because
                 # the value of alterrors includes the value of diagnosis.
-                e['diagnosis'] = e['alterrors'] if e['alterrors'] =~ rxdiagnosis
+                e['diagnosis'] = e['alterrors'] if e['alterrors'].downcase.include?(e['diagnosis'].downcase)
               end
             end
             e.delete('alterrors')

data/lib/sisimai/lhost/gsuite.rb

@@ -82,6 +82,11 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
+              if fieldtable[o[0]] == 'lhost'
+                # Do not set an email address as a hostname in "lhost" value
+                v['lhost'] = '' if v['lhost'].include?('@')
+              end
+
               next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             end

data/lib/sisimai/lhost/imailserver.rb

@@ -71,7 +71,7 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients += 1
           else
             # Other error message text

data/lib/sisimai/lhost/mailfoundry.rb

@@ -9,7 +9,7 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
-        message: ['This is a MIME encoded message'],
+        message: ['Unable to deliver message to:'],
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
@@ -34,8 +34,7 @@ module Sisimai::Lhost
           # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
-            next
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -44,7 +43,7 @@ module Sisimai::Lhost
           # Delivery failed for the following reason:
           # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
           #
-          # This has been a permanent failure.  No further delivery attempts will be made.
+          # This has been a permanent failure. No further delivery attempts will be made.
           v = dscontents[-1]
 
           if cv = e.match(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -32,10 +32,10 @@ module Sisimai::Lhost
         regularexp = nil
         v = nil
 
-        boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
+        boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
         regularexp = if boundary00.size > 0
                        # Convert to regular expression
-                       Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
+                       Regexp.new('\A' << Regexp.escape(boundary00) << '\z')
                      else
                        regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
                      end

data/lib/sisimai/lhost/notes.rb

@@ -14,7 +14,7 @@ module Sisimai::Lhost
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],
-        networkerror: ['Message has exceeded maximum hop count'],
+        'networkerror' => ['Message has exceeded maximum hop count'],
       }.freeze
 
       # Parse bounce messages from Lotus Notes

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/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/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/mail.rb

@@ -24,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)
@@ -51,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
 

data/lib/sisimai/reason/blocked.rb

@@ -10,7 +10,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Blocked.pm
       class << self
         Regex = %r{(?>
-           access[ ]denied[.][ ]ip[ ]name[ ]lookup[ ]failed
+           [ ]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)
@@ -52,11 +54,13 @@ module Sisimai
           |dnsbl:attrbl
           |dynamic/zombied/spam[ ]ips[ ]blocked
           |email[ ]blocked[ ]by[ ](?:[^ ]+[.]barracudacentral[.]org|spamhaus)
+          |error:[ ]no[ ]valid[ ]recipients[ ]from[ ]
           |esmtp[ ]not[ ]accepting[ ]connections  # icloud.com
           |fix[ ]reverse[ ]dns[ ]for[ ][^ ]+
           |go[ ]away
           |helo[ ]command[ ]rejected:
           |host[ ]+[^ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
+          |host[ ]network[ ]not[ ]allowed
           |hosts[ ]with[ ]dynamic[ ]ip
           |http://(?:
              spf[.]pobox[.]com/why[.]html
@@ -66,7 +70,7 @@ 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[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
             |in[ ]an[ ][^ ]+rbl[ ]on[ ][^ ]+
             |not[ ]allowed[ ]to[ ]send[ ](?:
                mail[ ]from
@@ -76,6 +80,7 @@ module Sisimai
           |mail[ ]server[ ]at[ ][^ ]+[ ]is[ ]blocked
           |mail[ ]from[ ]\d+[.]\d+[.]\d+[.]\d[ ]refused:
           |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
@@ -89,6 +94,11 @@ 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
@@ -120,6 +130,7 @@ module Sisimai
           |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
@@ -141,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