sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/opensmtpd.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::OpenSMTPD parses a bounce email which created by
-  # OpenSMTPD. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::OpenSMTPD parses a bounce email which created by OpenSMTPD. Methods in the module
+  # are called from only Sisimai::Message.
   module OpenSMTPD
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/OpenSMTPD.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^[ ]+Below is a copy of the original message:|.freeze
+      Boundaries = ['    Below is a copy of the original message:'].freeze
       StartingOf = {
         # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
         # opensmtpd-5.4.2p1/smtpd/
@@ -70,21 +69,21 @@ module Sisimai::Lhost
       # @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
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Delivery status notification')
         return nil unless mhead['from'].start_with?('Mailer Daemon <')
         return nil unless mhead['received'].any? { |a| a.include?(' (OpenSMTPD) with ') }
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         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.
+          # 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 delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -105,15 +104,15 @@ module Sisimai::Lhost
           #    Below is a copy of the original message:
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\z/)
+          if e.include?('@') && Sisimai::String.aligned(e, ['@', ' '])
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
-            v['diagnosis'] = cv[2]
+            v['recipient'] = e[0, e.index(':')]
+            v['diagnosis'] = e[e.index(':') + 1, e.size]
             recipients += 1
           end
         end
@@ -128,7 +127,7 @@ module Sisimai::Lhost
             break
           end
         end
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'OpenSMTPD'; end
     end

