sisimai 4.25.17-java → 5.0.0-java

data/lib/sisimai/lhost/x3.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown MTA #3.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown MTA #3. Methods in the module
+  # are called from only Sisimai::Message.
   module X3
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X3.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
 
       # Parse bounce messages from Unknown MTA #3
@@ -15,20 +14,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?('Mail Delivery System')
 
+        require 'sisimai/smtp/command'
         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])
@@ -54,29 +54,29 @@ module Sisimai::Lhost
           # ============================================================================
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ \t]+[*][ ]([^ ]+[@][^ ]+)\z/)
+          if e.include?('  * ') && e.include?('@')
             #   * kijitora@example.com
             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['recipient'] = e[e.index(' * ') + 3, e.size]
             recipients += 1
           else
             # Detect error message
-            if cv = e.match(/\ASMTP:([^ ]+)[ ](.+)\z/)
+            if e.start_with?('SMTP:')
               # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
-              v['command'] = cv[1].upcase
-              v['diagnosis'] = cv[2]
+              v['command'] = Sisimai::SMTP::Command.find(e)
+              v['diagnosis'] = e
 
-            elsif cv = e.match(/\ARouting: (.+)/)
+            elsif e.start_with?('Routing: ')
               # Routing: Could not find a gateway for kijitora@example.co.jp
-              v['diagnosis'] = cv[1]
+              v['diagnosis'] = e[9, e.size]
 
-            elsif cv = e.match(/\ADiagnostic-Code: smtp; (.+)/)
+            elsif e.start_with?('Diagnostic-Code: smtp; ')
               # Diagnostic-Code: smtp; 552 5.2.2 Over quota
-              v['diagnosis'] = cv[1]
+              v['diagnosis'] = e[e.index(';') + 2, e.size]
             end
           end
         end
@@ -87,7 +87,7 @@ module Sisimai::Lhost
           e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #3'; end
     end

data/lib/sisimai/lhost/x4.rb

@@ -1,16 +1,14 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X4 parses a bounce email which created by some qmail clone.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X4 parses a bounce email which created by some qmail clone. Methods in the module
+  # are called from only Sisimai::Message.
   module X4
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X4.pm
       # MTA module for qmail clones
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^---[ ](?:Below this line is a copy of the message|Original message follows)[.]/.freeze
-      StartingOf = { error:  ['Remote host said:'] }.freeze
-      MarkingsOf = {
+      Boundaries = ['--- Below this line is a copy of the message.', 'Original message follows.'].freeze
+      StartingOf = {
         #  qmail-remote.c:248|    if (code >= 500) {
         #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
         #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
@@ -18,24 +16,39 @@ 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
-        message: %r{\A(?>
-           He/Her[ ]is[ ]not[ ].+[ ]user
-          |Hi[.][ ].+[ ]unable[ ]to[ ]deliver[ ]your[ ]message[ ]to[ ]
-            the[ ]following[ ]addresses
-          |Su[ ]mensaje[ ]no[ ]pudo[ ]ser[ ]entregado
-          |This[ ]is[ ]the[ ](?:
-             machine[ ]generated[ ]message[ ]from[ ]mail[ ]service
-            |mail[ ]delivery[ ]agent[ ]at
-            )
-          |Unable[ ]to[ ]deliver[ ]message[ ]to[ ]the[ ]following[ ]address
-          |Unfortunately,[ ]your[ ]mail[ ]was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]address:
-          |Your[ ](?:
-             mail[ ]message[ ]to[ ]the[ ]following[ ]address
-            |message[ ]to[ ]the[ ]following[ ]addresses
-            )
-          |We're[ ]sorry[.]
-          )
-        }x,
+        error:   ['Remote host said:'],
+        message: [
+          'He/Her is not ',
+          'unable to deliver your message to the following addresses',
+          'Su mensaje no pudo ser entregado',
+          'This is the machine generated message from mail service',
+          'This is the mail delivery agent at',
+          'Unable to deliver message to the following address',
+          '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.'],
+        # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," 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.'],
+        # 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.'],
+        # 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'],
       }.freeze
 
       ReSMTP = {
@@ -61,18 +74,10 @@ module Sisimai::Lhost
           )
         }x,
       }.freeze
-      # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
-      ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
-        |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
-        |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
-        )
-      }x
 
       # 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.'
-      ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
-      ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4})[ ]/
+      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
@@ -122,30 +127,34 @@ 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)
-        # Pre process email headers and the body part of the message which generated
-        # by qmail, see https://cr.yp.to/qmail.html
+      def inquire(mhead, mbody)
+        # Pre process email headers and the body part of the message which generated 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  = %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/
+        tryto  = [['(qmail ', 'invoked for bounce)'], ['(qmail ', 'invoked from ', 'network)']].freeze
         match  = 0
         match += 1 if mhead['subject'].start_with?('failure notice', 'Permanent Delivery Failure')
-        match += 1 if mhead['received'].any? { |a| a =~ tryto }
+        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) }
+        end
         return nil unless match > 0
 
         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 =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.include?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -157,14 +166,14 @@ module Sisimai::Lhost
           # Giving up on 192.0.2.153.
           v = dscontents[-1]
 
