sisimai 5.1.0-java → 5.2.0-java

data/lib/sisimai/rhost/microsoft.rb

@@ -1,7 +1,7 @@
 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 *.protection.outlook.com. This class
+    # of find() method when the value of "rhost" of the object is *.protection.outlook.com. This class
     # is called only Sisimai::Fact class.
     #
     # https://technet.microsoft.com/en-us/library/bb232118
@@ -16,43 +16,10 @@ module Sisimai
             # - The sending message sent over IPv6 must pass either SPF or DKIM.
             ['4.7.26', 0, 0, 'must pass either spf or dkim validation, this message is not signed'],
 
-            # - Records are DNSSEC authentic, but one or multiple of these scenarios occurred:
-            #   - The destination mail server's certificate doesn't match with what is expected per
-            #     the authentic TLSA record.
-            #   - Authentic TLSA record is misconfigured.
-            #   - Destination domain is being attacked.
-            #   - Any other DANE failure.
-            # - This message usually indicates an issue on the destination email server. Check the
-            #   validity of recipient address and determine if the destination server is configured
-            #   correctly to receive messages. 
-            # - For more information about DANE, see: https://datatracker.ietf.org/doc/html/rfc7671
-            ['4.7.323', 0, 0, 'tlsa-invalid: The domain failed dane validation'],
-            ['5.7.323', 0, 0, 'tlsa-invalid: The domain failed dane validation'],
-
-            # - The destination domain indicated it was DNSSEC-authentic, but Exchange Online was 
-            #   not able to verify it as DNSSEC-authentic.
-            ['4.7.324', 0, 0, 'dnssec-invalid: destination domain returned invalid dnssec records'],
-            ['5.7.324', 0, 0, 'dnssec-invalid: destination domain returned invalid dnssec records'],
-
-            # - This happens when the presented certificate identities (CN and SAN) of a destina-
-            #   tion SMTP target host don't match any of the domains or MX host.
-            # - This message usually indicates an issue on the destination email server. Check the
-            #   validity of recipient address and determine if the destination server is configured
-            #   correctly to receive messages. For more information, see How SMTP DNS-based Authen-
-            #   tication of Named Entities (DANE) works to secure email communications.
-            ['4.7.325', 0, 0, 'certificate-host-mismatch: remote certificate must have a common name or subject alternative name matching the hostname (dane)'],
-            ['5.7.325', 0, 0, 'certificate-host-mismatch: remote certificate must have a common name or subject alternative name matching the hostname (dane)'],
-
             # - The destination email system uses SPF to validate inbound mail, and there's a prob-
             #   lem with your SPF configuration.
             ['5.7.23', 0, 0, 'the message was rejected because of sender policy framework violation'],
 
-            # - DNSSEC checks have passed, yet upon establishing the connection the destination
-            #   mail server provides a certificate that is expired.
-            # - A valid X.509 certificate that isn't expired must be presented. X.509 certificates
-            #   must be renewed after their expiration, commonly annually.
-            ['5.7.322', 0, 0, "certificate-expired: destination mail server's certificate is expired"],
-
             # - Access denied, sending domain [$SenderDomain] does not pass DMARC verification
             # - The sender's domain in the 5322.From address doesn't pass DMARC.
             ['5.7.509', 0, 0, 'does not pass dmarc verification'],
@@ -136,7 +103,6 @@ module Sisimai
 
             # Previous versions of Exchange Server ------------------------------------------------
             ['5.5.4',  0, 0, 'invalid domain name'],
-            ['5.7.51', 0, 0, 'restrictdomainstoipaddresses or restrictdomainstocertificate'],
 
             # Undocumented error messages ---------------------------------------------------------
             # - 550 5.7.1 Unfortunately, messages from [10.0.2.5] weren't sent. Please contact your
@@ -216,6 +182,53 @@ module Sisimai
             #   couldn't be delivered to the original sender.
             ['5.4.300', 0, 0, 'message expired'],
           ],
