sisimai 5.1.0 → 5.2.0

data/lib/sisimai/lhost/messagingserver.rb

@@ -60,20 +60,21 @@ module Sisimai::Lhost
           #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
           v = dscontents[-1]
 
-          if e.start_with?('  Recipient address: ') && e.index('@') > 1
-            #   Recipient address: kijitora@example.jp
-            if v['recipient']
+          if Sisimai::String.aligned(e, ['  Recipient address: ', '@', '.']) ||
+             Sisimai::String.aligned(e, ['  Original address: ',  '@', '.'])
+            #   Recipient address: @smtp.example.net:kijitora@server
+            #   Original address: kijitora@example.jp
+            cv = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
+            next unless Sisimai::Address.is_emailaddress(cv)
+
+            if v["recipient"] != "" && cv != v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
+            v['recipient'] = cv
             recipients += 1
 
-          elsif e.start_with?('  Original address: ') && e.index('@') > 1
-            #   Original address: kijitora@example.jp
-            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
-
           elsif e.start_with?('  Date: ')
             #   Date: Fri, 21 Nov 2014 23:34:45 +0900
             v['date'] = e[e.index(':') + 2, e.size]
@@ -120,18 +121,18 @@ module Sisimai::Lhost
               # Status: 5.1.1 (Remote SMTP server has rejected address)
               p1 = e.index(':')
               p2 = e.index('(')
-              v['status']      = e[p1 + 2, p2 - p1 - 3]
-              v['diagnosis'] ||= e[p2 + 1, e[e.index(')') - p2 - 1]]
+              v['status']    = e[p1 + 2, p2 - p1 - 3]
+              v['diagnosis'] = e[p2 + 1, e[e.index(')') - p2 - 1]] if v["diagnosis"].empty?
 
             elsif e.start_with?('Arrival-Date: ')
               # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-              v['date'] ||= e[e.index(':') + 2, e.size]
+              v['date'] = e[e.index(':') + 2, e.size] if v["date"].empty?
 
             elsif e.start_with?('Reporting-MTA: ')
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
               localhost = e[e.index(';') + 1, e.size]
-              v['lhost'] ||= localhost
-              v['lhost']   = localhost unless v['lhost'].index('.') > 0
+              v['lhost'] = localhost if v["lhost"].empty?
+              v['lhost'] = localhost unless v['lhost'].index('.') > 0
             end
           end
         end

data/lib/sisimai/lhost/mfilter.rb

@@ -62,7 +62,7 @@ module Sisimai::Lhost
           if e.include?('@') && e.include?(' ') == false
             # 以下のメールアドレスへの送信に失敗しました。
             # kijitora@example.jp
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -75,6 +75,7 @@ module Sisimai::Lhost
             # DATA
             next if v['command']
             v['command'] = e if markingset['command']
+
           else
             # Get error message and SMTP command
             if e == StartingOf[:error][0]
@@ -87,7 +88,7 @@ module Sisimai::Lhost
             else
               # 550 5.1.1 unknown user <kijitora@example.jp>
               next if e.start_with?('-')
-              next if v['diagnosis']
+              next if v['diagnosis'] != ""
               v['diagnosis'] = e
             end
           end
@@ -103,7 +104,7 @@ module Sisimai::Lhost
           rheads = mhead['received']
           rhosts = Sisimai::RFC5322.received(rheads[-1])
 
-          e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
+          e['lhost'] = Sisimai::RFC5322.received(rheads[0]).shift if e["lhost"].empty?
           [rhosts[0], rhosts[1]].each do |ee|
             # Avoid "... by m-FILTER"
             next unless ee.include?('.')

data/lib/sisimai/lhost/notes.rb

@@ -58,12 +58,12 @@ module Sisimai::Lhost
           v = dscontents[-1]
           if e.include?('@') && e.index(' ').nil?
             # kijitora@notes.example.jp
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] ||= e
+            v["recipient"] = e if v["recipient"].empty?
             recipients += 1
           else
             next if e.empty?
