sisimai 4.25.6 → 4.25.11

data/lib/sisimai/reason/userunknown.rb

@@ -25,17 +25,20 @@ module Sisimai
           'Sisimai::Reason::Rejected'    => 'sisimai/reason/rejected',
         }
         Regex = %r{(?>
-           .+[ ]user[ ]unknown
-          |[#]5[.]1[.]1[ ]bad[ ]address
-          |[<].+[>][ ]not[ ]found
-          |[<].+[@].+[>][.][.][.][ ]blocked[ ]by[ ]
+           [#]5[.]1[.]1[ ]bad[ ]address
+          |[<][^ ]+[>][ ]not[ ]found
+          |[<][^ ]+[@][^ ]+[>][.][.][.][ ]blocked[ ]by[ ]
+          |550[ ]address[ ]invalid
           |5[.]0[.]0[.][ ]mail[ ]rejected[.]
           |5[.]1[.]0[ ]address[ ]rejected[.]
-          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[a-z]{3}.+(?:416|418)
+          |account[ ][^ ]+[ ]does[ ]not[ ]exist[ ]at[ ]the[ ]organization
+          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide[.][ ]invalid[ ]recipient[.][0-9a-z_]+41[68]
           |address[ ](?:does[ ]not[ ]exist|unknown)
+          |address[ ](?:does[ ]not[ ]exist|not[ ]present[ ]in[ ]directory|unknown)
           |archived[ ]recipient
           |bad[-_ ]recipient
           |can[']t[ ]accept[ ]user
+          |does[ ]not[ ]exist[.]
           |destination[ ](?:
              addresses[ ]were[ ]unknown
             |server[ ]rejected[ ]recipients
@@ -43,7 +46,7 @@ module Sisimai
           |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
           |invalid[ ](?:
              address
-            |mailbox:
+            |mailbox:?
             |mailbox[ ]path
             |recipient
             )
@@ -53,16 +56,17 @@ module Sisimai
             |an[ ]active[ ]address[ ]at[ ]this[ ]host
             )
           |mailbox[ ](?:
-             .+[ ]does[ ]not[ ]exist
-            |.+[@].+[ ]unavailable
+             [^ ]+[ ]does[ ]not[ ]exist
+            |[^ ]+[@][^ ]+[ ]unavailable
             |does[ ]not[ ]exist
             |invalid
             |is[ ](?:inactive|unavailable)
             |not[ ](?:present|found)
             |unavailable
             )
+          |nessun[ ]utente[ ]simile[ ]in[ ]questo[ ]indirizzo
           |no[ ](?:
-             [ ].+[ ]in[ ]name[ ]directory
+             [ ][^ ]+[ ]in[ ]name[ ]directory
             |account[ ]by[ ]that[ ]name[ ]here
             |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
             |mail[ ]box[ ]available[ ]for[ ]this[ ]user
@@ -79,7 +83,7 @@ module Sisimai
               |user(?:[ ]here)?
               )
             |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-            |valid[ ]recipients[,][ ]bye    # Microsoft
+            |valid[ ]recipients,[ ]bye
             )
           |non[- ]?existent[ ]user
           |not[ ](?:
@@ -87,15 +91,15 @@ module Sisimai
             |a[ ]local[ ]address
             |email[ ]addresses
             )
-          |rcpt[ ][<].+[>][ ]does[ ]not[ ]exist
+          |rcpt[ ][<][^ ]+[>][ ]does[ ]not[ ]exist
           |recipient[ ]address[ ]rejected[.][ ][(]in[ ]reply[ ]to[ ]rcpt[ ]to[ ]command[)]
-          |rece?ipient[ ](?:
-             .+[ ]was[ ]not[ ]found[ ]in
+          |recipient[ ](?:
+             [^ ]+[ ]was[ ]not[ ]found[ ]in
             |address[ ]rejected:[ ](?:
                access[ ]denied
               |invalid[ ]user
-              |user[ ].+[ ]does[ ]not[ ]exist
-              |user[ ]unknown[ ]in[ ].+[ ]table
+              |user[ ][^ ]+[ ]does[ ]not[ ]exist
+              |user[ ]unknown[ ]in[ ][^ ]+[ ]table
               |unknown[ ]user
               )
             |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
@@ -104,9 +108,8 @@ module Sisimai
             |unknown
             )
           |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-          |resolver[.]adr[.]recip(?:ient)notfound
-          |said:[ ]550[-[ ]]5[.]1[.]1[ ].+[ ]user[ ]unknown[ ]
-          |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
+          |resolver[.]adr[.]recipient notfound
+          |said:[ ]550[-[ ]]5[.]1[.]1[ ][^ ]+[ ]user[ ]unknown[ ]
           |sorry,[ ](?:
              user[ ]unknown
             |badrcptto
@@ -122,7 +125,7 @@ module Sisimai
              address[ ]no[ ]longer[ ]accepts[ ]mail
             |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
             |spectator[ ]does[ ]not[ ]exist
-            |user[ ]doesn[']?t[ ]have[ ]a[ ].+[ ]account
+            |user[ ]doesn[']?t[ ]have[ ]a[ ][^ ]+[ ]account
             )
           |unknown[ ](?:
              e[-]?mail[ ]address
@@ -132,13 +135,14 @@ module Sisimai
             |user
             )
           |user[ ](?:
-             .+[ ]was[ ]not[ ]found
-            |.+[ ]does[ ]not[ ]exist
+             [^ ]+[ ]was[ ]not[ ]found
+            |[^ ]+[ ]does[ ]not[ ]exist
             |does[ ]not[ ]exist
             |missing[ ]home[ ]directory
             |not[ ](?:active|exist|found|known)
             |unknown
             )
+          |utilisateur[ ]inconnu[ ]!
           |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
           |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
           )

data/lib/sisimai/rfc1894.rb

@@ -38,14 +38,14 @@ module Sisimai
         'addr' => %r/\A((?:Original|Final|X-Actual)-Recipient):[ ]*(.+?);[ ]*(.+)/,
         'code' => %r/\A(Diagnostic-Code):[ ]*(.+?);[ ]*(.*)/,
         'date' => %r/\A((?:Arrival|Last-Attempt)-Date):[ ]*(.+)/,
-        'host' => %r/\A((?:Reporting|Received-From|Remote)-MTA):[ ]*(.+?);[ ]*(.+)/,
-        'list' => %r/\A(Action):[ ]*(failed|delayed|delivered|relayed|expanded|expired|failure)/i,
+        'host' => %r/\A((?:Received-From|Remote|Reporting)-MTA):[ ]*(.+?);[ ]*(.+)/,
+        'list' => %r/\A(Action):[ ]*(delayed|deliverable|delivered|expanded|expired|failed|failure|relayed)/i,
         'stat' => %r/\A(Status):[ ]*([245][.]\d+[.]\d+)/,
         'text' => %r/\A(X-Original-Message-ID):[ ]*(.+)/,
-       #text: %r/\A(Original-Envelope-Id|Final-Log-ID):[ ]*(.+)/,
+       #'text' => %r/\A(Final-Log-ID|Original-Envelope-Id):[ ]*(.+)/,
       }.freeze
 
-      Correction = { action: { 'failure' => 'failed', 'expired' => 'delayed' } }
+      Correction = { action: { 'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed' }}
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -86,8 +86,8 @@ module Sisimai
       # @since v4.25.0
       def match(argv0 = '')
         return nil if argv0.empty?
-        return 1 if FieldNames[0].any? { |a| argv0.start_with?(a) }
-        return 2 if FieldNames[1].any? { |a| argv0.start_with?(a) }
+        return 1   if FieldNames[0].any? { |a| argv0.start_with?(a) }
+        return 2   if FieldNames[1].any? { |a| argv0.start_with?(a) }
         return nil
       end
 
@@ -98,42 +98,44 @@ module Sisimai
       def field(argv0 = '')
         return nil if argv0.empty?
         group = FieldGroup[argv0.split(':',2).shift.downcase] || ''
-        match = []
 
         return nil if group.empty?
         return nil unless CapturesOn[group]
 
+        table = ['', '', '', '']
+        match = false
         while cv = argv0.match(CapturesOn[group])
           # Try to match with each pattern of Per-Message field, Per-Recipient field
-          # - 0: Field-Name
-          # - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
-          # - 2: Value
-          # - 3: Field Group(addr, code, date, host, stat, text)
-          match[0] = cv[1].downcase
-          match[3] = group
+          #   - 0: Field-Name
+          #   - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
+          #   - 2: Value
+          #   - 3: Field Group(addr, code, date, host, stat, text)
+          match = true
+          table[0] = cv[1].downcase
+          table[3] = group
 
           if group == 'addr' || group == 'code' || group == 'host'
             # - Final-Recipient: RFC822; kijitora@nyaan.jp
             # - Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
             # - Remote-MTA: DNS; mx.example.jp
-            match[1] = cv[2].upcase
-            match[2] = group == 'host' ? cv[3].downcase : cv[3]
-            match[2] = '' if match[2] =~ /\A\s+\z/  # Remote-MTA: dns;
+            table[1] = cv[2].upcase
+            table[2] = group == 'host' ? cv[3].downcase : cv[3]
+            table[2] = '' if table[2] =~ /\A\s+\z/  # Remote-MTA: dns;
           else
             # - Action: failed
             # - Status: 5.2.2
-            match[1] = ''
-            match[2] = group == 'date' ? cv[2] : cv[2].downcase
+            table[1] = ''
+            table[2] = group == 'date' ? cv[2] : cv[2].downcase
 
             # Correct invalid value in Action field:
             break unless group == 'list'
-            break unless Correction[:action][match[2]]
-            match[2] = Correction[:action][match[2]]
+            break unless Correction[:action][table[2]]
+            table[2] = Correction[:action][table[2]]
           end
           break
         end
-        return nil if match.empty?
-        return match
+        return nil unless match
+        return table
       end
 
     end

data/lib/sisimai/rfc3464.rb

@@ -98,12 +98,9 @@ module Sisimai
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
-        require 'sisimai/mda'
-
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         bodyslices = mbody.scrub('?').split("\n")
         readslices = ['']
-        mdabounced = Sisimai::MDA.make(mhead, mbody)
         rfc822text = ''   # (String) message/rfc822 part text
         maybealias = nil  # (String) Original-Recipient Field
         blanklines = 0    # (Integer) The number of blank lines
@@ -177,7 +174,7 @@ module Sisimai
                 maybealias = cv[2]
               else
                 # Final-Recipient: ...
-                x = v['recipienet'] || ''
+                x = v['recipient'] || ''
                 y = Sisimai::Address.s3s4(cv[2])
                 y = maybealias unless Sisimai::RFC5322.is_emailaddress(y)
 
@@ -287,7 +284,7 @@ module Sisimai
               elsif 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]
-                e = 'Diagnostic-Code: ' << e
+                readslices[-1] = 'Diagnostic-Code: ' << e
               else
                 if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # 2.2.2 The Reporting-MTA DSN field
@@ -421,6 +418,8 @@ module Sisimai
         end
         return nil unless recipients > 0
 
+        require 'sisimai/mda'
+        mdabounced = Sisimai::MDA.make(mhead, mbody)
         dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }

data/lib/sisimai/rfc3834.rb

@@ -99,7 +99,7 @@ module Sisimai
         if mhead['content-type']
           # Get the boundary string and set regular expression for matching with
           # the boundary string.
-          b0 = Sisimai::MIME.boundary(mhead['content-type'], 0)
+          b0 = Sisimai::MIME.boundary(mhead['content-type'], 0) || ''
           MarkingsOf[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
         end
 

data/lib/sisimai/rfc5322.rb

@@ -64,9 +64,8 @@ module Sisimai
       # Fields that might be long
       # @return   [Hash] Long filed(email header) list
       def LONGFIELDS
-        return { 'to' => 1, 'from' => 1, 'subject' => 1, 'message-id' => 1 }
+        return { 'to' => true, 'from' => true, 'subject' => true, 'message-id' => true }
       end
-      LongHeaders = Sisimai::RFC5322.LONGFIELDS
 
       # Check that the argument is an email address or not
       # @param    [String] email  Email address string
@@ -192,8 +191,13 @@ module Sisimai
         v[1] ||= ''
 
         unless v[1].empty?
-          v[1].sub(/\A[\r\n\s]+/, '')
-          v[1].sub(/\n\n.+\z/m, '')
+          # Remove blank lines, the message body of the original message, and append "\n" at the end
+          # of the original message headers
+          # 1. Remove leading blank lines
+          # 2. Remove text after the first blank line: \n\n
+          # 3. Append "\n" at the end of test block when the last character is not "\n"
+          v[1].sub!(/\A[\r\n\s]+/, '')
+          v[1] = v[1][0, v[1].index("\n\n")] if v[1].include?("\n\n")
           v[1] << "\n" unless v[1].end_with?("\n")
         end
         return v

data/lib/sisimai/rhost.rb

@@ -19,15 +19,11 @@ module Sisimai
         '.email.ua'                   => 'IUA',
         'lsean.ezweb.ne.jp'           => 'KDDI',
         'msmx.au.com'                 => 'KDDI',
+        'charter.net'                 => 'Spectrum',
+        'cox.net'                     => 'Cox',
         '.qq.com'                     => 'TencentQQ',
       }.freeze
 
-      # Retrun the list of remote hosts Sisimai support
-      # @return   [Array] Remote host list
-      def list
-        return RhostClass.keys
-      end
-
       # The value of "rhost" is listed in RhostClass or not
       # @param    [String] argvs  Remote host name
       # @return   [True,False]    True: matched
@@ -49,9 +45,10 @@ module Sisimai
 
       # Detect the bounce reason from certain remote hosts
       # @param    [Sisimai::Data] argvs   Parsed email object
+      # @param    [String]        proxy   The alternative of the "rhost"
       # @return   [String]                The value of bounce reason
-      def get(argvs)
-        remotehost = argvs.rhost.downcase
+      def get(argvs, proxy = nil)
+        remotehost = proxy || argvs.rhost.downcase
         rhostclass = ''
         modulename = ''
 
@@ -62,6 +59,7 @@ module Sisimai
           rhostclass = modulename.gsub('::', '/').downcase
           break
         end
+        return nil if rhostclass.empty?
 
         require rhostclass
         reasontext = Module.const_get(modulename).get(argvs)

data/lib/sisimai/rhost/cox.rb

@@ -0,0 +1,112 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Data
+    # object as an argument of get() method when the value of "destination" of
+    # the object is "charter.net". This class is called only Sisimai::Data class.
+    module Cox
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/Cox.pm
+        ErrorCodes = {
+          # https://www.cox.com/residential/support/email-error-codes.html
+          'CXBL'      => 'blocked',       # The sending IP address has been blocked by Cox due to exhibiting spam-like behavior.
+          'CXTHRT'    => 'securityerror', # Email sending limited due to suspicious account activity.
+          'CXMJ'      => 'securityerror', # Email sending blocked due to suspicious account activity on primary Cox account.
+          'CXDNS'     => 'blocked',       # There was an issue with the connecting IP address Domain Name System (DNS).
+          'CXSNDR'    => 'rejected',      # There was a problem with the sender's domain.
+          'CXSMTP'    => 'rejected',      # Your email wasn't delivered because Cox was unable to verify that it came from a legitimate email sender.
+          'CXCNCT'    => 'toomanyconn',   # There is a limit to the number of concurrent SMTP connections per IP address
+          'CXMXRT'    => 'toomanyconn',   # The email sender has exceeded the maximum number of sent email allowed.
+          'CDRBL'     => 'blocked',       # The sending IP address has been temporarily blocked by Cox due to exhibiting spam-like behavior.
+          'IPBL0001'  => 'blocked',       # The sending IP address is listed in the Spamhaus Zen DNSBL.
+          'IPBL0010'  => 'blocked',       # The sending IP is listed in the Return Path DNSBL.
+          'IPBL0100'  => 'blocked',       # The sending IP is listed in the Invaluement ivmSIP DNSBL.
+          'IPBL0011'  => 'blocked',       # The sending IP is in the Spamhaus Zen and Return Path DNSBLs.
+          'IPBL0101'  => 'blocked',       # The sending IP is in the Spamhaus Zen and Invaluement ivmSIP DNSBLs.
+          'IPBL0110'  => 'blocked',       # The sending IP is in the Return Path and Invaluement ivmSIP DNSBLs.
+          'IPBL0111'  => 'blocked',       # The sending IP is in the Spamhaus Zen, Return Path and Invaluement ivmSIP DNSBLs.
+          'IPBL1000'  => 'blocked',       # The sending IP address is listed on a CSI blacklist. You can check your status on the CSI website.
+          'IPBL1001'  => 'blocked',       # The sending IP is listed in the Cloudmark CSI and Spamhaus Zen DNSBLs.
+          'IPBL1010'  => 'blocked',       # The sending IP is listed in the Cloudmark CSI and Return Path DNSBLs.
+          'IPBL1011'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen and Return Path DNSBLs.
+          'IPBL1100'  => 'blocked',       # The sending IP is listed in the Cloudmark CSI and Invaluement ivmSIP DNSBLs.
+          'IPBL1101'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen and Invaluement IVMsip DNSBLs.
+          'IPBL1110'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Return Path and Invaluement ivmSIP DNSBLs.
+          'IPBL1111'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen, Return Path and Invaluement ivmSIP DNSBLs.
+          'IPBL00001' => 'blocked',       # The sending IP address is listed on a Spamhaus blacklist. Check your status at Spamhaus.
+          'URLBL011'  => 'spamdetected',  # A URL within the body of the message was found on blocklists SURBL and Spamhaus DBL.
+          'URLBL101'  => 'spamdetected',  # A URL within the body of the message was found on blocklists SURBL and ivmURI.
+          'URLBL110'  => 'spamdetected',  # A URL within the body of the message was found on blocklists Spamhaus DBL and ivmURI.
+          'URLBL1001' => 'spamdetected',  # The URL is listed on a Spamhaus blacklist. Check your status at Spamhaus.
+        }.freeze
+        MessagesOf = {
+          'blocked' => [
+            # Cox requires that all connecting email servers contain valid reverse DNS PTR records.
+            'rejected - no rDNS',
+            # An email client has repeatedly sent bad commands or invalid passwords resulting in a three-hour block of the client's IP address.
+            'cox too many bad commands from',
+            # The reverse DNS check of the sending server IP address has failed.
+            'DNS check failure - try again later',
+            # The sending IP address has exceeded the threshold of invalid recipients and has been blocked.
+            'Too many invalid recipients',
+          ],
+          'notaccept' => [
+            # Our systems are experiencing an issue which is causing a temporary inability to accept new email.
+            'ESMTP server temporarily not available',
+          ],
+          'policyviolation' => [
+            # The sending server has attempted to communicate too soon within the SMTP transaction
+            'ESMTP no data before greeting',
+            # The message has been rejected because it contains an attachment with one of the following prohibited
+            # file types, which commonly contain viruses: .shb, .shs, .vbe, .vbs, .wsc, .wsf, .wsh, .pif, .msc,
+            # .msi, .msp, .reg, .sct, .bat, .chm, .isp, .cpl, .js, .jse, .scr, .exe.
+            'attachment extension is forbidden',
+          ],
+          'rejected' => [
+            # Cox requires that all sender domains resolve to a valid MX or A-record within DNS.
+            'sender rejected',
+          ],
+          'toomanyconn' => [
+            # The sending IP address has exceeded the five maximum concurrent connection limit.
+            'too many sessions from',
+            # The SMTP connection has exceeded the 100 email message threshold and was disconnected.
+            'requested action aborted: try again later',
+            # The sending IP address has exceeded one of these rate limits and has been temporarily blocked.
+            'Message threshold exceeded',
+          ],
+          'userunknown' => [
+            'recipient rejected', # The intended recipient is not a valid Cox Email account.
+          ],
+        }.freeze
+
+        # Detect bounce reason from https://cox.com/
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String, Nil]           The bounce reason at Cox
+        # @since v4.25.8
+        def get(argvs)
+          statusmesg = argvs.diagnosticcode
+          codenumber = 0
+
+          if cv = statusmesg.match(/AUP#([0-9A-Z]+)/)
+            # Capture the numeric part of the error code
+            codenumber = cv[1]
+          end
+          reasontext = ErrorCodes[codenumber] || ''
+
+          if reasontext.empty?
+            # The error code was not found in ErrorCodes
+            MessagesOf.each_key do |e|
+              # Try to find with each error message defined in MessagesOf
+              next unless MessagesOf[e].any? { |a| statusmesg.include?(a) }
+              reasontext = e
+              break
+            end
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/exchangeonline.rb

@@ -22,6 +22,7 @@ module Sisimai
           '5.2.2'   => [{ reason: 'mailboxfull', string: 'Mailbox full' }],
           '5.2.3'   => [{ reason: 'exceedlimit', string: 'Message too large' }],
           '5.2.4'   => [{ reason: 'systemerror', string: 'Mailing list expansion problem' }],
+          '5.2.14'  => [{ reason: 'systemerror', string: 'misconfigured forwarding address' }],
           '5.2.122' => [{ reason: 'toomanyconn' ,string: 'The recipient has exceeded their limit for' }],
           '5.3.3'   => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
           '5.3.4'   => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
@@ -29,6 +30,7 @@ module Sisimai
           '5.4.1'   => [{ reason: 'rejected',    string: 'Recipient address rejected: Access denied' }],
           '5.4.11'  => [{ reason: 'contenterror',string: 'Agent generated message depth exceeded' }],
           '5.4.14'  => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
+          '5.4.310' => [{ reason: 'systemerror', string: 'does not exist' }], # DNS domain * does not exist
           '5.5.2'   => [{ reason: 'syntaxerror', string: 'Send hello first' }],
           '5.5.3'   => [{ reason: 'syntaxerror', string: 'Too many recipients' }],
           '5.5.4'   => [{ reason: 'filtered',    string: 'Invalid domain name' }],
@@ -100,7 +102,12 @@ module Sisimai
           'networkerror'  => ['SMTPSEND.DNS.MxLoopback'],
           'rejected'      => ['RESOLVER.RST.NotAuthorized'],
           'securityerror' => ['RESOLVER.RST.AuthRequired'],
-          'systemerror'   => ['RESOLVER.ADR.Ambiguous', 'RESOLVER.ADR.BadPrimary', 'RESOLVER.ADR.InvalidInSmtp'],
+          'systemerror'   => [
+            'RESOLVER.ADR.Ambiguous',
+            'RESOLVER.ADR.BadPrimary',
+            'RESOLVER.ADR.InvalidInSmtp',
+            'RESOLVER.FWD.NotFound',
+          ],
           'toomanyconn'   => ['RESOLVER.ADR.RecipLimit', 'RESOLVER.ADR.RecipientLimit'],
           'userunknown'   => [
             'RESOLVER.ADR.RecipNotFound',