+          'failedstarttls' => [
+            # Exchange Online ---------------------------------------------------------------------
+            # - DNSSEC checks have passed, yet upon connection, destination mail server doesn't re-
+            #   spond to the STARTTLS command. The destination server responds to the STARTTLS com-
+            #   mand, but the TLS handshake fails.
+            # - This message usually indicates an issue on the destination email server. Check the
+            #   validity of the recipient address. Determine if the destination server is configur-
+            #   ed correctly to receive the messages.
+            ['4.4.317', 0, 0, 'starttls is required to send mail'],
+            ['5.4.317', 0, 0, 'starttls is required to send mail'],
+
+            # - DNSSEC checks have passed, yet upon establishing the connection the destination
+            #   mail server provides a certificate that is expired.
+            # - A valid X.509 certificate that isn't expired must be presented. X.509 certificates
+            #   must be renewed after their expiration, commonly annually.
+            ['5.7.51',  0, 0, 'restrictdomainstoipaddresses or restrictdomainstocertificate'],
+            ['4.7.321', 0, 0, 'starttls-not-supported: destination mail server must support tls to receive mail'],
+            ['5.7.321', 0, 0, 'starttls-not-supported: destination mail server must support tls to receive mail'],
+            ['5.7.322', 0, 0, "certificate-expired: destination mail server's certificate is expired"],
+
+            # - Records are DNSSEC authentic, but one or multiple of these scenarios occurred:
+            #   - The destination mail server's certificate doesn't match with what is expected per
+            #     the authentic TLSA record.
+            #   - Authentic TLSA record is misconfigured.
+            #   - Destination domain is being attacked.
+            #   - Any other DANE failure.
+            # - This message usually indicates an issue on the destination email server. Check the
+            #   validity of recipient address and determine if the destination server is configured
+            #   correctly to receive messages. 
+            # - For more information about DANE, see: https://datatracker.ietf.org/doc/html/rfc7671
+            ['4.7.323', 0, 0, 'tlsa-invalid: The domain failed dane validation'],
+            ['5.7.323', 0, 0, 'tlsa-invalid: The domain failed dane validation'],
+
+            # - The destination domain indicated it was DNSSEC-authentic, but Exchange Online was 
+            #   not able to verify it as DNSSEC-authentic.
+            ['4.7.324', 0, 0, 'dnssec-invalid: destination domain returned invalid dnssec records'],
+            ['5.7.324', 0, 0, 'dnssec-invalid: destination domain returned invalid dnssec records'],
+
+            # - This happens when the presented certificate identities (CN and SAN) of a destina-
+            #   tion SMTP target host don't match any of the domains or MX host.
+            # - This message usually indicates an issue on the destination email server. Check the
+            #   validity of recipient address and determine if the destination server is configured
+            #   correctly to receive messages. For more information, see How SMTP DNS-based Authen-
+            #   tication of Named Entities (DANE) works to secure email communications.
+            ['4.7.325', 0, 0, 'certificate-host-mismatch: remote certificate must have a common name or subject alternative name matching the hostname (dane)'],
+            ['5.7.325', 0, 0, 'certificate-host-mismatch: remote certificate must have a common name or subject alternative name matching the hostname (dane)'],
+          ],
           'mailboxfull' => [
             # Exchange Server 2019 ----------------------------------------------------------------
             # - The recipient's mailbox has exceeded its storage quota and is no longer able to ac-
@@ -328,6 +341,7 @@ module Sisimai
           ],
           'notaccept' => [
             ['4.3.2', 0, 0, 'system not accepting network messages'],
+            ['4.4.4', 0, 0, 'hosted tenant which has no mail-enabled subscriptions'],
 
             # Exchange Server 2019 ----------------------------------------------------------------
             # - You're using the ABP Routing agent, and the recipient isn't a member of the global
@@ -448,19 +462,6 @@ module Sisimai
             ['5.7.3', 0, 0, 'cannot achieve exchange server authentication'],
             ['5.7.3', 0, 0, 'not authorized'],
 
-            # Exchange Online ---------------------------------------------------------------------
-            # - DNSSEC checks have passed, yet upon connection, destination mail server doesn't re-
-            #   spond to the STARTTLS command. The destination server responds to the STARTTLS com-
-            #   mand, but the TLS handshake fails.
-            # - This message usually indicates an issue on the destination email server. Check the
-            #   validity of the recipient address. Determine if the destination server is configur-
-            #   ed correctly to receive the messages.
-            ['4.4.317', 0, 0, 'starttls is required to send mail'],
-            ['5.4.317', 0, 0, 'starttls is required to send mail'],
-
-            ['4.7.321', 0, 0, 'starttls-not-supported: destination mail server must support tls to receive mail'],
-            ['5.7.321', 0, 0, 'starttls-not-supported: destination mail server must support tls to receive mail'],
-
             # - The sending email system didn't authenticate with the receiving email system. The
             #   receiving email system requires authentication before message submission.
             # - This error occurs when the receiving server must be authenticated before message
@@ -644,6 +645,12 @@ module Sisimai
             #   envelope recipients into smaller chunks (chunking) and resend the message.
             ['4.5.3', 0, 0, 'too many recipients'],
 
+            # - 451 4.7.652 The mail server [192.0.2.251] has exceeded the maximum number of
+            #   connections. (S3115) [Name=Protocol Filter Agent][AGT=PFA][MxId=11BA9B3FA168ABBF]
+            #   [BN3PEPF0000B370.namprd21.prod.outlook.com 2025-02-20T14:30:32.425Z 08DD4D9FD5AFF45C]
+            #   (in reply to MAIL FROM command))
+            ["4.7.652", 0, 0, "has exceeded the maximum number of connections"],
+
             # Previous versions of Exchange Server ------------------------------------------------
             ['5.2.122', 0, 0, 'the recipient has exceeded their limit for'],
           ],