@@ -83,11 +83,9 @@ module Sisimai::Lhost
                 # No character set in Content-Type header
                 encodedmsg = removedmsg
               end
-              v['diagnosis'] ||= ''
               v['diagnosis'] << encodedmsg
             else
               # Error message does not include multi-byte character
-              v['diagnosis'] ||= ''
               v['diagnosis'] << e
             end
           end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -106,9 +106,9 @@ module Sisimai::Lhost
           #    Below is a copy of the original message:
           v = dscontents[-1]
 
-          if e.include?('@') && Sisimai::String.aligned(e, ['@', ' '])
+          if Sisimai::String.aligned(e, ['@', ' '])
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/postfix.rb

@@ -4,6 +4,8 @@ module Sisimai::Lhost
   module Postfix
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/rfc1123'
+      require 'sisimai/smtp/reply'
       require 'sisimai/smtp/command'
 
       # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
@@ -26,19 +28,17 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        match = nil
-        sessx = nil
+        match = 0
 
         if mhead['subject'].include?('SMTP server: errors from ')
           # src/smtpd/smtpd_chat.c:|337: post_mail_fprintf(notice, "Subject: %s SMTP server: errors from %s",
           # src/smtpd/smtpd_chat.c:|338:   var_mail_name, state->namaddr);
-          match = true
-          sessx = true
+          match = 2
         else
           # Subject: Undelivered Mail Returned to Sender
-          match = true if mhead['subject'] == 'Undelivered Mail Returned to Sender'
+          match = 1 if mhead['subject'] == 'Undelivered Mail Returned to Sender'
         end
-        return nil unless match
+        return nil if match == 0
         return nil if mhead['x-aol-ip']
 
         permessage = {}     # (Hash) Store values of each Per-Message field
@@ -52,7 +52,7 @@ module Sisimai::Lhost
         anotherset = {}     # Another error information
         v = nil
 
-        if sessx
+        if match == 2
           # The message body starts with 'Transcript of session follows.'
           require 'sisimai/smtp/transcript'
           transcript = Sisimai::SMTP::Transcript.rise(emailparts[0], 'In:', 'Out:')
@@ -75,7 +75,7 @@ module Sisimai::Lhost
 
             elsif e['command'] == 'RCPT'
               # RCPT TO: <...>
-              if v['recipient']
+              if v["recipient"] != ""
                 # There are multiple recipient addresses in the transcript of session
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
@@ -86,9 +86,9 @@ module Sisimai::Lhost
 
             next if p['reply'].to_i < 400
             commandset << e['command']
-            v['diagnosis'] ||= p['text'].join(' ')
-            v['replycode'] ||= p['reply']
-            v['status']    ||= p['status']
+            v['diagnosis'] = p['text'].join(' ') if v["diagnosis"].empty?
+            v['replycode'] = p['reply'] if v["replycode"].empty?
+            v['status']    = p['status'] if v["status"].empty?
           end
         else
           fieldtable = Sisimai::RFC1894.FIELDTABLE
@@ -107,17 +107,18 @@ module Sisimai::Lhost
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if f = Sisimai::RFC1894.match(e)
+            f = Sisimai::RFC1894.match(e)
+            if f > 0
               # "e" matched with any field defined in RFC3464
               next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if o[-1] == 'addr'
+              if o[3] == 'addr'
                 # Final-Recipient: rfc822; kijitora@example.jp
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 if o[0] == 'final-recipient'
                   # Final-Recipient: rfc822; kijitora@example.jp
-                  if v['recipient']
+                  if v["recipient"] != ""
                     # There are multiple recipient addresses in the message body.
                     dscontents << Sisimai::Lhost.DELIVERYSTATUS
                     v = dscontents[-1]
@@ -128,17 +129,18 @@ module Sisimai::Lhost
                   # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                   v['alias'] = o[2]
                 end