-          if cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ ]*\z/)
+          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
             # <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'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(e[e.index('<'), e.size])
             recipients += 1
 
           elsif dscontents.size == recipients
@@ -175,8 +184,15 @@ module Sisimai::Lhost
             v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
 
             next if v['rhost']
-            next unless cv = e.match(ReHost)
-            v['rhost'] = cv[1]
+            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('.') 
+
+              v['rhost'] = e[p1 + cm, p2 - p1 - cm]
+              break
+            end
           end
         end
         return nil unless recipients > 0
@@ -186,17 +202,16 @@ module Sisimai::Lhost
 
           unless e['command']
             # Get the SMTP command name for the session
-            ReSMTP.each_key do |r|
+            CommandSet.each_key do |r|
               # Verify each regular expression of SMTP commands
-              next unless e['diagnosis'] =~ ReSMTP[r]
+              next unless CommandSet[r].any? { |a| e['diagnosis'].include?(a) }
               e['command'] = r.upcase
               break
             end
 
-            unless e['command']
-              # Verify each regular expression of patches
-              if cv = e['diagnosis'].match(ReCommands) then e['command'] = cv[1].upcase end
-              e['command'] ||= ''
+            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
           end
 
@@ -210,9 +225,8 @@ module Sisimai::Lhost
             e['reason'] = 'blocked'
           else
             # Try to match with each error message in the table
-            if e['diagnosis'] =~ ReIsOnHold
-              # To decide the reason require pattern match with
-              # Sisimai::Reason::* modules
+            if Sisimai::String.aligned(e['diagnosis'], OnHoldPair)
+              # To decide the reason require pattern match with Sisimai::Reason::* modules
               e['reason'] = 'onhold'
             else
               MessagesOf.each_key do |r|
@@ -243,9 +257,10 @@ module Sisimai::Lhost
               end
             end
           end
+          e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #4'; end
     end

data/lib/sisimai/lhost/x5.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X5 parses a bounce email which created by Unknown MTA #5.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X5 parses a bounce email which created by Unknown MTA #5. Methods in the module
+  # are called from only Sisimai::Message.
   module X5
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X5.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Content-Type: message/delivery-status'] }.freeze
 
       # Parse bounce messages from Unknown MTA #5
@@ -15,7 +14,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)
         match  = 0
         match += 1 if mhead['to'].to_s.include?('NotificationRecipients')
         if mhead['from'].include?('TWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0')
@@ -23,20 +22,19 @@ module Sisimai::Lhost
           #       Mail Delivery Subsystem
           mhead['from'].split(' ').each do |f|
             # Check each element of From: header
-            next unless Sisimai::MIME.is_mimeencoded(f)
-            match += 1 if Sisimai::MIME.mimedecode([f]).include?('Mail Delivery Subsystem')
+            next unless Sisimai::RFC2045.is_encoded(f)
+            match += 1 if Sisimai::RFC2045.decodeH([f]).include?('Mail Delivery Subsystem')
             break
           end
         end
 
-        if Sisimai::MIME.is_mimeencoded(mhead['subject'])
+        if Sisimai::RFC2045.is_encoded(mhead['subject'])
           # Subject: =?iso-2022-jp?B?UmV0dXJuZWQgbWFpbDogVXNlciB1bmtub3du?=
-          plain = Sisimai::MIME.mimedecode([mhead['subject']])
+          plain = Sisimai::RFC2045.decodeH([mhead['subject']])
           match += 1 if plain.include?('Mail Delivery Subsystem')
         end
         return nil if match < 2
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         readslices = ['']
@@ -45,14 +43,14 @@ module Sisimai::Lhost
         v = nil
 
         # Pick the second message/rfc822 part because the format of email-x5-*.eml is nested structure