data/lib/sisimai/lhost/outlook.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Outlook parses a bounce email which created by
-  # Microsoft Outlook.com.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Outlook parses a bounce email which created by Microsoft Outlook.com. Methods in
+  # the module are called from only Sisimai::Message.
   module Outlook
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/US/Outlook.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type: message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['This is an automatically generated Delivery Status Notification'] }.freeze
       MessagesOf = {
         'hostunknown' => ['The mail could not be delivered to the recipient because the domain is not reachable'],
@@ -20,7 +18,7 @@ module Sisimai::Lhost
       # @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
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
         # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
         match  = 0
@@ -30,21 +28,20 @@ module Sisimai::Lhost
         match += 1 if mhead['received'].any? { |a| a.include?('.hotmail.com') }
         return nil if match < 2
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         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.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -85,14 +82,14 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
             # Continued line of the value of Diagnostic-Code field
             next unless readslices[-2].start_with?('Diagnostic-Code:')
-            next unless cv = e.match(/\A[ \t]+(.+)\z/)
-            v['diagnosis'] << ' ' << cv[1]
+            next unless e.start_with?(' ')
+            v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
             readslices[-1] = 'Diagnostic-Code: ' << e
           end
         end
@@ -124,7 +121,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
     end

data/lib/sisimai/lhost/postfix.rb

@@ -1,34 +1,23 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Postfix parses a bounce email which created by
-  # Postfix. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Postfix parses a bounce email which created by Postfix. Methods in the module are
+  # called from only Sisimai::Message.
   module Postfix
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Postfix.pm
       require 'sisimai/lhost'
+      require 'sisimai/smtp/command'
 
       # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
-      MarkingsOf = {
-        message: %r{\A(?>
-           [ ]+The[ ](?:
-             Postfix[ ](?:
-               program\z              # The Postfix program
-              |on[ ].+[ ]program\z    # The Postfix on <os name> program
-              )
-            |\w+[ ]Postfix[ ]program\z  # The <name> Postfix program
-            |mail[ \t]system\z             # The mail system
-            |\w+[ \t]program\z             # The <custmized-name> program
-            )
-          |This[ ]is[ ]the[ ](?:
-             Postfix[ ]program          # This is the Postfix program
-            |\w+[ ]Postfix[ ]program    # This is the <name> Postfix program
-            |\w+[ ]program              # This is the <customized-name> Postfix program
-            |mail[ ]system[ ]at[ ]host  # This is the mail system at host <hostname>.
-            )
-          )
-        }x,
-        # :from => %r/ [(]Mail Delivery System[)]\z/,
+      Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
+      StartingOf = {
+        # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
+        message: [
+          ['The ', 'Postfix '],           # The Postfix program, The Postfix on <os> program
+          ['The ', 'mail system'],        # The mail system
+          ['The ', 'program'],            # The <name> pogram
+          ['This is the', 'Postfix'],     # This is the Postfix program
+          ['This is the', 'mail system'], # This is the mail system at host <hostname>
+        ],
       }.freeze
 
       # Parse bounce messages from Postfix
@@ -36,109 +25,160 @@ module Sisimai::Lhost
       # @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
-      def make(mhead, mbody)
-        return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
+      def inquire(mhead, mbody)
+        match = nil
+        sessx = nil
+
+        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
+        else
+          # Subject: Undelivered Mail Returned to Sender
+          match = true if mhead['subject'] == 'Undelivered Mail Returned to Sender'
+        end
+        return nil unless match
         return nil if mhead['x-aol-ip']
 
-        require 'sisimai/rfc1894'
-        require 'sisimai/address'
-        fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
-
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
-        readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         nomessages = false  # (Boolean) Delivery report unavailable
         commandset = []     # (Array) ``in reply to * command'' list
         anotherset = {}     # Another error information
         v = nil
 
-        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.
-          readslices << e # Save the current line for the next loop
+        if sessx
+          # The message body starts with 'Transcript of session follows.'
+          require 'sisimai/smtp/transcript'
+          transcript = Sisimai::SMTP::Transcript.rise(emailparts[0], 'In:', 'Out:')
+
+          return nil unless transcript
+          return nil if transcript.size == 0
+
+          transcript.each do |e|
+            # Pick email addresses, error messages, and the last SMTP command.
+            v ||= dscontents[-1]
+            p   = e['response']
+
+            if e['command'] == 'HELO' || e['command'] == 'EHLO'
+              # Use the argument of EHLO/HELO command as a value of "lhost"
+              v['lhost'] = e['argument']
+
+            elsif e['command'] == 'MAIL'
+              # Set the argument of "MAIL" command to pseudo To: header of the original message
+              emailparts[1] += sprintf("To: %s\n", e['argument']) if emailparts[1].size == 0
 
-          if readcursor == 0
-            # Beginning of the bounce message or message/delivery-status part
-            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
-            next
+            elsif e['command'] == 'RCPT'
+              # RCPT TO: <...>
+              if v['recipient']
+                # There are multiple recipient addresses in the transcript of session
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              v['recipient'] = e['argument']
+              recipients += 1
+            end
+
+            next if p['reply'].to_i < 400
+            commandset << e['command']
+            v['diagnosis'] ||= p['text'].join(' ')
+            v['replycode'] ||= p['reply']
+            v['status']    ||= p['status']
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
-
-          if f = Sisimai::RFC1894.match(e)
-            # "e" matched with any field defined in RFC3464
-            next unless o = Sisimai::RFC1894.field(e)
-            v = dscontents[-1]
-
-            if o[-1] == 'addr'
-              # Final-Recipient: rfc822; kijitora@example.jp
-              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-              if o[0] == 'final-recipient'
+        else
+          fieldtable = Sisimai::RFC1894.FIELDTABLE
+          readcursor = 0      # (Integer) Points the current cursor position
+
+          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.
+            readslices << e # Save the current line for the next loop
+
+            if readcursor == 0
+              # Beginning of the bounce message or message/delivery-status part
+              readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| Sisimai::String.aligned(e, a) }
+              next
+            end
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
+
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
+              v = dscontents[-1]
+
+              if o[-1] == 'addr'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                  v = dscontents[-1]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                if o[0] == 'final-recipient'
+                  # Final-Recipient: rfc822; kijitora@example.jp
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
-                v['recipient'] = o[2]
-                recipients += 1
+              elsif o[-1] == '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['diagnosis'] = o[2]
               else
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                v['alias'] = o[2]
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable[o[0]]
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f
+                permessage[fieldtable[o[0]]] = o[2]
               end
-            elsif o[-1] == '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['diagnosis'] = o[2]
             else
-              # Other DSN fields defined in RFC3464
-              next unless fieldtable[o[0]]
-              v[fieldtable[o[0]]] = o[2]
+              # If you do so, please include this problem report. You can
+              # delete your own text from the attached returned message.
+              #
+              #           The mail system
+              #
+              # <userunknown@example.co.jp>: host mx.example.co.jp[192.0.2.153] said: 550
+              # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
+              if readslices[-2].start_with?('Diagnostic-Code:') && e.include?(' ')
+                # Continued line of the value of Diagnostic-Code header
+                v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
+                readslices[-1] = 'Diagnostic-Code: ' << e
 
-              next unless f == 1
-              permessage[fieldtable[o[0]]] = o[2]
-            end
-          else
-            # If you do so, please include this problem report. You can
-            # delete your own text from the attached returned message.
-            #
-            #           The mail system
-            #
-            # <userunknown@example.co.jp>: host mx.example.co.jp[192.0.2.153] said: 550
-            # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
-            if readslices[-2].start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-              # Continued line of the value of Diagnostic-Code header
-              v['diagnosis'] << ' ' << cv[1]
-              readslices[-1] = 'Diagnostic-Code: ' << e
-
-            elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
-              # X-Postfix-Sender: rfc822; shironeko@example.org
-              emailsteak[1] << cv[1] << ': ' << cv[2] << "\n"
+              elsif Sisimai::String.aligned(e, ['X-Postfix-Sender:', 'rfc822;', '@'])
+                # X-Postfix-Sender: rfc822; shironeko@example.org
+                emailparts[1] << 'X-Postfix-Sender: ' << Sisimai::Address.s3s4(e[e.index(';') + 1, e.size]) << "\n"
 
-            else
-              if cv = e.match(/[ \t][(]in reply to (?:end of )?([A-Z]{4}).*/) ||
-                 cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                commandset << cv[1]
-                anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] << ' ' << e
               else
                 # Alternative error message and recipient
-                if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)
+                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
+                  anotherset['diagnosis'] ||= ''
+                  anotherset['diagnosis'] << ' ' << e
+
+                elsif Sisimai::String.aligned(e, ['<', '@', '>', '(expanded from<', '):'])
                   # <r@example.ne.jp> (expanded from <kijitora@example.org>): user ...