@@ -714,7 +721,7 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for Exchange Online
         # @since v4.17.2
-        def get(argvs)
+        def find(argvs)
           return '' if argvs['deliverystatus'].empty?
           return '' unless Sisimai::SMTP::Status.test(argvs['deliverystatus'])
 

data/lib/sisimai/rhost/mimecast.rb

@@ -1,7 +1,7 @@
 module Sisimai
   module Rhost
     # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argu-
-    # ment of get() method when the value of "rhost" of the object is "*.mimecast.com". This class
+    # ment of find() method when the value of "rhost" of the object is "*.mimecast.com". This class
     # is called only Sisimai::Fact class.
     module Mimecast
       class << self
@@ -76,6 +76,32 @@ module Sisimai
             #   Discontinue journaling old messages past the expiry threshold.
             [550, 'Journal messages past the expiration'],
           ],
+          'failedstarttls' => [
+            # - This email has been sent using SMTP, but TLS is required by policy.
+            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS.
+            #   Alternatively, ensure the certificates on the mail server haven't expired. If using
+            #   a proxy server, ensure it isn't intercepting the traffic and modifying encryption
+            #   parameters.
+            [553, 'this route requires encryption (tls)'],
+
+            # - A TLS connection has been attempted using a TLS version that is lower than TLS 1.2.
+            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS.
+            #   Alternatively, ensure the mail server attempting to connect is using the appropri-
+            #   ate version of TLS.
+            [553, 'this route requires tls version 1.2 or greater'],
+
+            # - A secure connection was attempted using ciphers that do not meet the configured ci-
+            #   pher strength.
+            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS. Alter-
+            #   natively, ensure the certificates on the mail server haven't expired. If using a
+            #   proxy server, ensure it isn't intercepting the traffic and modifying encryption
+            #   parameters.
+            [553, 'this route requires high-strength ciphers'],
+
+            # - Validation on your umbrella account's domain name does not conform to your DNS.
+            # - Check you DNS has the required umbrella accounts listed as comma-separated values.
+            [554, 'configuration is invalid for this certificate'],
+          ],
           'mesgtoobig' => [
             # - The email size either exceeds an Email Size Limit policy or is larger than the
             #   Mimecast service limit. The default is 100 MB for the Legacy MTA, and 200 MB for
@@ -172,31 +198,6 @@ module Sisimai
             [535, 'incorrect authentication data'],
             [550, 'submitter failed to disabled'],
             [550, 'submitter failed to authenticate'],
-
-            # - This email has been sent using SMTP, but TLS is required by policy.
-            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS.
-            #   Alternatively, ensure the certificates on the mail server haven't expired. If using
-            #   a proxy server, ensure it isn't intercepting the traffic and modifying encryption
-            #   parameters.
-            [553, 'this route requires encryption (tls)'],
-
-            # - A TLS connection has been attempted using a TLS version that is lower than TLS 1.2.
-            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS.
-            #   Alternatively, ensure the mail server attempting to connect is using the appropri-
-            #   ate version of TLS.
-            [553, 'this route requires tls version 1.2 or greater'],
-
-            # - A secure connection was attempted using ciphers that do not meet the configured ci-
-            #   pher strength.
-            # - Delete or change the Secure Receipt or Secure Delivery policy enforcing TLS. Alter-
-            #   natively, ensure the certificates on the mail server haven't expired. If using a
-            #   proxy server, ensure it isn't intercepting the traffic and modifying encryption
-            #   parameters.
-            [553, 'this route requires high-strength ciphers'],
-
-            # - Validation on your umbrella account's domain name does not conform to your DNS.
-            # - Check you DNS has the required umbrella accounts listed as comma-separated values.
-            [554, 'configuration is invalid for this certificate'],
           ],
           'systemerror' => [
             # - The Mimecast server is under maximum load.
@@ -281,7 +282,8 @@ module Sisimai
         # Detect bounce reason from Mimecast
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for mimecast.com
-        def get(argvs)
+        def find(argvs)
+          return argvs['reason'] unless argvs['reason'].empty?
           return '' unless Sisimai::SMTP::Reply.test(argvs['replycode'])
 
           issuedcode = argvs['diagnosticcode'].downcase || ''

data/lib/sisimai/rhost/nttdocomo.rb

@@ -1,7 +1,7 @@
 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 "mfsmax.docomo.ne.jp". This class
+    # of find() method when the value of "rhost" of the object is "mfsmax.docomo.ne.jp". This class
     # is called only Sisimai::Fact class.
     module NTTDOCOMO
       class << self
@@ -14,9 +14,10 @@ module Sisimai
         # Detect bounce reason from NTT DOCOMO
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for docomo.ne.jp
-        def get(argvs)
+        def find(argvs)
+          return argvs['reason'] unless argvs['reason'].empty?
           statuscode = argvs['deliverystatus']          || ''
-          thecommand = argvs['smtpcommand']             || ''
+          thecommand = argvs['command']                 || ''
           esmtperror = argvs['diagnosticcode'].downcase || ''
           reasontext = ''
 

data/lib/sisimai/rhost/outlook.rb

@@ -0,0 +1,36 @@
+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 "rhost" of the object is "*.hotmail.com". This class is called
+    # only from Sisimai::Fact class.
+    module Outlook
+      class << self
+        MessagesOf = {
+          "hostunknown" => ["The mail could not be delivered to the recipient because the domain is not reachable"],
+          "userunknown" => ["Requested action not taken: mailbox unavailable"],
+        }.freeze
+
+        # Detect bounce reason from Microsoft Outlook.com: https://www.outlook.com/
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for Outlook
+        # @since v5.2.0
+        def find(argvs)
+          return "" if argvs["diagnosticcode"].empty?
+          issuedcode = argvs["diagnosticcode"]
+          reasontext = ""
+
+          MessagesOf.each_key do |e|
+            # Try to match the error message with message patterns defined in $MessagesOf
+            next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+            reasontext = e
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/spectrum.rb

@@ -1,7 +1,7 @@
 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
@@ -100,7 +100,8 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String, Nil]           The bounce reason at Spectrum
         # @since v4.25.8
