sisimai 5.4.1-java → 5.6.0-java

data/lib/sisimai/order.rb

@@ -11,7 +11,7 @@ module Sisimai
         'Sisimai::Lhost::Sendmail',
         'Sisimai::Lhost::Exchange2007',
         'Sisimai::Lhost::Exchange2003',
-        'Sisimai::Lhost::InterScanMSS',
+        'Sisimai::Lhost::TrendMicro',
         'Sisimai::Lhost::KDDI',
         'Sisimai::Lhost::FML',
         'Sisimai::Lhost::Verizon',
@@ -38,7 +38,7 @@ module Sisimai
         'Sisimai::Lhost::MFILTER',
         'Sisimai::Lhost::MailFoundry',
         'Sisimai::Lhost::GoogleGroups',
-        'Sisimai::Lhost::MailMarshalSMTP',
+        'Sisimai::Lhost::MailMarshal',
         'Sisimai::Lhost::V5sendmail',
         'Sisimai::Lhost::EZweb',
         'Sisimai::Lhost::Biglobe',
@@ -84,7 +84,7 @@ module Sisimai
           'Sisimai::Lhost::Zoho',
           'Sisimai::Lhost::EinsUndEins',
         ],
-        'mail-could'   => ['Sisimai::Lhost::InterScanMSS'],
+        'mail-could'   => ['Sisimai::Lhost::TrendMicro'],
         'mail-failure' => ['Sisimai::Lhost::Exim'],
         'mail-system'  => ['Sisimai::Lhost::EZweb'],
         'message-delivery' => ['Sisimai::Lhost::MailFoundry'],
@@ -92,6 +92,7 @@ module Sisimai
         'non-recapitabile' => ['Sisimai::Lhost::Exchange2007'],
         'non-remis' => ['Sisimai::Lhost::Exchange2007'],
         'notice'    => ['Sisimai::Lhost::Courier'],
+        'postmaster-email'   => ['Sisimai::Lhost::Mimecast'],
         'postmaster-notify'  => ['Sisimai::Lhost::Sendmail'],
         'returned-mail' => [
           'Sisimai::Lhost::Sendmail',
@@ -101,7 +102,7 @@ module Sisimai
         ],
         'there-was'          => ['Sisimai::Lhost::X6'],
         'undeliverable'      => ['Sisimai::Lhost::Exchange2007', 'Sisimai::Lhost::Exchange2003'],
-        'undeliverable-mail' => ['Sisimai::Lhost::MailMarshalSMTP', 'Sisimai::Lhost::IMailServer'],
+        'undeliverable-mail' => ['Sisimai::Lhost::MailMarshal', 'Sisimai::Lhost::IMailServer'],
         'undeliverable-message' => ['Sisimai::Lhost::Notes', 'Sisimai::Lhost::Verizon'],
         'undelivered-mail'      => ['Sisimai::Lhost::Postfix', 'Sisimai::Lhost::Zoho'],
         'warning'               => ['Sisimai::Lhost::Sendmail', 'Sisimai::Lhost::Exim'],

data/lib/sisimai/reason/authfailure.rb

@@ -12,23 +12,19 @@ module Sisimai
     # Diagnostic-Code: smtp; 550 5.7.1 Email rejected per DMARC policy for example.org
     module AuthFailure
       class << self
-        require 'sisimai/string'
-
         Index = [
-          '//spf.pobox.com',
-          'bad spf records for',
-          'dmarc policy',
+          "//spf.pobox.com",
+          "5322.From address doesn't meet the authentication requirements",
+          "bad spf records for",
+          "dmarc policy",
           "doesn't meet the required authentication level",
-          'please inspect your spf settings',
-          'sender policy framework (spf) fail',
-          'sender policy framework violation',
-          'spf (sender policy framework) domain authentication fail',
-          'spf check: fail',
-          "the 5322.From address doesn't meet the authentication requirements defined for the sender",
+          "please inspect your spf settings",
+          "sender policy framework",
+          "spf check: fail",
         ].freeze
         Pairs = [
-          [' is not allowed to send mail.', '_401'],
-          ['is not allowed to send from <', " per it's spf record"],
+          [" is not allowed to send mail.", "_401"],
+          ["is not allowed to send from <", " per it's spf record"],
         ].freeze
 
         def text; return 'authfailure'; end
@@ -38,7 +34,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false

data/lib/sisimai/reason/badreputation.rb