-                  anotherset['recipient'] = cv[1]
-                  anotherset['alias']     = cv[2]
-                  anotherset['diagnosis'] = cv[3]
+                  p1 = e.index('> ')
+                  p2 = e.index('(expanded from ', p1)
+                  p3 = e.index('>): ', p2 + 14)
+                  anotherset['recipient'] = Sisimai::Address.s3s4(e[0, p1])
+                  anotherset['alias']     = Sisimai::Address.s3s4(e[p2 + 15, p3 - p2 - 15])
+                  anotherset['diagnosis'] = e[p3 + 3, e.size]
 
-                elsif cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:(.*)\z/)
+                elsif e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>:'])
                   # <kijitora@exmaple.jp>: ...
-                  anotherset['recipient'] = cv[1]
-                  anotherset['diagnosis'] = cv[2]
+                  anotherset['recipient'] = Sisimai::Address.s3s4(e[0, e.index('>')])
+                  anotherset['diagnosis'] = e[e.index('>:') + 2, e.size]
 
                 elsif e.include?('--- Delivery report unavailable ---')
                   # postfix-3.1.4/src/bounce/bounce_notify_util.c
@@ -152,16 +192,17 @@ module Sisimai::Lhost
                   # bounce_notify_util.c:602|} else {
                   nomessages = true
                 else
-                  # Get error message continued from the previous line
+                  # Get an error message continued from the previous line
                   next unless anotherset['diagnosis']
-                  if e =~ /\A[ \t]{4}(.+)\z/
+                  if e.start_with?('    ')
                     #    host mx.example.jp said:...
-                    anotherset['diagnosis'] << ' ' << e
+                    anotherset['diagnosis'] << ' ' << e[4, e.size]
                   end
                 end
               end
             end
-          end
+          end # end of while()
+
         end
 
         unless recipients > 0
@@ -171,12 +212,13 @@ module Sisimai::Lhost
             dscontents[-1]['recipient'] = anotherset['recipient']
             recipients += 1
           else