-        prefillets = mbody.split(ReBackbone, 2)
-        prefillets[1].sub!(/\A.+?\n\n/s, '')
-        emailsteak = Sisimai::RFC5322.fillet(prefillets[1], ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        cutsbefore    = mbody.split(Boundaries[0], 2)
+        cutsbefore[1] = cutsbefore[1][cutsbefore[1].index("\n\n") + 2, cutsbefore[1].size]
+        emailparts    = Sisimai::RFC5322.part(cutsbefore[1], Boundaries)
+        bodyslices    = emailparts[0].split("\n")
 
         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
@@ -97,15 +95,15 @@ module Sisimai::Lhost
           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
         return nil unless recipients > 0
 
         dscontents.each { |e| e['diagnosis'] ||= Sisimai::String.sweep(e['diagnosis']) }
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #5'; end
     end

data/lib/sisimai/lhost/x6.rb

@@ -1,14 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X6 parses a bounce email which created by Unknown MTA #6.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X6 parses a bounce email which created by Unknown MTA #6. Methods in the module
+  # are called from only Sisimai::Message.
   module X6
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X6.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^The attachment contains the original mail headers.+$/.freeze
-      MarkingsOf = { message: %r/\A\d+[ ]*error[(]s[)]:/ }.freeze
+      Boundaries = ['The attachment contains the original mail headers'].freeze
+      StartingOf = { message: ['We had trouble delivering your message. Full details follow:'] }.freeze
 
       # Parse bounce messages from Unknown MTA #6
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -16,33 +15,41 @@ 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'].start_with?('There was an error sending your mail')
 
         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 =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
+          # We had trouble delivering your message. Full details follow:
+          #
+          # Subject: 'Nyaan'
+          # Date: 'Thu, 29 Apr 2012 23:34:45 +0000'
+          #          
           # 1 error(s):
           #
           # SMTP Server <mta2.example.jp> rejected recipient <kijitora@examplejp> 
           #   (Error following RCPT command). It responded as follows: [550 5.1.1 User unknown]v = dscontents[-1]
-          v = dscontents[-1]
-          if cv = e.match(/<([^ @]+[@][^ @]+)>/) || e.match(/errors:[ ]*([^ ]+[@][^ ]+)/)
+          v  = dscontents[-1]
+          p1 = e.index('The following recipients returned permanent errors: ')
+          p2 = e.index('SMTP Server <')
+
+          if p1 == 0 || p2 == 0
             # SMTP Server <mta2.example.jp> rejected recipient <kijitora@examplejp> 
             # The following recipients returned permanent errors: neko@example.jp.
             if v['recipient']
@@ -50,22 +57,39 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+
+            if p1 == 0
+              # The following recipients returned permanent errors: neko@example.jp.
+              p1 = e.index('errors: ')
+              p2 = e.index(' ', p1 + 8)
+              v['recipient'] = Sisimai::Address.s3s4(e[p1 + 8, p2 - p1 - 8])
+
+            elsif p2 == 0
+              # SMTP Server <mta2.example.jp> rejected recipient <kijitora@examplejp> 
+              p1 = e.rindex('<')
+              p2 = e.rindex('>')
+              v['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
+
+            else
+              next
+            end
+
             v['diagnosis'] = e
             recipients += 1
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         dscontents.each do |e|
-          if cv = e['diagnosis'].match(/\b(HELO|EHLO|MAIL|RCPT|DATA)\b/)
+          if cv = Sisimai::SMTP::Command.find(e['diagnosis'])
             # ...(Error following RCPT command).
-            e['command'] = cv[1]
+            e['command'] = cv
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #6'; end
     end

data/lib/sisimai/lhost/yahoo.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Yahoo parses a bounce email which created by Yahoo! MAIL.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Yahoo parses a bounce email which created by Yahoo! MAIL. Methods in the module
+  # are called from only Sisimai::Message.
   module Yahoo
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Yahoo.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^--- Below this line is a copy of the message[.]|.freeze
+      Boundaries = ['--- Below this line is a copy of the message.'].freeze
       StartingOf = { message: ['Sorry, we were unable to deliver your message'] }.freeze
 
       # Parse bounce messages from Yahoo! MAIL
@@ -15,23 +14,24 @@ 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-YMailISG: YtyUVyYWLDsbDh...
         # X-YMail-JAS: Pb65aU4VM1mei...
         # X-YMail-OSG: bTIbpDEVM1lHz...
         # X-Originating-IP: [192.0.2.9]
         return nil unless mhead['x-ymailisg']
 
+        require 'sisimai/smtp/command'
         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])
@@ -46,23 +46,24 @@ module Sisimai::Lhost
           # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
           v = dscontents[-1]
 
-          if cv = e.match(/\A[<](.+[@].+)[>]:[ \t]*\z/)
+          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>:'])
             # <kijitora@example.org>:
             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['recipient'] = Sisimai::Address.s3s4(e[0, e.index('>:')])
             v['diagnosis'] = ''
             recipients += 1
+
           else
             if e.start_with?('Remote host said:')
               # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
               v['diagnosis'] = e
 
               # Get SMTP command from the value of "Remote host said:"
-              if cv = e.match(/\[([A-Z]{4}).*\]\z/) then v['command'] = cv[1] end
+              v['command'] = Sisimai::SMTP::Command.find(e)
             else
               # <mailboxfull@example.jp>:
               # Remote host said:
@@ -71,9 +72,9 @@ module Sisimai::Lhost
               if v['diagnosis'].start_with?('Remote host said:')
                 # Remote host said:
                 # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
-                if cv = e.match(/\[([A-Z]{4}).*\]\z/)
+                if cv = Sisimai::SMTP::Command.find(e)
                   # [RCPT_TO]
-                  v['command'] = cv[1]
+                  v['command'] = cv
                 else
                   # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
                   v['diagnosis'] = e
@@ -89,10 +90,10 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
-          e['command'] ||= 'RCPT' if e['diagnosis'] =~ /[<].+[@].+[>]/
+          e['command'] ||= 'RCPT' if Sisimai::String.aligned(e['diagnosis'], ['<', '@', '>'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Yahoo! MAIL: https://www.yahoo.com'; end
     end