-              elsif o[-1] == 'code'
+              elsif o[3] == 'code'
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = o[1]
-                v['spec'] = 'SMTP' if v['spec'] == 'X-POSTFIX'
+                v['spec'] = 'SMTP' if v['spec'].upcase == 'X-POSTFIX'
                 v['diagnosis'] = o[2]
               else
                 # Other DSN fields defined in RFC3464
                 next unless fieldtable[o[0]]
+                next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f
+                next unless f == 1
                 permessage[fieldtable[o[0]]] = o[2]
               end
             else
@@ -162,7 +164,7 @@ module Sisimai::Lhost
                 # Alternative error message and recipient
                 if e.include?(' (in reply to ') || e.include?('command)')
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                  q = Sisimai::SMTP::Command.find(e); commandset << q if q
+                  cv = Sisimai::SMTP::Command.find(e) || ""; commandset << cv unless cv.empty?
                   anotherset['diagnosis'] ||= ''
                   anotherset['diagnosis'] << ' ' << e
 
@@ -205,7 +207,7 @@ module Sisimai::Lhost
 
         end
 
-        unless recipients > 0
+        if recipients == 0
           # Fallback: get a recipient address from error messages
           if anotherset['recipient'].to_s.size > 0
             # Set a recipient address
@@ -241,13 +243,9 @@ module Sisimai::Lhost
               # More detailed error message is in "anotherset"
               as = '' # status
               ar = '' # replycode
-
-              e['status']    ||= ''
-              e['replycode'] ||= ''
-
               if e['status'].empty? || e['status'].start_with?('4.0.0', '5.0.0')
                 # Check the value of D.S.N. in anotherset
-                as = Sisimai::SMTP::Status.find(anotherset['diagnosis']) || ''
+                as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
                 if as.size > 0 && as[-4, 4] != '.0.0'
                   # The D.S.N. is neither an empty nor *.0.0
                   e['status'] = as
@@ -256,7 +254,7 @@ module Sisimai::Lhost
 
               if e['replycode'].empty? || e['replycode'].end_with?('00')
                 # Check the value of SMTP reply code in $anotherset
-                ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis']) || ''
+                ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
                 if ar.size > 0 && ar.end_with?('00') == false
                   # The SMTP reply code is neither an empty nor *00
                   e['replycode'] = ar
@@ -278,8 +276,8 @@ module Sisimai::Lhost
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
-          e['command'] ||= 'HELO' if e['diagnosis'].include?('refused to talk to me:')
-          e['spec']    ||= 'SMTP' if Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
+          e['command']   = 'HELO' if e["command"].empty? && e['diagnosis'].include?('refused to talk to me:')
+          e['spec']      = 'SMTP' if e["spec"].empty?    && Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/qmail.rb