-            # Get a recipient address from message/rfc822 part if the delivery
-            # report was unavailable: '--- Delivery report unavailable ---'
-            if nomessages && cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
-              # Try to get a recipient address from To: field in the original
-              # message at message/rfc822 part
-              dscontents[-1]['recipient'] = Sisimai::Address.s3s4(cv[1])
+            # Get a recipient address from message/rfc822 part if the delivery report was unavailable:
+            # '--- Delivery report unavailable ---'
+            p1 = emailparts[1].index("\nTo: ")     || -1
+            p2 = emailparts[1].index("\n", p1 + 6) || -1
+            if nomessages && p1 > 0
+              # Try to get a recipient address from To: field in the original message at message/rfc822 part
+              dscontents[-1]['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1 + 5, p2 - p1 - 5])
               recipients += 1
             end
           end
@@ -190,50 +232,58 @@ module Sisimai::Lhost
 
           if anotherset['diagnosis']
             # Copy alternative error message
-            e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
+            anotherset['diagnosis'] = Sisimai::String.sweep(anotherset['diagnosis'])
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].nil? || e['diagnosis'].empty?
 
             if e['diagnosis'] =~ /\A\d+\z/
+              # Override the value of diagnostic code message
               e['diagnosis'] = anotherset['diagnosis']
             else
               # More detailed error message is in "anotherset"
-              as = nil  # status
-              ar = nil  # replycode
+              as = '' # status
+              ar = '' # replycode
 
               e['status']    ||= ''
               e['replycode'] ||= ''
 
-              if e['status'] == '' || e['status'].start_with?('4.0.0', '5.0.0')
+              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'])
-                if as && as[-3, 3] != '0.0'
+                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
                 end
               end
 
-              if e['replycode'] == '' || e['replycode'].start_with?('400', '500')
-                # Check the value of SMTP reply code in anotherset
-                ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
-                if ar && ar[-2, 2].to_i != 0
+              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']) || ''
+                if ar.size > 0 && ar.end_with?('00') == false
                   # The SMTP reply code is neither an empty nor *00
                   e['replycode'] = ar
                 end
               end
 
-              if (as || ar) && (anotherset['diagnosis'].size > e['diagnosis'].size)
-                # Update the error message in e['diagnosis']
+              while true
+                # Replace e['diagnosis'] with the value of anotherset['diagnosis'] when all the
+                # following conditions have not matched.
+                break if (as + ar).size == 0
+                break if anotherset['diagnosis'].size < e['diagnosis'].size
+                break if anotherset['diagnosis'].include?(e['diagnosis']) == false
+
                 e['diagnosis'] = anotherset['diagnosis']
+                break
               end
             end
           end
 
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['command']   = commandset.shift || nil
-          e['command'] ||= 'HELO' if e['diagnosis'] =~ /refused to talk to me:/
-          e['spec']    ||= 'SMTP' if e['diagnosis'] =~ /host .+ said:/
+          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:'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Postfix'; end
     end

data/lib/sisimai/lhost/powermta.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::PowerMTA parses a bounce email which created by
-  # amavsid-new. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::PowerMTA parses a bounce email which created by PowerMTA. Methods in the module
+  # are called from only Sisimai::Message.
   module PowerMTA
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/PowerMTA.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      Boundaries = ['Content-Type: text/rfc822-headers'].freeze
       StartingOf = { message: ['Hello, this is the mail server on '] }.freeze
       Categories = {
         'bad-domain'          => 'hostunknown',
@@ -27,23 +26,22 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       # @since v4.25.6
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['subject'].to_s.start_with?('Delivery report')
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         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.
+          # 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
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -82,7 +80,7 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -96,9 +94,9 @@ module Sisimai::Lhost
             #
             #  <kijitora@example.jp>  delivery failed; will not continue trying
             #
-            if cv = e.match(/\AX-PowerMTA-BounceCategory:[ ]*(.+)\z/)
+            if e.start_with?('X-PowerMTA-BounceCategory: ')
               # X-PowerMTA-BounceCategory: bad-mailbox
-              v['category'] = cv[1]
+              v['category'] = e[e.index(':') + 2, e.size]
             end
           end
         end
@@ -111,7 +109,7 @@ module Sisimai::Lhost
           e['reason']    = Categories[e['category']] || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'PowerMTA: https://www.sparkpost.com/powermta/'; end
     end