@@ -15,13 +15,13 @@ module Sisimai
     module BadReputation
       class << self
         Index = [
-          'a poor email reputation score',
-          'has been temporarily rate limited due to ip reputation',
-          'ip/domain reputation problems',
-          'likely suspicious due to the very low reputation',
-          'none/bad reputation', # t-online.de
-          'temporarily deferred due to unexpected volume or user complaints', # Yahoo Inc.
-          "the sending mta's poor reputation",
+          "has been temporarily rate limited due to ip reputation",
+          "ip/domain reputation problems",
+          "likely suspicious due to the very low reputation",
+          "none/bad reputation", # t-online.de
+          "poor email reputation score",
+          "sending mta's poor reputation",
+          "temporarily deferred due to unexpected volume or user complaints", # Yahoo Inc.
         ].freeze
         def text; return 'badreputation'; end
         def description; return 'Email rejected due to an IP address reputation'; end
@@ -30,7 +30,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/blocked.rb

@@ -7,92 +7,67 @@ module Sisimai
     # or the parameter of "HELO/EHLO" command. This reason has added in Sisimai 4.0.0.
     module Blocked
       class << self
-        require 'sisimai/string'
-
         Index = [
-          ' said: 550 blocked',
-          '//www.spamcop.net/bl.',
-          'bad sender ip address',
-          'banned sending ip',    # Office365
-          'blacklisted by',
-          'blocked using ',
-          'blocked - see http',
-          'dnsbl:attrbl',
-          'client host rejected: abus detecte gu_eib_02',     # SFR
-          'client host rejected: abus detecte gu_eib_04',     # SFR
-          'client host rejected: may not be mail exchanger',
-          'client host rejected: was not authenticated',      # Microsoft
-          'confirm this mail server',
-          'connection dropped',
-          'connection refused by',
-          'connection reset by peer',
-          'connection was dropped by remote host',
-          'connections not accepted from ip addresses on spamhaus xbl',
-          'currently sending spam see: ',
-          'domain does not exist:',
-          'dynamic/zombied/spam ips blocked',
-          'error: no valid recipients from ',
-          'esmtp not accepting connections',  # icloud.com
-          'extreme bad ip profile',
-          'go away',
-          'helo command rejected:',
-          'host network not allowed',
-          'hosts with dynamic ip',
-          'invalid ip for sending mail of domain',
-          'is in a black list',
-          'is not allowed to send mail from',
-          'no access from mail server',
-          'no matches to nameserver query',
-          'not currently accepting mail from your ip',    # Microsoft
-          'part of their network is on our block list',
-          'please use the smtp server of your isp',
-          'refused - see http',
-          'rejected - multi-blacklist', # junkemailfilter.com
-          'rejected because the sending mta or the sender has not passed validation',
-          'rejecting open proxy', # Sendmail(srvrsmtp.c)
-          'sender ip address rejected',
-          'server access forbidden by your ip ',
-          'service not available, closing transmission channel',
-          'smtp error from remote mail server after initial connection:', # Exim
-          "sorry, that domain isn't in my list of allowed rcpthosts",
-          'sorry, your remotehost looks suspiciously like spammer',
-          'temporarily deferred due to unexpected volume or user complaints',
-          'to submit messages to this e-mail system has been rejected',
-          'too many spams from your ip',  # free.fr
-          'too many unwanted messages have been sent from the following ip address above',
-          'was blocked by ',
-          'we do not accept mail from dynamic ips',   # @mail.ru
-          'you are not allowed to connect',
-          'you are sending spam',
-          'your ip address is listed in the rbl',
-          'your network is temporary blacklisted',
-          'your server requires confirmation',
+          "bad sender ip address",
+          "banned sending ip", # Office365
+          "blacklisted by",
+          "dnsbl:attrbl",
+          "client host rejected: abus detecte gu_eib_02", # SFR
+          "client host rejected: abus detecte gu_eib_04", # SFR
+          "client host rejected: may not be mail exchanger",
+          "connection refused by",
+          "currently sending spam see: ",
+          "domain does not exist:",
+          "domain isn't in my list of allowed rcpthosts",
+          "error: no valid recipients from ",
+          "esmtp not accepting connections", # icloud.com
+          "extreme bad ip profile",
+          "helo command rejected:",
+          "host network not allowed",
+          "invalid ip for sending mail of domain",
+          "is in a black list",
+          "is not allowed to send mail from",
+          "no access from mail server",
+          "part of their network is on our block list",
+          "please use the smtp server of your isp",
+          "rejected because the sending mta or the sender has not passed validation",
+          "rejecting open proxy", # Sendmail(srvrsmtp.c)
+          "sender ip address rejected",
+          "server access forbidden by your ip ",
+          "smtp error from remote mail server after initial connection:", # Exim
+          "you are not allowed to connect",
+          "your ip address is listed in the rbl",
+          "your network is temporary blacklisted",
+          "your remotehost looks suspiciously like spammer",
+          "your server requires confirmation",
         ].freeze
         Pairs = [
-          ['(', '@', ':blocked)'],
-          ['access from ip address ', ' blocked'],
-          ['client host ', ' blocked using'],
-          ['connections will not be accepted from ', " because the ip is in spamhaus's list"],
-          ['dnsbl:rbl ', '>_is_blocked'],
-          ['email blocked by ', '.barracudacentral.org'],
-          ['email blocked by ', 'spamhaus'],
-          ['host ', ' refused to talk to me: ', ' blocked'],
-          ['ip ', ' is blocked by earthlink'],    # Earthlink
-          ['is in an ', 'rbl on '],
-          ['mail server at ', ' is blocked'],
-          ['mail from ',' refused:'],
-          ["mail from "," refused, see ", "orbs"],
-          ['message from ', ' rejected based on blacklist'],
-          ['messages from ', ' temporarily deferred due to user complaints'], # Yahoo!
-          ['server ip ', ' listed as abusive'],
-          ['sorry! your ip address', ' is blocked by rbl'], # junkemailfilter.com
-          ['the domain ', ' is blacklisted'],
-          ['the email ', ' is blacklisted'],
-          ['the ip', ' is blacklisted'],
-          ['veuillez essayer plus tard. service refused, please try later. ', '103'],
-          ['veuillez essayer plus tard. service refused, please try later. ', '510'],
+          ["(", "@", ":blocked)"],
+          ["access from ip address ", " blocked"],
+          ["blocked by ", " dnsbl"],
+          ["client ", " blocked using"],
+          ["connection ", "dropped"],
+          ["client host ", " blocked using"],
+          ["connections will not be accepted from ", " because the ip is in spamhaus's list"],
+          ["dynamic", " ip"],
+          ["email blocked by ", ".barracudacentral.org"],
+          ["email blocked by ", "spamhaus"],
+          ["from ", " ip address"],
+          ["host ", " said: ", "550 blocked"],
+          ["host ", " refused to talk to me: ", " blocked"],
+          ["ip ", " is blocked by earthlink"], # Earthlink
+          ["is in an ", "rbl on "],
+          ["mail server at ", " is blocked"],
+          ["mail from "," refused"],
+          ["message from ", " rejected based on blacklist"],
+          ["messages from ", " temporarily deferred due to user complaints"], # Yahoo!
+          ["server ip ", " listed as abusive"],
+          ["sorry! your ip address", " is blocked by rbl"], # junkemailfilter.com
+          ["the ", " is blacklisted"], # the email, the domain, the ip
+          ["veuillez essayer plus tard. service refused, please try later. ", "103"],
+          ["veuillez essayer plus tard. service refused, please try later. ", "510"],
           ["your access ip", " has been rejected"],
-          ["your sender's ip address is listed at ", '.abuseat.org'],
+          ["your sender's ip address is listed at ", ".abuseat.org"],
         ].freeze
 
         def text; return 'blocked'; end