-        def get(argvs)
+        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

data/lib/sisimai/rhost/tencent.rb

@@ -1,7 +1,7 @@
 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
@@ -49,7 +49,8 @@ module Sisimai
         # Detect bounce reason from Tencent QQ
         # @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?
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 

data/lib/sisimai/rhost/yahooinc.rb

@@ -1,7 +1,7 @@
 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 "*.yahoodns.net".
+    # 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
@@ -23,7 +23,7 @@ module Sisimai
             # - 550 relaying denied for <***@yahoo.com>
             'relaying denied for ',
           ],
-          'notcomplaintrfc' => ['headers are not rfc compliant'],
+          '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
@@ -87,7 +87,8 @@ module Sisimai
         #           https://smtpfieldmanual.com/provider/yahoo
         #           https://www.postmastery.com/yahoo-postmaster/
         # @since v5.1.0
-        def get(argvs)
+        def find(argvs)
+          return argvs['reason'] unless argvs['reason'].empty?
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 

data/lib/sisimai/rhost.rb

@@ -1,54 +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 = {
-        'Apple'     => ['.mail.icloud.com', '.apple.com', '.me.com'],
-        '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'],
-        'YahooInc'  => ['.yahoodns.net'],
+        "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
 
+      # Returns the rhost class name
+      # @param    [Hash]   argvs  Decoded email data
+      # @return   [String]        rhost class name
+      def name(argvs)
+        return "" if argvs.nil?
+
+        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 rhostclass
+      end
+
       # Detect the bounce reason from certain remote hosts
       # @param    [Hash]   argvs  Decoded email data
       # @return   [String]        The value of bounce reason
-      def get(argvs)
-        return nil if argvs['diagnosticcode'].empty?
-
-        remotehost = argvs['rhost'].downcase
-        domainpart = argvs['destination'].downcase
-        return nil if (remotehost + domainpart).empty?
-
-        rhostmatch = nil
-        rhostclass = ''
-        modulename = ''
-
-        RhostClass.each_key do |e|
-          # Try to match with each value of RhostClass
-          rhostmatch   = true if RhostClass[e].any? { |a| remotehost.end_with?(a) }
-          rhostmatch ||= true if RhostClass[e].any? { |a| domainpart.end_with?(a) }
-          next unless rhostmatch
-
-          modulename = 'Sisimai::Rhost::' << e
-          rhostclass = 'sisimai/rhost/' << e.downcase
-          break
-        end
-        return nil if rhostclass.empty?
+      def find(argvs)
+        return "" if argvs.nil?
+
+        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)
-        return nil if reasontext.empty?
+        #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