sisimai 5.0.3 → 5.2.0

data/lib/sisimai/rhost/spectrum.rb

@@ -1,66 +1,127 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "destination" of the object is "charter.net".  This class is
+    # of find() method when the value of "destination" of the object is "charter.net". This class is
     # called only Sisimai::Fact class.
     module Spectrum
       class << self
-        ErrorCodes = {
+        ErrorCodes = [
           # https://www.spectrumbusiness.net/support/internet/understanding-email-error-codes
           #   Error codes are placed in one of two categories: incoming or outgoing.
-          #   1. If you are trying to send an email to a Charter email address from a non-Charter email
-          #      address (such as Gmail, Yahoo, Hotmail, etc.), you may receive an error that begins
-          #      with AUP#I, followed by four numbers.
+          #   1. If you're trying to send an email to a Charter email address from
+          #      a non-Charter email address (such as Gmail, Yahoo, Hotmail, etc.),
+          #      you may receive an error that begins with AUP#I, followed by four numbers.
           #
-          #   2. If you are trying to send an email from a Charter email address to an outgoing recipient,
-          #      you may get an error code beginning with AUP#O, also followed by four numbers.
+          #   2. If you are trying to send an email from a Charter email address
+          #      to an outgoing recipient, you may get an error code beginning with
+          #      AUP#O, also followed by four numbers.
           #
-          1000 => 'blocked',         # Your IP address has been blocked due to suspicious activity. 
-          1010 => 'rejected',        # This email account has been blocked from sending emails due to suspicious activity.
-          1090 => 'systemerror',     # The email you're trying to send can't be processed. Try sending again at a later time.
-          1260 => 'networkerror',    # Spectrum doesn't process IPV6 addresses. Connect with an IPv4 address and try again.
-          1500 => 'rejected',        # Your email was rejected for attempting to send as a different email address than you signed in under.
-          1520 => 'rejected',        # Your email was rejected for attempting to send as a different email address than a domain that we host.
-          1530 => 'mesgtoobig',      # Your email was rejected because it's larger than the maximum size of 20MB.
-          1540 => 'toomanyconn',     # Your emails were deferred for attempting to send too many in a single session.
-          1550 => 'toomanyconn',     # Your email was rejected for having too many recipients in one message.
-          1560 => 'policyviolation', # Your email was rejected for having too many invalid recipients.
-        }.freeze
-        CodeRanges = [
-          [1020, 1080, 'rejected'],        # This email account has limited access to send emails based on suspicious activity.
-          [1100, 1150, 'blocked'],         # The IP address you're trying to connect from has an issue with the Domain Name System.
-          [1160, 1190, 'policyviolation'], # The email you tried to send goes against your domain's security policies.
-          [1200, 1210, 'blocked'],         # The IP address you're trying to send from has been flagged by Cloudmark CSI as potential spam.
-          [1220, 1250, 'blokced'],         # Your IP address has been blacklisted by Spamhaus.
-          [1300, 1340, 'toomanyconn'],     # Spectrum limits the number of concurrent connections from a sender
-          [1350, 1490, 'toomanyconn'],     # Spectrum limits emails by the number of messages sent, amount of recipients,...
+          # 1000 Your IP address has been blocked due to suspicious activity. If you're a Spectrum
+          #      customer using a Spectrum-issued IP, contact us. If you're using an IP address
+          #      other than one provided by Spectrum, blocks will remain in place until they expire.
+          [1000, 0, 'blocked'],
+
+          # 1010 This email account has been blocked from sending emails due to suspicious activity.
+          #      Blocks will expire based on the nature of the activity. If you're a Spectrum customer,
+          #      change all of your Spectrum passwords to secure your account and then contact us.
+          [1010, 0, 'rejected'],
+
+          # 1020 This email account has limited access to send emails based on suspicious activity.
+          # 1080 Blocks will expire based on the nature of the activity.
+          #      If you're a Spectrum customer, contact us to remove the block.
+          [1020, 1080, 'rejected'],
+
+          # 1090 The email you're trying to send can't be processed. Try sending again at a later time.
+          [1090, 0, 'systemerror'],
+
+          # 1100 The IP address you're trying to connect from has an issue with the Domain Name System.
+          # 1150 Spectrum requires a full circle DNS for emails to be allowed through. Verify the IP
+          #      you're connecting from, and check the IP address to ensure a reverse DNS entry exists
+          #      for the IP. If the IP address is a Spectrum-provided email address, contact us.
+          [1100, 1150, 'requireptr'],
+
+          # 1160 The email you tried to send goes against your domain's security policies. 
+          # 1190 Please contact the email administrators of your domain.
+          [1160, 1190, 'policyviolation'],
+
+          # 1200 The IP address you're trying to send from has been flagged by Cloudmark CSI as
+          # 1210 potential spam. Have your IP administrator request a reset. 
+          #      Note: Cloudmark has sole discretion whether to remove the sending IP address from
+          #            their lists.
+          [1200, 1210, 'blocked'],
+
+          # 1220 Your IP address has been blacklisted by Spamhaus. The owner of the IP address must
+          # 1250 contact Spamhaus to be removed from the list.
+          #      Note: Spamhaus has sole discretion whether to remove the sending IP address from
+          #            their lists.
+          [1220, 1250, 'blokced'],
+
+          # 1260 Spectrum doesn't process IPV6 addresses. Connect with an IPv4 address and try again.
+          [1260, 0, 'networkerror'],
+
+          # 1300 Spectrum limits the number of concurrent connections from a sender, as well as the
+          # 1340 total number of connections allowed. Limits vary based on the reputation of the IP
+          #      address. Reduce your number of connections and try again later.
+          [1300, 1340, 'toomanyconn'],
+
+          # 1350 Spectrum limits emails by the number of messages sent, amount of recipients,
+          # 1490 potential for spam and invalid recipients.
+          [1350, 1490, 'speeding'],
+
+          # 1500 Your email was rejected for attempting to send as a different email address than you
+          #      signed in under. Check that you're sending emails from the address you signed in with.
+          [1500, 0, 'rejected'],
+
+          # 1520 Your email was rejected for attempting to send as a different email address than a
+          #      domain that we host. Check the outgoing email address and try again.
+          [1520, 0, 'rejected'],
+
+          # 1530 Your email was rejected because it's larger than the maximum size of 20MB.
+          [1530, 0, 'mesgtoobig'],
+
+          # 1540 Your emails were deferred for attempting to send too many in a single session.
+          #      Reconnect and try reducing the number of emails you send at one time.
+          [1540, 0, 'speeding'],
+
+          # 1550 Your email was rejected for having too many recipients in one message. Reduce the
+          #      number of recipients and try again later.
+          [1550, 0, 'speeding'],
+
+          # 1560 Your email was rejected for having too many invalid recipients. Check your outgoing
+          #      email addresses and try again later.
+          [1560, 0, 'policyviolation'],
+
+          # 1580 You've tried to send messages to too many recipients in a short period of time.
+          #      Wait a little while and try again later.
+          [1580, 0, 'speeding'],
         ].freeze
 
         # Detect bounce reason from https://www.spectrum.com/
-        # @param    [Sisimai::Fact] argvs   Parsed email object
+        # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String, Nil]           The bounce reason at Spectrum
         # @since v4.25.8
-        def get(argvs)
-          statusmesg = argvs['diagnosticcode']
-          codenumber = 0
+        def find(argvs)
+          return argvs['reason'] unless argvs['reason'].empty?
+          issuedcode = argvs['diagnosticcode']
+          reasontext = ''
+          codenumber = if cv = issuedcode.match(/AUP#[-A-Za-z]*(\d{4})/) then cv[1].to_i else 0 end
 
-          if cv = statusmesg.match(/AUP#[-A-Za-z]*(\d{4})/)
-            # Capture the numeric part of the error code
-            codenumber = cv[1].to_i
-          end
-          reasontext = ErrorCodes[codenumber] || ''
-
-          if reasontext.empty?
-            # The error code was not found in ErrorCodes
-            CodeRanges.each do |e|
-              # Check the code range
+          ErrorCodes.each do |e|
+            # Try to find an error code matches with the code in the value of $diagnosticcode
+            if codenumber == e[0]
+              # [1500, 0, 'reason'] or [1500, 1550, 'reason']
+              reasontext = e[2]
+              break
+            else
+              # Check the code number is inlcuded the range like [1500, 1550, 'reason']
+              next if e[1] == 0
               next if codenumber < e[0]
               next if codenumber > e[1]
+
               reasontext = e[2]
               break
             end
           end
-
           return reasontext
         end
 

data/lib/sisimai/rhost/tencent.rb

@@ -1,44 +1,66 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-    # of get() method when the value of "rhost" of the object is "mx*.qq.com". This class is called
+    # of find() method when the value of "rhost" of the object is "mx*.qq.com". This class is called
     # only Sisimai::Fact class.
     module Tencent
       class << self
         MessagesOf = {
-          # https://service.mail.qq.com/cgi-bin/help?id=20022
-          'dmarc check failed'                    => 'blocked',
-          'spf check failed'                      => 'blocked',
-          'suspected spam ip'                     => 'blocked',
-          'mail is rejected by recipients'        => 'filtered',
-          'message too large'                     => 'mesgtoobig',
-          'mail content denied'                   => 'spamdetected',
-          'spam is embedded in the email'         => 'spamdetected',
-          'suspected spam'                        => 'spamdetected',
-          'bad address syntax'                    => 'syntaxerror',
-          'connection denied'                     => 'toomanyconn',
-          'connection frequency limited'          => 'toomanyconn',
-          'domain frequency limited'              => 'toomanyconn',
-          'ip frequency limited'                  => 'toomanyconn',
-          'sender frequency limited'              => 'toomanyconn',
-          'mailbox unavailable or access denied'  => 'toomanyconn',
-          'mailbox not found'                     => 'userunknown',
+          'authfailure' => [
+            'spf check failed',         # https://service.mail.qq.com/detail/122/72
+            'dmarc check failed',
+          ],
+          'blocked' => [
+            'suspected bounce attacks', # https://service.mail.qq.com/detail/122/57
+            'suspected spam ip',        # https://service.mail.qq.com/detail/122/66
+            'connection denied',        # https://service.mail.qq.com/detail/122/170
+          ],
+          'mesgtoobig' => [
+            'message too large',        # https://service.mail.qq.com/detail/122/168
+          ],
+          'rejected' => [
+            'suspected spam',                   # https://service.mail.qq.com/detail/122/71
+            'mail is rejected by recipients',   # https://service.mail.qq.com/detail/122/92
+          ],
+          'spandetected' => [
+            'spam is embedded in the email',    # https://service.mail.qq.com/detail/122/59
+            'mail content denied',              # https://service.mail.qq.com/detail/122/171
+          ],
+          'speeding' => [
+            'mailbox unavailable or access denined', # https://service.mail.qq.com/detail/122/166
+          ],
+          'suspend' => [
+            'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
+          ],
+          'syntaxerror' => [
+            'bad address syntax', # https://service.mail.qq.com/detail/122/167
+          ],
+          'toomanyconn' => [
+            'ip frequency limited',         # https://service.mail.qq.com/detail/122/172
+            'domain frequency limited',     # https://service.mail.qq.com/detail/122/173
+            'sender frequency limited',     # https://service.mail.qq.com/detail/122/174
+            'connection frequency limited', # https://service.mail.qq.com/detail/122/175
+          ],
+          'userunknown' => [
+            'mailbox not found',  # https://service.mail.qq.com/detail/122/169
+          ],
         }.freeze
 
         # Detect bounce reason from Tencent QQ
-        # @param    [Sisimai::Fact] argvs   Parsed email object
+        # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason at Tencent QQ
-        def get(argvs)
+        def find(argvs)
           return argvs['reason'] unless argvs['reason'].empty?
-
-          statusmesg = argvs['diagnosticcode'].downcase
+          issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 
           MessagesOf.each_key do |e|
-            # Try to match the error message with message patterns defined in $MessagesOf
-            next unless statusmesg.include?(e)
-            reasontext = MessagesOf[e]
-            break
+            MessagesOf[e].each do |f|
+              next unless issuedcode.include?(f)
+              reasontext = e
+              break
+            end
+            break if reasontext.size > 0
           end
           return reasontext
         end

data/lib/sisimai/rhost/yahooinc.rb

@@ -0,0 +1,111 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "destination" of the object is "*.yahoodns.net".
+    # This class is called only Sisimai::Fact class.
+    module YahooInc
+      class << self
+        MessagesOf = {
+          'authfailure' => [
+            # - 550 5.7.9 This mail has been blocked because the sender is unauthenticated. Yahoo
+            #   requires all senders to authenticate with either SPF or DKIM.
+            'yahoo requires all senders to authenticate with either spf or dkim',
+          ],
+          'blocked' => [
+            # - 553 5.7.1 [BL21] Connections will not be accepted from 192.0.2.25,
+            #   because the ip is in Spamhaus's list; see http://postmaster.yahoo.com/550-bl23.html
+            # - 553 5.7.1 [BL23] Connections not accepted from IP addresses on Spamhaus XBL;
+            #   see http://postmaster.yahoo.com/errors/550-bl23.html [550]",
+            " because the ip is in spamhaus's list;",
+            'not accepted from ip addresses on spamhaus xbl',
+          ],
+          'norelaying' => [
+            # - 550 relaying denied for <***@yahoo.com>
+            'relaying denied for ',
+          ],
+          'notcompliantrfc' => ['headers are not rfc compliant'],
+          'policyviolation' => [
+            # - 554 Message not allowed - [PH01] Email not accepted for policy reasons.
+            #   Please visit https://postmaster.yahooinc.com/error-codes
+            # - 554 5.7.9 Message not accepted for policy reasons. 
+            #   See https://postmaster.yahooinc.com/error-codes
+            'not accepted for policy reasons',
+          ],
+          'rejected' => [
+            # Observed the following error message since around March 2024:
+            #
+            # - 421 4.7.0 [TSS04] Messages from 192.0.2.25 temporarily deferred due to unexpected
+            #   volume or user complaints - 4.16.55.1;
+            #   see https://postmaster.yahooinc.com/error-codes (in reply to MAIL FROM command))
+            #
+            # However, the same error message is returned even for domains that are considered to
+            # have a poor reputation without SPF, DKIM, or DMARC settings, or for other reasons.
+            # It seems that the error message is not as granular as Google's.
+            'temporarily deferred due to unexpected volume or user complaints',
+
+            # - 451 Message temporarily deferred due to unresolvable RFC.5321 from domain.
+            #   See https://senders.yahooinc.com/error-codes#unresolvable-from-domain
+            'due to unresolvable rfc.5321 domain',
+
+            # - 553 5.7.2 [TSS09] All messages from 192.0.2.25 will be permanently deferred;
+            #   Retrying will NOT succeed. See https://postmaster.yahooinc.com/error-codes
+            # - 553 5.7.2 [TSS11] All messages from 192.0.2.25 will be permanently deferred;
+            #   Retrying will NOT succeed. See https://postmaster.yahooinc.com/error-codes
+            ' will be permanently deferred',
+          ],
+          'speeding' => [
+            # - 450 User is receiving mail too quickly
+            'user is receiving mail too quickly',
+          ],
+          'suspend' => [
+            # - 554 delivery error: dd ****@yahoo.com is no longer valid.
+            # - 554 30 Sorry, your message to *****@aol.jp cannot be delivered.
+            #   This mailbox is disabled (554.30)
+            ' is no longer valid.',
+            'this mailbox is disabled',
+          ],
+          'syntaxerror' => [
+            # - 501 Syntax error in parameters or arguments
+            'syntax error in parameters or arguments',
+          ],
+          'toomanyconn' => [
+            # - 421 Max message per connection reached, closing transmission channel
+            'max message per connection reached',
+          ],
+          'userunknown' => [
+            # - 554 delivery error: dd This user doesn't have a yahoo.com account (***@yahoo.com)
+            # - 552 1 Requested mail action aborted, mailbox not found (in reply to end of DATA command)
+            "dd this user doesn't have a ",
+            'mailbox not found',
+          ],
+        }.freeze
+
+        # Detect bounce reason from Yahoo Inc. (*.yahoodns.net)
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for YahooInc
+        # @see      https://senders.yahooinc.com/smtp-error-codes
+        #           https://smtpfieldmanual.com/provider/yahoo
+        #           https://www.postmastery.com/yahoo-postmaster/
+        # @since v5.1.0
+        def find(argvs)
+          return argvs['reason'] unless argvs['reason'].empty?
+          issuedcode = argvs['diagnosticcode'].downcase
+          reasontext = ''
+
+          MessagesOf.each_key do |e|
+            MessagesOf[e].each do |f|
+              next unless issuedcode.include?(f)
+              reasontext = e
+              break
+            end
+            break if reasontext.size > 0
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost.rb

@@ -1,61 +1,84 @@
 module Sisimai
   # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
-  # of get() method when the value of rhost of the object is listed in the results of Sisimai::Rhost
+  # of find() method when the value of rhost of the object is listed in the results of Sisimai::Rhost
   # ->list method. This class is called only Sisimai::Fact class.
   module Rhost
     class << self
       RhostClass = {
-          'Cox'       => ['cox.net'],
-          'FrancePTT' => ['.laposte.net', '.orange.fr', '.wanadoo.fr'],
-          'GoDaddy'   => ['smtp.secureserver.net', 'mailstore1.secureserver.net'],
-          'Google'    => ['aspmx.l.google.com', 'gmail-smtp-in.l.google.com'],
-          'IUA'       => ['.email.ua'],
-          'KDDI'      => ['.ezweb.ne.jp', 'msmx.au.com'],
-          'Microsoft' => ['.prod.outlook.com', '.protection.outlook.com'],
-          'Mimecast'  => ['.mimecast.com'],
-          'NTTDOCOMO' => ['mfsmax.docomo.ne.jp'],
-          'Spectrum'  => ['charter.net'],
-          'Tencent'   => ['.qq.com'],
+        "Aol"         => [".mail.aol.com", ".mx.aol.com"],
+        "Apple"       => [".mail.icloud.com", ".apple.com", ".me.com"],
+        "Cox"         => ["cox.net"],
+        "Facebook"    => [".facebook.com"],
+        "FrancePTT"   => [".laposte.net", ".orange.fr", ".wanadoo.fr"],
+        "GoDaddy"     => ["smtp.secureserver.net", "mailstore1.secureserver.net"],
+        "Google"      => ["aspmx.l.google.com", "gmail-smtp-in.l.google.com"],
+        "GSuite"      => ["googlemail.com"],
+        "IUA"         => [".email.ua"],
+        "KDDI"        => [".ezweb.ne.jp", "msmx.au.com"],
+        "MessageLabs" => [".messagelabs.com"],
+        "Microsoft"   => [".prod.outlook.com", ".protection.outlook.com", ".onmicrosoft.com", ".exchangelabs.com"],
+        "Mimecast"    => [".mimecast.com"],
+        "NTTDOCOMO"   => ["mfsmax.docomo.ne.jp"],
+        "Outlook"     => [".hotmail.com"],
+        "Spectrum"    => ["charter.net"],
+        "Tencent"     => [".qq.com"],
+        "YahooInc"    => [".yahoodns.net"],
       }.freeze
 
-      # The value of "rhost" is listed in RhostClass or not
-      # @param    [String] argvs  Remote host name
-      # @return   [True,False]    True: matched
-      #                           False: did not match
-      def match(rhost)
-        return false if rhost.empty?
+      # Returns the rhost class name
+      # @param    [Hash]   argvs  Decoded email data
+      # @return   [String]        rhost class name
+      def name(argvs)
+        return "" if argvs.nil?
 
-        host0 = rhost.downcase
-        match = false
-        RhostClass.each_key do |e|
-          # Try to match with each key of RhostClass
-          next unless RhostClass[e].any? { |a| host0.end_with?(a) }
-          match = true
-          break
+        rhostclass = ""
+        clienthost = argvs["lhost"].downcase
+        remotehost = argvs["rhost"].downcase
+        domainpart = argvs["destination"].downcase
+
+        catch :FINDRHOST do
+          # Try to match the hostname patterns with the following order:
+          # 1. destination: The domain part of the recipient address
+          # 2. rhost: remote hostname
+          # 3. lhost: local MTA hostname
+          RhostClass.each_key do |e|
+            # Try to match the domain part of the recipient address with each value of RhostClass
+            next unless RhostClass[e].any? { |a| a.end_with?(domainpart) }
+            rhostclass = e
+            throw :FINDRHOST
+          end
+
+          RhostClass.each_key do |e|
+            # Try to match the remote host with each value of RhostClass
+            next unless RhostClass[e].any? { |a| remotehost.end_with?(a) }
+            rhostclass = e
+            throw :FINDRHOST
+          end
+
+          # Neither the remote host nor the destination did not matched with any value of RhostClass
+          RhostClass.each_key do |e|
+            # Try to match the client host with each value of RhostClass
+            next unless RhostClass[e].any? { |a| clienthost.end_with?(a) }
+            rhostclass = e
+            throw :FINDRHOST
+          end
         end
-        return match
+        return rhostclass
       end
 
       # Detect the bounce reason from certain remote hosts
-      # @param    [Hash]   argvs  Parsed email data
-      # @param    [String] proxy  The alternative of the "rhost"
+      # @param    [Hash]   argvs  Decoded email data
       # @return   [String]        The value of bounce reason
-      def get(argvs, proxy = nil)
-        remotehost = proxy || argvs['rhost'].downcase
-        rhostclass = ''
-        modulename = ''
+      def find(argvs)
+        return "" if argvs.nil?
 
-        RhostClass.each_key do |e|
-          # Try to match with each key of RhostClass
-          next unless RhostClass[e].any? { |a| remotehost.end_with?(a) }
-          modulename = 'Sisimai::Rhost::' << e
-          rhostclass = 'sisimai/rhost/' << e.downcase
-          break
-        end
-        return nil if rhostclass.empty?
+        rhostclass = name(argvs); return "" if rhostclass.empty?
+        modulepath = "sisimai/rhost/"   << rhostclass.downcase; require modulepath
+        modulename = "Sisimai::Rhost::" << rhostclass
 
-        require rhostclass
-        reasontext = Module.const_get(modulename).get(argvs)
+        #rhostclass = "sisimai/rhost/" << modulename.downcase.split("::")[2]; require rhostclass
+        reasontext = Module.const_get(modulename).find(argvs)
+        return "" if reasontext.empty?
         return reasontext
       end
     end

data/lib/sisimai/smtp/command.rb

@@ -3,9 +3,14 @@ module Sisimai
     # Sisimai::SMTP::Transcript is an SMTP Command related utilities
     module Command
       class << self
+        Availables = [
+          "HELO", "EHLO", "MAIL", "RCPT", "DATA", "QUIT", "RSET", "NOOP", "VRFY", "ETRN", "EXPN",
+          "HELP", "AUTH", "STARTTLS", "XFORWARD",
+          "CONN", # CONN is a pseudo SMTP command used only in Sisimai
+        ].freeze
         Detectable = [
-          'HELO', 'EHLO', 'STARTTLS', 'AUTH PLAIN', 'AUTH LOGIN', 'AUTH CRAM-', 'AUTH DIGEST-',
-          'MAIL F', 'RCPT', 'RCPT T', 'DATA', 'QUIT', 'XFORWARD',
+          "HELO", "EHLO", "STARTTLS", "AUTH PLAIN", "AUTH LOGIN", "AUTH CRAM-", "AUTH DIGEST-",
+          "MAIL F", "RCPT", "RCPT T", "DATA", "QUIT", "XFORWARD",
         ].freeze
 
         # Check that an SMTP command in the argument is valid or not
@@ -13,43 +18,48 @@ module Sisimai
         # @return   [Boolean]       0: Is not a valid SMTP command, 1: Is a valid SMTP command
         # @since v5.0.0
         def test(argv0 = '')
-          return nil  if argv0.empty?
-          return nil  if argv0.size < 4
-
-          comm0 = %w[HELO EHLO MAIL RCPT DATA QUIT RSET NOOP VRFY ETRN EXPN HELP]
-          comm1 = %w[AUTH STARTTLS XFORWARD]
-          return true if comm0.any? { |a| argv0.include?(a) }
-          return true if comm1.any? { |a| argv0.include?(a) }
-          return true if argv0.include?('CONN') # CONN is a pseudo SMTP command used only in Sisimai
+          return false if argv0.nil? || argv0.empty? || argv0.size < 4
+          return true  if Availables.any? { |a| argv0.include?(a) }
           return false
         end
 
         # Pick an SMTP command from the given string
         # @param    [String] argv0  A transcript text MTA returned
         # @return   [String]        An SMTP command
-        # @return   [undef]         Failed to find an SMTP command or the 1st argument is missing
         # @since v5.0.0
         def find(argv0 = '')
-          return nil unless Sisimai::SMTP::Command.test(argv0)
+          return "" unless Sisimai::SMTP::Command.test(argv0)
 
-          stringsize = argv0.size
-          commandmap = { 'STAR' => 'STARTTLS', 'XFOR' => 'XFORWARD' }
+          issuedcode = " " + argv0.downcase + " "
+          commandmap = { "STAR" => "STARTTLS", "XFOR" => "XFORWARD" }
           commandset = []
-          previouspp = 0
 
           Detectable.each do |e|
             # Find an SMTP command from the given string
-            p0 = argv0.index(e, previouspp)
-            next unless p0
-            next if p0 + 4 > stringsize
-            previouspp = p0
+            p0 = argv0.index(e); next unless p0
+            if e.include?(" ") == false
+              # For example, "RCPT T" does not appear in an email address or a domain name
+              cx = true; while true do
+                # Exclude an SMTP command in the part of an email address, a domain name, such as
+                # DATABASE@EXAMPLE.JP, EMAIL.EXAMPLE.COM, and so on.
+                ca = issuedcode[p0, 1].ord
+                cz = issuedcode[p0 + e.size + 1, 1].ord
+
+                break if ca > 47 && ca <  58 || cz > 47 && cz <  58;  # 0-9
+                break if ca > 63 && ca <  91 || cz > 63 && cz <  91;  # @-Z
+                break if ca > 96 && ca < 123 || cz > 96 && cz < 123;  # `-z
+                cx = false; break
+              end
+              next if cx == true
+            end
 
-            cv = argv0[p0, 4]; next if commandset.include?(cv)
+            # There is the same command in the "commanset" or nor
+            cv = e[0, 4]; next if commandset.any? { |a| cv.start_with?(a) }
             cv = commandmap[cv] if commandmap.has_key?(cv)
             commandset << cv
           end
 
-          return nil if commandset.empty?
+          return "" if commandset.empty?
           return commandset.pop
         end
       end