@@ -102,7 +77,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false

data/lib/sisimai/reason/contenterror.rb

@@ -9,15 +9,20 @@ module Sisimai
     module ContentError
       class << self
         Index = [
-          'duplicate header',
-          'header size exceeds maximum permitted',
-          'improper use of 8-bit data in message header',
-          'message header size, or recipient list, exceeds policy limit',
-          'message mime complexity exceeds the policy maximum',
-          'routing loop detected -- too many received: headers',
-          'this message contain invalid mime headers',
-          'this message contain improperly-formatted binary content',
-          'this message contain text that uses unnecessary base64 encoding',
+          "executable files are not allowed in compressed files",
+          "header error",
+          "header size exceeds maximum permitted",
+          "illegal attachment on your message",
+          "improper use of 8-bit data in message header",
+          "it has a potentially executable attachment",
+          "message contain invalid mime headers",
+          "message contain improperly-formatted binary content",
+          "message contain text that uses unnecessary base64 encoding",
+          "message header size, or recipient list, exceeds policy limit",
+          "message mime complexity exceeds the policy maximum",
+          "message was blocked because its content presents a potential", # https://support.google.com/mail/answer/6590
+          "routing loop detected -- too many received: headers",
+          "we do not accept messages containing images or other attachments",
         ].freeze
 
         def text; return 'contenterror'; end
