sisimai 5.0.3 → 5.2.0

data/lib/sisimai/lhost/exim.rb

@@ -1,18 +1,29 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Exim parses a bounce email which created by Exim. Methods in the module are called
-  # from only Sisimai::Message.
+  # Sisimai::Lhost::Exim decodes a bounce email which created by Exim Internet Mailer https://www.exim.org/.
+  # Methods in the module are called from only Sisimai::Message.
   module Exim
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/rfc1894'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      FieldTable = Sisimai::RFC1894.FIELDTABLE
       Boundaries = [
         # deliver.c:6423|          if (bounce_return_body) fprintf(f,
         # deliver.c:6424|"------ This is a copy of the message, including all the headers. ------\n");
         # deliver.c:6425|          else fprintf(f,
         # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
-        '------ This is a copy of the message, including all the headers. ------',
-        'Content-Type: message/rfc822',
+        "------ This is a copy of the message, including all the headers. ------",
+        "Content-Type: message/rfc822",
+        "Included is a copy of the message header:\n-----------------------------------------", # MXLogic
+      ].freeze
+      EmailTitle = [
+        "Delivery Status Notification",
+        "Mail delivery failed",
+        "Mail failure",
+        "Message frozen",
+        "Warning: message ",
+        "error(s) in forwarding or filtering",
       ].freeze
       StartingOf = {
         # Error text strings which defined in exim/src/deliver.c
@@ -32,137 +43,155 @@ module Sisimai::Lhost
         # deliver.c:6304|"could not be delivered to one or more of its recipients. The following\n"
         # deliver.c:6305|"address(es) failed:\n", sender_address);
         # deliver.c:6306|          }
-        deliverystatus: ['Content-Type: message/delivery-status'],
-        frozen:         [' has been frozen', ' was frozen on arrival'],
-        message:        [
-          'This message was created automatically by mail delivery software.',
-          'A message that you sent was rejected by the local scannning code',
-          'A message that you sent contained one or more recipient addresses ',
-          'A message that you sent could not be delivered to all of its recipients',
-          ' has been frozen',
-          ' was frozen on arrival',
-          ' router encountered the following error(s):',
+        "alias"          => [" an undisclosed address"],
+        "command"        => ["SMTP error from remote ", "LMTP error after "],
+        "deliverystatus" => ["Content-Type: message/delivery-status"],
+        "frozen"         => [" has been frozen", " was frozen on arrival"],
+        "message"        => [
+          "This message was created automatically by mail delivery software.",
+          "A message that you sent was rejected by the local scannning code",
+          "A message that you sent contained one or more recipient addresses ",
+          "A message that you sent could not be delivered to all of its recipients",
+          " has been frozen",
+          " was frozen on arrival",
+          " router encountered the following error(s):",
         ],
       }.freeze
-      MarkingsOf = { alias: ' an undisclosed address' }.freeze
-      ReCommands = [
-        # transports/smtp.c:564|  *message = US string_sprintf("SMTP error from remote mail server after %s%s: "
-        # transports/smtp.c:837|  string_sprintf("SMTP error from remote mail server after RCPT TO:<%s>: "
-        %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
-        %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
-        %r/LMTP error after ([A-Za-z]{4})/,
-        %r/LMTP error after end of ([A-Za-z]{4})/,
-      ].freeze
       MessagesOf = {
         # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-        'userunknown' => ['user not found'],
+        # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
+        # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
+        "userunknown" => ["user not found"],
         # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
         # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
         # route.c:1826|  uschar *message = US"Unrouteable address";
-        'hostunknown' => [
-          'all host address lookups failed permanently',
-          'all relevant MX records point to non-existent hosts',
-          'Unrouteable address',
+        "hostunknown" => [
+          "all host address lookups failed permanently",
+          "all relevant MX records point to non-existent hosts",
+          "Unrouteable address",
         ],
         # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
         # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
         # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
-        'mailboxfull' => ['mailbox is full', 'error: quota exceed'],
+        "mailboxfull" => [
+          "mailbox is full",
+          "error: quota exceed",
+        ],
         # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
         # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
-        'notaccept' => [
-          'an MX or SRV record indicated no SMTP service',
-          'no host found for existing SMTP connection',
+        "notaccept" => [
+          "an MX or SRV record indicated no SMTP service",
+          "no host found for existing SMTP connection",
         ],
         # parser.c:666| *errorptr = string_sprintf("%s (expected word or \"<\")", *errorptr);
         # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
         # parser.c:738| FAILED(US"domain missing in source-routed address");
         # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
-        'syntaxerror' => [
-          'angle-brackets nested too deep',
+        "syntaxerror" => [
+          "angle-brackets nested too deep",
           'expected word or "<"',
-          'domain missing in source-routed address',
-          'malformed address:',
+          "domain missing in source-routed address",
+          "malformed address:",
         ],
         # deliver.c:5614|  addr->message = US"delivery to file forbidden";
         # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
         # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
-        'systemerror' => [
-          'delivery to file forbidden',
-          'delivery to pipe forbidden',
-          'local delivery failed',
-          'LMTP error after ',
+        "systemerror" => [
+          "delivery to file forbidden",
+          "delivery to pipe forbidden",
+          "local delivery failed",
+          "LMTP error after ",
         ],
         # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
-        'contenterror' => ['Too many "Received" headers'],
+        "contenterror" => ['Too many "Received" headers'],
       }.freeze
-
-      # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
-      # deliver.c:7475|  "No action is required on your part. Delivery attempts will continue for\n"
-      # smtp.c:3508|  US"retry time not reached for any host after a long failure period" :
-      # smtp.c:3508|  US"all hosts have been failing for a long time and were last tried "
-      #                 "after this message arrived";
-      # deliver.c:7459|  print_address_error(addr, f, US"Delay reason: ");
-      # deliver.c:7586|  "Message %s has been frozen%s.\nThe sender is <%s>.\n", message_id,
-      # receive.c:4021|  moan_tell_someone(freeze_tell, NULL, US"Message frozen on arrival",
-      # receive.c:4022|  "Message %s was frozen on arrival by %s.\nThe sender is <%s>.\n",
       DelayedFor = [
-        'retry timeout exceeded',
-        'No action is required on your part',
-        'retry time not reached for any host after a long failure period',
-        'all hosts have been failing for a long time and were last tried',
-        'Delay reason: ',
-        'has been frozen',
-        'was frozen on arrival by ',
+        # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
+        # deliver.c:7475|  "No action is required on your part. Delivery attempts will continue for\n"
+        # smtp.c:3508|  US"retry time not reached for any host after a long failure period" :
+        # smtp.c:3508|  US"all hosts have been failing for a long time and were last tried "
+        #                 "after this message arrived";
+        # deliver.c:7459|  print_address_error(addr, f, US"Delay reason: ");
+        # deliver.c:7586|  "Message %s has been frozen%s.\nThe sender is <%s>.\n", message_id,
+        # receive.c:4021|  moan_tell_someone(freeze_tell, NULL, US"Message frozen on arrival",
+        # receive.c:4022|  "Message %s was frozen on arrival by %s.\nThe sender is <%s>.\n",
+        "retry timeout exceeded",
+        "No action is required on your part",
+        "retry time not reached for any host after a long failure period",
+        "all hosts have been failing for a long time and were last tried",
+        "Delay reason: ",
+        "has been frozen",
+        "was frozen on arrival by ",
       ].freeze
 
-      # Parse bounce messages from Exim
+      # @abstract Decodes the bounce message from Exim
       # @param  [Hash] mhead    Message headers of a bounce email
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
-      # @return [Nil]           it failed to parse or the arguments are missing
+      # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil if mhead['from'].include?('.mail.ru')
-
         # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
         # X-Failed-Recipients: kijitora@example.ed.jp
-        match  = 0
-        msgid  = mhead['message-id'] || ''
-        match += 1 if mhead['from'].start_with?('Mail Delivery System')
-        match += 1 if msgid.start_with?('<') && msgid.index('-') == 8 && msgid.index('@') == 18
-        match += 1 if %w[
-          'Delivery Status Notification',
-          'Mail delivery failed',
-          'Mail failure',
-          'Message frozen',
-          'Warning: message ',
-          'error(s) in forwarding or filtering'].any? { |a| mhead['subject'].include?(a) }
-        return nil if match < 2
-
-        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        thirdparty = false
+        proceedsto = 0
+        messageidv = mhead["message-id"] || ""
+
+        proceedsto += 1 if mhead["from"].include?("Mail Delivery System")
+        while messageidv != "" do
+          # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
+          break if messageidv.index("<") !=  0
+          break if messageidv.index("-") !=  8
+          break if messageidv.index('@') != 18
+          proceedsto += 1; break
+        end
+        EmailTitle.each do |e|
+          # Subject: Mail delivery failed: returning message to sender
+          # Subject: Mail delivery failed
+          # Subject: Message frozen
+          next if mhead["subject"].include?(e) == false
+          proceedsto += 1; break
+        end
+
+        while true
+          # Exim clones of the third Parties
+          # 1. McAfee Saas (Formerly MXLogic)
+          if mhead.has_key?("x-mx-bounce")    then thirdparty = true; break; end
+          if mhead.has_key?("x-mxl-hash")     then thirdparty = true; break; end
+          if mhead.has_key?("x-mxl-notehash") then thirdparty = true; break; end
+          if messageidv.include?("<mxl~")     then thirdparty = true; break; end
+          break
+        end
+        return nil if proceedsto < 2 && thirdparty == false
+
+        require "sisimai/address"
+        require "sisimai/rfc2045"
+        require "sisimai/smtp/command"
+
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
-        nextcursor = 0
+        nextcursor = false
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        boundary00 = ''     # (String) Boundary string
+        boundary00 = ""     # (String) Boundary string
         v = nil
 
-        if mhead['content-type']
+        if mhead["content-type"]
           # Get the boundary string and set regular expression for matching with the boundary string.
-          boundary00 = Sisimai::RFC2045.boundary(mhead['content-type']) || ''
+          boundary00 = Sisimai::RFC2045.boundary(mhead["content-type"]) || ""
         end
 
+        p1 = -1; p2 = -1;
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if StartingOf[:message].any? { |a| e.include?(a) }
+            if StartingOf["message"].any? { |a| e.include?(a) }
+              # Check the message defined in StartingOf["message"], ["frozen"]
               readcursor |= Indicators[:deliverystatus]
-              next unless StartingOf[:frozen].any? { |a| e.include?(a) }
+              next unless StartingOf["frozen"].any? { |a| e.include?(a) }
             end
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -182,26 +211,27 @@ module Sisimai::Lhost
           ce = false
           while true
             # Check if the line matche the following patterns:
-            break unless e.start_with?('  ')              # The line should start with "  " (2 spaces)
-            break unless e.include?('@')                  # "@" should be included (email)
-            break unless e.include?('.')                  # "." should be included (domain part)
-            break unless e.include?('pipe to |') == false # Exclude "pipe to /path/to/prog" line
-
-            break unless e[2, 1] != ' '
-            break unless e[2, 1] != '<'
+            break if e.start_with?("  ") == false       # The line should start with "  " (2 spaces)
+            break if e.include?('@')     == false       # "@" should be included (email)
+            break if e.include?(".")     == false       # "." should be included (domain part)
+            break if e.include?("pipe to |")            # Exclude "pipe to /path/to/prog" line
+
+            cx = e[2, 1]
+            break if cx == " "                          # The 3rd character is " "
+            break if thirdparty == false && cx == "<"   # MXLogic returns "  <neko@example.jp>:..."
             ce = true
             break
           end
 
-          if ce || e.include?(MarkingsOf[:alias])
+          if ce == true || e.include?(StartingOf["alias"][0])
             # The line is including an email address
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
 
-            if e.include?(MarkingsOf[:alias])
+            if e.include?(StartingOf["alias"][0])
               # The line does not include an email address
               # deliver.c:4549|  printed = US"an undisclosed address";
               #   an undisclosed address
@@ -211,8 +241,8 @@ module Sisimai::Lhost
               #   kijitora@example.jp
               #   sabineko@example.jp: forced freeze
               #   mikeneko@example.jp <nekochan@example.org>: ...
-              p1 = e.index(' <') || -1
-              p2 = e.index('>:') || -1
+              p1 = e.index("<") || -1
+              p2 = e.index(">:") || -1
 
               if p1 > 1 && p2 > 1
                 # There are an email address and an error message in the line
@@ -224,85 +254,78 @@ module Sisimai::Lhost
                 # parser.c:748|     s-1, (int)(s - US mailbox - 1), mailbox);
                 # parser.c:749|   goto PARSE_FAILED;
                 # parser.c:750|   }
-                cv = Sisimai::Address.s3s4(e[p1 + 1, p2 - p1 - 1])
-                v['diagnosis'] = Sisimai::String.sweep(e[p2 + 1, e.size])
+                cv = Sisimai::Address.s3s4(e[p1, p2 - p1 - 1])
+                v["diagnosis"] = Sisimai::String.sweep(e[p2 + 1, e.size])
               else
                 # There is an email address only in the line
                 #   kijitora@example.jp
                 cv = Sisimai::Address.s3s4(e[2, e.size])
               end
             end
-            v['recipient'] = cv
+            v["recipient"] = cv
             recipients += 1
 
-          elsif e.include?(' (generated from ') || e.include?(' generated by ')
+          elsif e.include?(" (generated from ") || e.include?(" generated by ")
             #     (generated from kijitora@example.jp)
             #  pipe to |/bin/echo "Some pipe output"
             #    generated by userx@myhost.test.ex
-            v['alias'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
-
+            e.split(" ").each do |f|
+              # Find the alias address
+              next unless f.include?('@')
+              v["alias"] = Sisimai::Address.s3s4(f)
+            end
           else
-            next if e.empty?
-
-            if StartingOf[:frozen].any? { |a| e.include?(a) }
+            if StartingOf["frozen"].any? { |a| e.include?(a) }
               # Message *** has been frozen by the system filter.
               # Message *** was frozen on arrival by ACL.
-              v['alterrors'] ||= ''
-              v['alterrors'] <<  e + ' '
-            elsif !boundary00.empty?
+              v["alterrors"] ||= ""
+              v["alterrors"] <<  e + " "
+            elsif boundary00 != ""
               # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
               # Content-type: message/delivery-status
               # ...
-              if Sisimai::RFC1894.match(e)
+              if Sisimai::RFC1894.match(e) > 0
                 # "e" matched with any field defined in RFC3464
                 next unless o = Sisimai::RFC1894.field(e)
 
-                if o[-1] == 'addr'
+                if o[3] == "addr"
                   # Final-Recipient: rfc822; kijitora@example.jp
                   # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  next unless o[0] == 'final-recipient'
-                  v['spec'] ||= o[2].include?('@') ? 'SMTP' : 'X-UNIX'
+                  next unless o[0] == "final-recipient"
+                  if v["spec"].empty?
+                    v["spec"] = o[2].include?('@') ? "SMTP" : "X-UNIX"
+                  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['diagnosis'] = o[2]
+                  v["spec"] = o[1].upcase
+                  v["diagnosis"] = o[2]
 
                 else
                   # Other DSN fields defined in RFC3464
-                  next unless fieldtable[o[0]]
-                  v[fieldtable[o[0]]] = o[2]
+                  next unless FieldTable[o[0]]
+                  v[FieldTable[o[0]]] = o[2]
                 end
               else
                 # Error message ?
-                next if nextcursor == 1
+                next if nextcursor
 
                 # Content-type: message/delivery-status
-                nextcursor = 1 if e.start_with?(StartingOf[:deliverystatus][0])
-                v['alterrors'] ||= ''
-                if e.start_with?("\s", "\t")
-                  e.sub!(/\A[\s\t]+/, '')
-                  v['alterrors'] << e + ' ' unless v['alterrors'].include?(e)
-                end
+                nextcursor = true if e.start_with?(StartingOf["deliverystatus"][0])
+                v["alterrors"] ||= ''
+                v["alterrors"] << e + " " unless v["alterrors"].include?(e) if e.start_with?(" ")
               end
             else
               # There is no boundary string in $boundary00
               if dscontents.size == recipients
                 # Error message
-                next if e.empty?
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << e + '  '
+                v["diagnosis"] << e + "  "
               else
-                # Error message when email address above does not include '@' and domain part.
-                if e.include?(' pipe to |/')
-                  # pipe to |/path/to/prog ...
-                  #   generated by kijitora@example.com
-                  v['diagnosis'] = e
-                else
-                  next unless e.start_with?('    ')
-                  v['alterrors'] ||= ''
-                  v['alterrors'] << e + ' '
-                end
+                # Error message when email address above does not include '@' and domain part
+                # pipe to |/path/to/prog ...
+                #   generated by kijitora@example.com
+                next unless e.start_with?("  ")
+                v["diagnosis"] << e + " "
               end
             end
           end
@@ -312,128 +335,121 @@ module Sisimai::Lhost
           # Check "an undisclosed address", "unroutable address"
           dscontents.each do |q|
             # Replace the recipient address with the value of "alias"
-            next unless q['alias']
-            next if q['alias'].empty?
-            if q['recipient'].empty? || q['recipient'].include?('@') == false
+            next if q["alias"].empty?
+            if q["recipient"].empty? || q["recipient"].include?('@') == false
               # The value of "recipient" is empty or does not include "@"
-              q['recipient'] = q['alias']
+              q["recipient"] = q["alias"]
             end
           end
         else
           # Fallback for getting recipient addresses
-          if mhead['x-failed-recipients']
+          if mhead["x-failed-recipients"]
             # X-Failed-Recipients: kijitora@example.jp
-            rcptinhead = mhead['x-failed-recipients'].split(',')
-            rcptinhead.each do |a|
+            rcptinhead = mhead["x-failed-recipients"].split(",")
+            rcptinhead.each do |e|
               # Remove space characters
-              a.lstrip!
-              a.rstrip!
+              e.lstrip!
+              e.rstrip!
             end
             recipients = rcptinhead.size
 
             while e = rcptinhead.shift do
               # Insert each recipient address into dscontents
-              dscontents[-1]['recipient'] = e
+              dscontents[-1]["recipient"] = e
               next if dscontents.size == recipients
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         # Get the name of the local MTA
         # Received: from marutamachi.example.org (c192128.example.net [192.0.2.128])
-        receivedby = mhead['received'] || []
+        receivedby = mhead["received"] || []
         recvdtoken = Sisimai::RFC5322.received(receivedby[-1])
 
         dscontents.each do |e|
           # Check the error message, the rhost, the lhost, and the smtp command.
-          unless e['diagnosis']
+          e["alterrors"] = "" if e["alterrors"].nil?
+          if e["diagnosis"].empty? && boundary00.size > 0
             # Empty Diagnostic-Code: or error message
-            unless boundary00.empty?
-              # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
-              # Content-type: message/delivery-status
-              #
-              # Reporting-MTA: dns; the.local.host.name
-              #
-              # Action: failed
-              # Final-Recipient: rfc822;/a/b/c
-              # Status: 5.0.0
-              #
-              # Action: failed
-              # Final-Recipient: rfc822;|/p/q/r
-              # Status: 5.0.0
-              e['diagnosis'] = dscontents[0]['diagnosis'] || ''
-              e['spec']    ||= dscontents[0]['spec']
-
-              unless dscontents[0]['alterrors'].to_s.empty?
-                # The value of "alterrors" is also copied
-                e['alterrors'] = dscontents[0]['alterrors']
-              end
-            end
+            # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
+            # Content-type: message/delivery-status
+            #
+            # Reporting-MTA: dns; the.local.host.name
+            #
+            # Action: failed
+            # Final-Recipient: rfc822;/a/b/c
+            # Status: 5.0.0
+            #
+            # Action: failed
+            # Final-Recipient: rfc822;|/p/q/r
+            # Status: 5.0.0
+            e["diagnosis"] = dscontents[0]["diagnosis"]
+            e["spec"]      = dscontents[0]["spec"]      if e["spec"].empty?
+            e["alterrors"] = dscontents[0]["alterrors"] if dscontents[0]["alterrors"] != ""
           end
 
-          unless e['alterrors'].to_s.empty?
+          if e["alterrors"]
             # Copy alternative error message
-            if e['diagnosis'].nil? || e['diagnosis'].empty?
-              e['diagnosis'] = e['alterrors']
-            end
+            e["diagnosis"] = e["alterrors"] if e["diagnosis"].empty?
 
-            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
+            if e["diagnosis"].start_with?("-") || e["diagnosis"].end_with?("__")
               # Override the value of diagnostic code message
-              e['diagnosis'] = e['alterrors'] unless e['alterrors'].empty?
+              e["diagnosis"] = e["alterrors"]
 
-            elsif e['diagnosis'].size < e['alterrors'].size
-              # Override the value of diagnostic code message because the value of alterrors includes
-              # the value of diagnosis.
-              e['diagnosis'] = e['alterrors'] if e['alterrors'].downcase.include?(e['diagnosis'].downcase)
+            elsif e["diagnosis"].size < e["alterrors"].size
+              # Override the value of diagnostic code message with the value of alterrors because
+              # the latter includes the former.
+              e["alterrors"].squeeze!(" ")
+              e["diagnosis"] = e["alterrors"] if e["alterrors"].downcase.include?(e["diagnosis"].downcase)
             end
-            e.delete('alterrors')
+            e.delete("alterrors")
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''; p1 = e['diagnosis'].index('__') || -1
-          e['diagnosis'] = e['diagnosis'][0, p1]                     if p1 > 1
+          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"]) || ""; p1 = e["diagnosis"].index("__") || -1
+          e["diagnosis"] = e["diagnosis"][0, p1] if p1 > 1
 
-          unless e['rhost']
+          if e["rhost"].empty?
             # Get the remote host name
             # host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            p1 = e['diagnosis'].index('host ')     || -1
-            p2 = e['diagnosis'].index(' ', p1 + 5) || -1
-            e['rhost'] = e['diagnosis'][p1 + 5, p2 - p1 - 5] if p1 > -1
-            e['rhost'] ||= recvdtoken[1]
+            p1 = e["diagnosis"].index("host ")     || -1
+            p2 = e["diagnosis"].index(" ", p1 + 5) || -1
+            e["rhost"] = e["diagnosis"][p1 + 5, p2 - p1 - 5] if p1 > -1
+            e["rhost"] = recvdtoken[1] if e["rhost"].empty?
           end
-          e['lhost'] ||= recvdtoken[0]
+          e["lhost"] = recvdtoken[0] if e["lhost"].empty?
 
-          unless e['command']
+          if e["command"].empty?
             # Get the SMTP command name for the session
-            ReCommands.each do |r|
+            StartingOf["command"].each do |r|
               # Verify each regular expression of SMTP commands
-              if cv = e['diagnosis'].match(r)
-                e['command'] = cv[1].upcase
-                break
-              end
+              next if e["diagnosis"].include?(r) == false
+              e["command"] = Sisimai::SMTP::Command.find(e["diagnosis"]); next if e["command"].empty?
+              break
             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"
 
-            elsif e['command'] == 'MAIL'
+            elsif e["command"] == "MAIL"
               # MAIL | Connected to 192.0.2.135 but sender was rejected.
-              e['reason'] = 'onhold'
+              e["reason"] = "onhold"
+
             else
-              # Verify each regular expression of session errors
+              # Try to match the error message with each message pattern 
               MessagesOf.each_key do |r|
-                # Check each regular expression
-                next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r
+                # Check each message pattern
+                next unless MessagesOf[r].any? { |a| e["diagnosis"].include?(a) }
+                e["reason"] = r
                 break
               end
 
-              unless e['reason']
-                # The reason "expired"
-                e['reason']   = 'expired' if DelayedFor.any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] ||= 'mailererror' if e['diagnosis'].include?('pipe to |')
+              if e["reason"].empty?
+                # The reason "expired", or "mailererror"
+                e["reason"] = "expired" if DelayedFor.any? { |a| e["diagnosis"].include?(a) }
+                e["reason"] = "mailererror" if e["reason"].empty? && e["diagnosis"].include?("pipe to |")
               end
             end
           end
@@ -447,52 +463,26 @@ module Sisimai::Lhost
           #
           # The value of "Status:" indicates permanent error but the value of SMTP reply code in
           # Diagnostic-Code: field is "TEMPERROR"!!!!
-          cs = e['status']    || Sisimai::SMTP::Status.find(e['diagnosis'])
-          cr = e['replycode'] || Sisimai::SMTP::Reply.find(e['diagnosis'])
-          s1 = 0  # First character of Status as integer
-          r1 = 0  # First character of SMTP reply code as integer
-
-          while true
-            # "Status:" field did not exist in the bounce message
-            break if cs
-            break unless cr
-
-            # Check SMTP reply code, Generate pseudo DSN code from SMTP reply code
-            r1 = cr[0, 1].to_i
-            if r1 == 4
-              # Get the internal DSN(temporary error)
-              cs = Sisimai::SMTP::Status.code(e['reason'], true)
-
-            elsif r1 == 5
-              # Get the internal DSN(permanent error)
-              cs = Sisimai::SMTP::Status.code(e['reason'], false)
-            end
-            break
-          end
+          re = e["reason"]
+          cr = Sisimai::SMTP::Reply.find(e["diagnosis"], e["status"])
+          cs = Sisimai::SMTP::Status.find(e["diagnosis"], cr)
+          cv = ""
 
-          s1 = cs[0, 1].to_i if cs
-          v1 = s1 + r1
-          v1 << e['status'][0, 1].to_i if e['status']
+          if cr[0,1] == "4" || re == "expired" || re == "mailboxfull"
+            # Set the pseudo status code as a temporary error
+            cv = Sisimai::SMTP::Status.code(re, true)
 
-          if v1 > 0
-            # Status or SMTP reply code exists, Set pseudo DSN into the value of "status" accessor
-            e['status'] = cs if r1 > 0
           else
-            # Neither Status nor SMTP reply code exist
-            cs = if %w[expired mailboxfull].include?(e['reason'])
-                   # Set pseudo DSN (temporary error)
-                   Sisimai::SMTP::Status.code(e['reason'], true)
-                 else
-                   # Set pseudo DSN (permanent error)
-                   Sisimai::SMTP::Status.code(e['reason'], false)
-                 end
+            # Set the pseudo status code as a permanent error
+            cv = Sisimai::SMTP::Status.code(re, false)
           end
-          e['status'] ||= cs.to_s
+          e["replycode"] = cr if e["replycode"].empty?
+          e["status"]    = Sisimai::SMTP::Status.prefer(cs, cv, cr) if e["status"].empty?
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return { "ds" => dscontents, "rfc822" => emailparts[1] }
       end
-      def description; return 'Exim'; end
+      def description; return "Exim"; end
     end
   end
 end