@@ -5,9 +5,23 @@ module Sisimai::Lhost
   module Qmail
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/string'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['--- Below this line is a copy of the message.'].freeze
+      Boundaries = [
+        # qmail-send.c:qmail_puts(&qqt,*sender.s ? "--- Below this line is a copy of the message.\n\n" :...
+        "--- Below this line is a copy of the message.",     # qmail-1.03
+        "--- Below this line is a copy of the mail header.",
+        "--- Below the next line is a copy of the message.", # The followings are the qmail clone
+        "--- Mensaje original adjunto.",
+        "Content-Type: message/rfc822",
+        "Original message follows.",
+      ].freeze
+      RelayedVia = [["(qmail ", "invoked for bounce)"], ["(qmail ", "invoked from ", "network)"]].freeze
+      EmailTitle = [
+        "failure notice", # qmail-send.c:Subject: failure notice\n\
+        "Failure Notice", # Yahoo
+      ].freeze
       StartingOf = {
         #  qmail-remote.c:248|    if (code >= 500) {
         #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
@@ -16,78 +30,97 @@ module Sisimai::Lhost
         #
         # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
         #  K = success, Z = temporary error, D = permanent error
-        error:   ['Remote host said:'],
-        message: ['Hi. This is the qmail'],
-        rhost:   ['Giving up on ', 'Connected to ', 'remote host '],
+        "error"   => ["Remote host said:"],
+        "message" => [
+          "Hi. This is the qmail", # qmail-send.c:Hi. This is the qmail-send program at ");
+          "He/Her is not ",        # The followings are the qmail clone
+          "unable to deliver your message to the following addresses",
+          "Su mensaje no pudo ser entregado",
+          "Sorry, we were unable to deliver your message to the following address",
+          "This is the machine generated message from mail service",
+          "This is the mail delivery agent at",
+          "Unable to deliver message to the following address",
+          "unable to deliver your message to the following addresses",
+          "Unfortunately, your mail was not delivered to the following address:",
+          "Your mail message to the following address",
+          "Your message to the following addresses",
+          "We're sorry.",
+        ],
+        "rhost"   => ['Giving up on ', 'Connected to ', 'remote host '],
       }.freeze
       CommandSet = {
-        # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => [' but greeting failed.'],
+        "CONN" => [" but greeting failed."],
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => [' but my name was rejected.'],
+        "EHLO" => [" but my name was rejected."],
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => [' but sender was rejected.'],
+        "MAIL" => [" but sender was rejected."],
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => [' does not like recipient.'],
+        "RCPT" => [" does not like recipient."],
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-        'data' => [' failed on DATA command', ' failed after I sent the message'],
+        "DATA" => [" failed on DATA command", " failed after I sent the message"],
       }.freeze
 
       # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-      HasExpired = 'this message has been in the queue too long.'