@@ -27,7 +32,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/{mesgtoobig.rb → emailtoolarge.rb}

@@ -2,35 +2,34 @@ module Sisimai
   module Reason
     # This is the error that a sent email size is too big for a destination mail server. In many
     # case, There are many attachment files with email, or the file size is too large. Sisimai will
-    # set "mesgtoobig" to the reason of email bounce if the value of Status: field in a bounce email
-    # is "5.3.4".
-    module MesgTooBig
+    # set "emailtoolarge" to the reason of email bounce if the value of Status: field in a bounce
+    # email is "5.2.3" or "5.3.4".
+    module EmailTooLarge
       class << self
         Index = [
-          'exceeded maximum inbound message size',
-          'exceeded the maximum incoming message size',
-          'line limit exceeded',
-          'max message size exceeded',
-          'message file too big',
-          'message length exceeds administrative limit',
-          'message size exceeds fixed limit',
-          'message size exceeds fixed maximum message size',
-          'message size exceeds maximum value',
-          'message too big',
-          'message too large for this ',
-          'size limit',
-          'taille limite du message atteinte',
+          "line limit exceeded",
+          "mail file size exceeds the maximum size allowed for mail delivery",
+          "message too large",
+          "size limit",
+          "taille limite du message atteinte",
+        ].freeze
+        Pairs = [
+          ["exceeded", "message size"],
+          ["message ", "exceeds ", "limit"],
+          ["message ", "size", "exceed"],
+          ["message ", "too", "big"],
         ].freeze
 
-        def text; return 'mesgtoobig'; end
+        def text; return 'emailtoolarge'; end
         def description; return 'Email rejected due to an email size is too big for a destination mail server'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
@@ -40,18 +39,18 @@ module Sisimai
         #                                   false: is not big
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'mesgtoobig'
+          return true if argvs['reason'] == 'emailtoolarge'
 
           statuscode = argvs['deliverystatus'] || ''
           tempreason = Sisimai::SMTP::Status.name(statuscode)
 
-          # Delivery status code points "mesgtoobig".
+          # Delivery status code points "emailtoolarge".
           # Status: 5.3.4
           # Diagnostic-Code: SMTP; 552 5.3.4 Error: message file too big
-          return true if tempreason == 'mesgtoobig'
-
-          #  5.2.3   Message length exceeds administrative limit
-          return false if( tempreason == 'exceedlimit' || statuscode == '5.2.3' )
+          #
+          # Status: 5.2.3
+          # Deiagnostic-Code: Message length exceeds administrative limit
+          return true if tempreason == 'emailtoolarge'
           return match(argvs['diagnosticcode'].downcase)
         end
 
@@ -60,5 +59,3 @@ module Sisimai
   end
 end
 
-
-

data/lib/sisimai/reason/expired.rb

@@ -7,32 +7,25 @@ module Sisimai
     # the message you sent has been in the queue for long time.
     module Expired
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'connection timed out',
-          'could not find a gateway for',
-          'delivery attempts will continue to be',
-          'delivery expired',
-          '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',
-          'message expired, cannot connect to remote server',
-          'message expired, connection refulsed',
-          'message timed out',
-          'retry time not reached for any host after a long failure period',
-          'server did not respond',
-          'this message has been in the queue too long',
-          'unable to deliver message after multiple retries',
-          'was not reachable within the allowed queue period',
-          'your message could not be delivered for more than',
+          "connection timed out",
+          "could not find a gateway for",
+          "delivery attempts will continue to be",
+          "failed to deliver to domain ",
+          "have been failing for a long time",
+          "has been delayed",
+          "it has not been collected after",
+          "message could not be delivered for more than",
+          "message expired, ",
+          "message has been in the queue too long",
+          "message timed out",
+          "server did not respond",
+          "unable to deliver message after multiple retries",
         ].freeze
         Pairs = [
-          ['could not be delivered for', ' days'],
+          ["could not be delivered for", " days"],
+          ["delivery ", "expired"],
+          ["not", "reach", "period"],
         ].freeze
 
         def text; return 'expired'; end