-      OnHoldPair = [' does not like recipient.', 'this message has been in the queue too long.'].freeze
+      # qmail-remote-fallback.patch
+      HasExpired = "this message has been in the queue too long.".freeze
+      OnHoldPair = [" does not like recipient.", "this message has been in the queue too long."].freeze
       FailOnLDAP = {
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        'suspend'     => ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
-        'userunknown' => ['Sorry, no mailbox here by that name'],           # 5.1.1
-        'exceedlimit' => ['The message exeeded the maximum size the user accepts'], # 5.2.3
-        'systemerror' => [
-            'Automatic homedir creator crashed',                # 4.3.0
-            'Illegal value in LDAP attribute',                  # 5.3.5
-            'LDAP attribute is not given but mandatory',        # 5.3.5
-            'Timeout while performing search on LDAP server',   # 4.4.3
-            'Too many results returned but needs to be unique', # 5.3.5
-            'Permanent error while executing qmail-forward',    # 5.4.4
-            'Temporary error in automatic homedir creation',    # 4.3.0 or 5.3.0
-            'Temporary error while executing qmail-forward',    # 4.4.4
-            'Temporary failure in LDAP lookup',                 # 4.4.3
-            'Unable to contact LDAP server',                    # 4.4.3
-            'Unable to login into LDAP server, bad credentials',# 4.4.3
+        "exceedlimit" => ["The message exeeded the maximum size the user accepts"], # 5.2.3
+        "userunknown" => ["Sorry, no mailbox here by that name"],           # 5.1.1
+        "suspend"     => [ # 5.2.1
+          "Mailaddress is administrativly disabled",
+          "Mailaddress is administrativley disabled",
+          "Mailaddress is administratively disabled",
+          "Mailaddress is administrativeley disabled",
+        ],
+        "systemerror" => [
+          "Automatic homedir creator crashed",                # 4.3.0
+          "Illegal value in LDAP attribute",                  # 5.3.5
+          "LDAP attribute is not given but mandatory",        # 5.3.5
+          "Timeout while performing search on LDAP server",   # 4.4.3
+          "Too many results returned but needs to be unique", # 5.3.5
+          "Permanent error while executing qmail-forward",    # 5.4.4
+          "Temporary error in automatic homedir creation",    # 4.3.0 or 5.3.0
+          "Temporary error while executing qmail-forward",    # 4.4.4
+          "Temporary failure in LDAP lookup",                 # 4.4.3
+          "Unable to contact LDAP server",                    # 4.4.3
+          "Unable to login into LDAP server, bad credentials",# 4.4.3
         ],
       }.freeze
       MessagesOf = {
-        # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
-        # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        'userunknown'  => ['no mailbox here by that name', 'does not like recipient.'],
+        # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
+        # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
+        "hostunknown" => ["Sorry, I couldn't find any host "],
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        'mailboxfull'  => ['disk quota exceeded'],
+        "mailboxfull" => ["disk quota exceeded"],
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        'mesgtoobig'   => ['Message size exceeds fixed maximum message size:'],
-        # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
-        # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        'hostunknown'  => ["Sorry, I couldn't find any host "],
-        'systemfull'   => ['Requested action not taken: mailbox unavailable (not enough free space)'],
-        'systemerror'  => [
-          'bad interpreter: No such file or directory',
-          'system error',
-          'Unable to',
+        "mesgtoobig"  => ["Message size exceeds fixed maximum message size:"],
+        "networkerror"=> [
+            "Sorry, I wasn't able to establish an SMTP connection",
+            "Sorry. Although I'm listed as a best-preference MX or A for that host",
         ],
-        'notaccept' => [
-          # notqmail 1.08 returns the following error message when the destination MX is NullMX
-          "Sorry, I couldn't find a mail exchanger or IP address",
+        "notaccept" => [
+            # notqmail 1.08 returns the following error message when the destination MX is NullMX
+            "Sorry, I couldn't find a mail exchanger or IP address",
         ],
-        'networkerror' => [
-          "Sorry, I wasn't able to establish an SMTP connection",
-          "Sorry. Although I'm listed as a best-preference MX or A for that host",
+        "systemerror" => [
+            "bad interpreter: No such file or directory",
+            "system error",
+            "Unable to",
         ],
+        "systemfull"  => ["Requested action not taken: mailbox unavailable (not enough free space)"],
+        # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
+        # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
+        "userunknown" => ["no mailbox here by that name"],
       }.freeze
 
       # @abstract Decodes the bounce message from qmail
@@ -100,16 +133,16 @@ module Sisimai::Lhost
         # by qmail, see https://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
         #         Subject: failure notice
-        tryto  = [['(qmail ', 'invoked for bounce)'], ['(qmail ', 'invoked from ', 'network)']]
-        match  = 0
-        match += 1 if mhead['subject'] == 'failure notice'
-        mhead['received'].each do |e|
+        proceedsto = false
+        proceedsto = true if EmailTitle.any? { |a| mhead["subject"] == a }
+        mhead["received"].each do |e|
           # Received: (qmail 2222 invoked for bounce);29 Apr 2017 23:34:45 +0900
           # Received: (qmail 2202 invoked from network); 29 Apr 2018 00:00:00 +0900
-          match += 1 if tryto.any? { |a| Sisimai::String.aligned(e, a) }
+          proceedsto = true if RelayedVia.any? { |a| Sisimai::String.aligned(e, a) }
         end
-        return nil unless match > 0
+        return nil if proceedsto == false
 
+        require "sisimai/smtp/command"
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
@@ -122,7 +155,7 @@ module Sisimai::Lhost
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            readcursor |= Indicators[:deliverystatus] if StartingOf["message"].any? { |a| e.include?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -134,31 +167,29 @@ module Sisimai::Lhost
           # Giving up on 192.0.2.153.
           v = dscontents[-1]
 
-          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
+          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>:'])
             # <kijitora@example.jp>:
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(e[e.index('<'), e.size])
+            v["recipient"] = Sisimai::Address.s3s4(e[e.index("<"), e.size])
             recipients += 1
 
           elsif dscontents.size == recipients
             # Append error message
-            next if e.empty?
-            v['diagnosis'] ||= ''
-            v['diagnosis'] << e + ' '
-            v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
+            v["diagnosis"] << e + " "
+            v["alterrors"] = e if e.start_with?(StartingOf["error"][0])
 
-            next if v['rhost']
-            StartingOf[:rhost].each do |r|
+            next if v["rhost"] != ""
+            StartingOf["rhost"].each do |r|
               # Find a remote host name
               p1 = e.index(r); next unless p1
               cm = r.size
-              p2 = e.index(' ', p1 + cm + 1) || p2 = e.rindex('.') 
+              p2 = e.index(" ", p1 + cm + 1) || p2 = e.rindex(".") 
 
-              v['rhost'] = e[p1 + cm, p2 - p1 - cm]
+              v["rhost"] = Sisimai::String.sweep(e[p1 + cm, p2 - p1 - cm])
               break
             end
           end
@@ -166,68 +197,61 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = 'qmail'
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
-          unless e['command']
-            # Get the SMTP command name for the session
-            CommandSet.each_key do |r|
-              # Verify each regular expression of SMTP commands
-              next unless CommandSet[r].any? { |a| e['diagnosis'].include?(a) }
-              e['command'] = r.upcase
-              break
-            end
+          # Tidy up the error message in e['diagnosis'], Try to detect the bounce reason.
+          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
 
-            if e['diagnosis'].include?('Sorry, no SMTP connection got far enough; most progress was ')
-              # Get the last SMTP command:from the error message
-              e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis']) || '' 
-            end
+          # Get the SMTP command name for the session
+          CommandSet.each_key do |r|
+            # Get the last SMTP command
+            next unless CommandSet[r].any? { |a| e["diagnosis"].include?(a) }
+            e["command"] = r
+            break
+          end
+
+          if e["diagnosis"].include?("Sorry, no SMTP connection got far enough")
+            # Sorry, no SMTP connection got far enough; most progress was RCPT TO response; ...
+            e["command"] = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
           end
 
           # Detect the reason of bounce
-          if %w[HELO EHLO].index(e['command'])
+          if %w[HELO EHLO].index(e["command"])
             # HELO | Connected to 192.0.2.135 but my name was rejected.
-            e['reason'] = 'blocked'
+            e["reason"] = "blocked"
           else
             # Try to match with each error message in the table
-            if Sisimai::String.aligned(e['diagnosis'], OnHoldPair)
+            if Sisimai::String.aligned(e["diagnosis"], OnHoldPair)
               # To decide the reason require pattern match with Sisimai::Reason::* modules
-              e['reason'] = 'onhold'
+              e["reason"] = "onhold"
             else
-              MessagesOf.each_key do |r|
-                # Verify each regular expression of session errors
-                if e['alterrors']
-                  # Check the value of "alterrors"
-                  next unless MessagesOf[r].any? { |a| e['alterrors'].include?(a) }
-                  e['reason'] = r
+              # Check that the error message includes any of message patterns or not
+              [e["alterrors"], e["diagnosis"]].each do |f|
+                # Try to detect an error reason
+                break if e["reason"] != ""
+                next unless f
+                MessagesOf.each_key do |r|
+                  # The key is a bounce reason name
+                  next unless MessagesOf[r].any? { |a| f.include?(a) }
+                  e["reason"] = r
+                  break
                 end
-                break if e['reason']
-
-                next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r
-                break
-              end
+                break if e["reason"]
 
-              unless e['reason']
                 FailOnLDAP.each_key do |r|
-                  # Verify each regular expression of LDAP errors
-                  next unless FailOnLDAP[r].any? { |a| e['diagnosis'].include?(a) }
-                  e['reason'] = r
+                  # The key is a bounce reason name
+                  next unless FailOnLDAP[r].any? { |a| f.include?(a) }
+                  e["reason"] = r
                   break
                 end
-              end
-
-              unless e['reason']
-                e['reason'] = 'expired' if e['diagnosis'].include?(HasExpired)
+                break if e["reason"]
+                e["reason"] = "expired" if e["diagnosis"].include?(HasExpired)
               end
             end
           end
 
-          e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis'])
-          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+          e["command"] = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return { "ds" => dscontents, "rfc822" => emailparts[1] }
       end
       def description; return 'qmail'; end
     end