@@ -42,7 +35,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false

data/lib/sisimai/reason/failedstarttls.rb

@@ -17,7 +17,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/filtered.rb

@@ -10,22 +10,18 @@ module Sisimai
     module Filtered
       class << self
         Index = [
-          'because the recipient is only accepting mail from specific email addresses',   # AOL Phoenix
-          'bounced address',  # SendGrid|a message to an address has previously been Bounced.
-          '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',
+          "account is protected by",
+          "has restricted sms e-mail", # AT&T
+          "is not accepting any mail",
           "message filtered",
-          'message rejected due to user rules',
-          'not found recipient account',
-          'refused due to recipient preferences', # Facebook
-          'resolver.rst.notauthorized',   # Microsoft Exchange
-          'this account is protected by',
-          'user not found',   # Filter on MAIL.RU
-          'user refuses to receive this mail',
-          'user reject',
-          'we failed to deliver mail because the following address recipient id refuse to receive mail',  # Willcom
-          'you have been blocked by the recipient',
+          "message rejected due to user rules",
+          "not found recipient account",
+          "recipient id refuse to receive mail", # Willcom
+          "recipient is only accepting mail from specific email addresses", # AOL Phoenix
+          "refused due to recipient preferences", # Facebook
+          "user refuses to receive this mail",
+          "user reject",
+          "you have been blocked by the recipient",
         ].freeze
 
         def text; return 'filtered'; end
@@ -35,7 +31,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
@@ -48,7 +44,6 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'filtered'
 
-          require 'sisimai/reason/userunknown'
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
           return false if tempreason == 'suspend'
 
@@ -56,12 +51,13 @@ module Sisimai
           thecommand = argvs['command']                 || ''
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
+            require 'sisimai/reason/userunknown'
             return true if Sisimai::Reason::UserUnknown.match(issuedcode) || match(issuedcode)
           else
             # The value of "reason" isn't "filtered" when the value of "command" 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?(thecommand)
+            return false if Sisimai::SMTP::Command::ExceptDATA.include?(thecommand)
             return true  if match(issuedcode) || Sisimai::Reason::UserUnknown.match(issuedcode)
           end
           return false

data/lib/sisimai/reason/hasmoved.rb

@@ -17,7 +17,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
@@ -28,7 +28,8 @@ module Sisimai
         #                                   false: Has not moved
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'hasmoved'
+          return true  if argvs['reason'] == 'hasmoved'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/hostunknown.rb

@@ -6,26 +6,22 @@ module Sisimai
     # Status: field in a bounce mail is "5.1.2".
     module HostUnknown
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'domain does not exist',
-          'domain is not reachable',
-          'domain must exist',
-          'host or domain name not found',
-          'host unknown',
-          'host unreachable',
-          'mail domain mentioned in email address is unknown',
-          'name or service not known',
-          'no such domain',
-          'recipient address rejected: unknown domain name',
-          'recipient domain must exist',
-          'the account or domain may not exist',
-          'unknown host',
-          'unroutable address',
-          'unrouteable address',
+          "domain is not reachable",
+          "domain mentioned in email address is unknown",
+          "domain must exist",
+          "host or domain name not found",
+          "host unknown",
+          "host unreachable",
+          "name or service not known",
+          "no such domain",
+          "recipient address rejected: unknown domain name",
+          "unknown host",
+        ].freeze
+        Pairs = [
+          ["domain ", "not exist"],
+          ["unrout", "able ", "address"],
         ].freeze
-        Pairs = [['553 ', ' does not exist']].freeze
 
         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
@@ -35,7 +31,7 @@ module Sisimai
         # @return   [Boolean]       false: Did not match, true: Matched
         # @since v4.0.0
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
@@ -47,7 +43,8 @@ module Sisimai
         #                                   false: is not unknown host.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'hostunknown'
+          return true  if argvs['reason'] == 'hostunknown'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
           statuscode = argvs['deliverystatus'] || ''
@@ -55,7 +52,7 @@ module Sisimai
           if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
             # To prevent classifying DNS errors as "HostUnknown"
             require 'sisimai/reason/networkerror'
-            return true unless Sisimai::Reason::NetworkError.match(issuedcode)
+            return true if Sisimai::Reason::NetworkError.match(issuedcode) == false
           else
             # Status: 5.1.2
             # Diagnostic-Code: SMTP; 550 Host unknown