sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/lhost/kddi.rb

@@ -1,20 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::KDDI parses a bounce email which created by au by KDDI.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::KDDI parses a bounce email which created by au by KDDI. Methods in the module are
+  # called from only Sisimai::Message.
   module KDDI
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/KDDI.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
-      MarkingsOf = {
-        message: %r/\AYour[ ]mail[ ](?:
-             sent[ ]on:?[ ][A-Z][a-z]{2}[,]
-            |attempted[ ]to[ ]be[ ]delivered[ ]on:?[ ][A-Z][a-z]{2}[,]
-            )
-        /x,
-      }.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
+      MarkingsOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
       MessagesOf = {
         'mailboxfull' => ['As their mailbox is full'],
         'norelaying'  => ['Due to the following SMTP relay error'],
@@ -26,35 +19,35 @@ 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)
         # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
-        match += 1 if mhead['from'] =~ /no-reply[@].+[.]dion[.]ne[.]jp/
+        match += 1 if Sisimai::String.aligned(mhead['from'], ['no-reply@.', '.dion.ne.jp'])
         match += 1 if mhead['reply-to'].to_s == 'no-reply@app.auone-net.jp'
         match += 1 if mhead['received'].any? { |a| a.include?('ezweb.ne.jp (') }
         match += 1 if mhead['received'].any? { |a| a.include?('.au.com (') }
         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 MarkingsOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
           v = dscontents[-1]
-          if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
+          if e.include?(' Could not be delivered to: <')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
             #     Could not be delivered to: <******@**.***.**>
             #     As their mailbox is full.
@@ -63,24 +56,26 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            r = Sisimai::Address.s3s4(cv[1])
-            next unless Sisimai::RFC5322.is_emailaddress(r)
+            r = Sisimai::Address.s3s4(e[e.index('<') + 1, e.size])
+            next unless Sisimai::Address.is_emailaddress(r)
             v['recipient'] = r
             recipients += 1
 
-          elsif cv = e.match(/Your mail sent on: (.+)\z/)
+          elsif e.include?('Your mail sent on: ')
             # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-            v['date'] = cv[1]
+            v['date'] = e[19, e.size]
           else
             #     As their mailbox is full.
             v['diagnosis'] ||= ''
-            v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
+            v['diagnosis'] << e + ' ' if e.start_with?(' ')
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by KDDI)
@@ -88,8 +83,7 @@ module Sisimai::Lhost
             e['reason'] = 'filtered'
           else
             if e['command'] == 'RCPT'
-              # set "userunknown" when the remote server rejected after RCPT
-              # command.
+              # set "userunknown" when the remote server rejected after RCPT command.
               e['reason'] = 'userunknown'
             else
               # SMTP command is not RCPT
@@ -104,7 +98,7 @@ module Sisimai::Lhost
 
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailFoundry parses a bounce email which created by
-  # MailFoundry. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MailFoundry parses a bounce email which created by MailFoundry. Methods in the
+  # module are called from only Sisimai::Message.
   module MailFoundry
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MailFoundry.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {
         message: ['Unable to deliver message to:'],
         error:   ['Delivery failed for the following reason:'],
@@ -18,20 +17,20 @@ 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'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
 
         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,14 +45,14 @@ module Sisimai::Lhost
           # This has been a permanent failure. No further delivery attempts will be made.
           v = dscontents[-1]
 
-          if cv = e.match(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)
+          if e.start_with?('Unable to deliver message to: <') && e.index('@') > 1
             # Unable to deliver message to: <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'] = e[e.index('<'), e.size]
             recipients += 1
           else
             # Error message
@@ -74,7 +73,7 @@ module Sisimai::Lhost
         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 'MailFoundry'; end
     end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailMarshalSMTP parses a bounce email which created
-  # by Trustwave Secure Email Gateway: formerly MailMarshal SMTP. Methods in
-  # the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MailMarshalSMTP parses a bounce email which created by Trustwave Secure Email
+  # Gateway: formerly MailMarshal SMTP. Methods in the module are called from only Sisimai::Message.
   module MailMarshalSMTP
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MailMarshalSMTP.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^[ \t]*[+]+[ \t]*/.freeze
+      Boundaries = ['+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++']
       StartingOf = {
         message: ['Your message:'],
         error:   ['Could not be delivered because of'],
@@ -20,26 +18,19 @@ 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?('Undeliverable 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
         endoferror = false  # (Boolean) Flag for the end of error message
         regularexp = nil
+        q = Sisimai::RFC2045.boundary(mhead['content-type'], 1); Boundaries << q if q
         v = nil
 
-        boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
-        regularexp = if boundary00.size > 0
-                       # Convert to regular expression
-                       Regexp.new('\A' << Regexp.escape(boundary00) << '\z')
-                     else
-                       regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
-                     end
-
         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.
@@ -61,7 +52,7 @@ module Sisimai::Lhost
           #    dummyuser@blabla.xxxxxxxxxxxx.com
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ ]{4}([^ ]+[@][^ ]+)\z/)
+          if e.start_with?('    ') && e.index('@') > 1
             # The following recipients were affected:
             #    dummyuser@blabla.xxxxxxxxxxxx.com
             if v['recipient']
@@ -69,7 +60,7 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = e[4, e.size]
             recipients += 1
           else
             # Get error message lines
@@ -93,24 +84,29 @@ module Sisimai::Lhost
               # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
               # MessageName:        <B549996730000.000000000001.0003.mml>
               # Last-Attempt-Date:  <16:21:07 seg, 22 Dezembro 2014>
-              if cv = e.match(/\AOriginal Sender:[ \t]+[<](.+)[>]\z/)
+              p1 = e.index('<')
+              p2 = e.index('>')
+              if e.start_with?('Original Sender: ')
                 # Original Sender:    <originalsender@example.com>
-                # Use this line instead of "From" header of the original
-                # message.
-                emailsteak[1] << ('From: ' << cv[1] << "\n")
+                # Use this line instead of "From" header of the original message.
+                emailparts[1] << ('From: ' << e[p1 + 1, p2 - p1 - 1] << "\n")
 
-              elsif cv = e.match(/\ASender-MTA:[ \t]+[<](.+)[>]\z/)
+              elsif e.start_with?('Sender-MTA: ')
                 # Sender-MTA:         <10.11.12.13>
-                v['lhost'] = cv[1]
+                v['lhost'] = e[p1 + 1, p2 - p1 - 1]
 
-              elsif cv = e.match(/\AReporting-MTA:[ \t]+[<](.+)[>]\z/)
+              elsif e.start_with?('Reporting-MTA: ')
                 # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
-                v['rhost'] = cv[1]
+                v['rhost'] = e[p1 + 1, p2 - p1 - 1]
 
-              elsif cv = e.match(/\A\s+(From|Subject):\s*(.+)\z/)
+              elsif e.include?(' From:') || e.include?(' Subject:')
                 #    From:    originalsender@example.com
                 #    Subject: ...
-                emailsteak[1] << sprintf("%s: %s\n", cv[1], cv[2])
+                p1 = e.index(' From:') || e.index(' Subject:')
+                p2 = e.index(':')
+                cf = e[p1 + 1, p2 - p1 - 1]
+                cv = Sisimai::String.sweep(e[p2 + 1, e.size])
+                emailparts[1] << sprintf("%s: %s\n", cf, cv)
               end
             end
           end
@@ -118,7 +114,7 @@ module Sisimai::Lhost
         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 'Trustwave Secure Email Gateway'; end
     end

data/lib/sisimai/lhost/mailru.rb

@@ -1,14 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MailRu parses a bounce email which created by @mail.ru.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MailRu parses a bounce email which created by @mail.ru. Methods in the module are
+  # called from only Sisimai::Message.
   module MailRu
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MailRu.pm
       # Based on Sisimai::Lhost::Exim
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^------ This is a copy of the message, including all the headers[.] ------|.freeze
+      Boundaries = ['------ This is a copy of the message, including all the headers. ------'].freeze
       StartingOf = { message: ['This message was created automatically by mail delivery software.'] }.freeze
       ReCommands = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
@@ -50,30 +49,31 @@ 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['from'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
-        return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
-        return nil unless mhead['subject'] =~ %r{(?:
-           Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
-          |Delivery[ ]Status[ ]Notification
-          |Mail[ ]failure
-          |Message[ ]frozen
-          |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
-          )
-        }x
+      def inquire(mhead, mbody)
+        mfrom  = mhead['from'].downcase
+        msgid  = mhead['message-id'] ? mhead['message-id'].downcase : ''
+        match  = 0
+        match += 1 if mfrom.include?('mailer-daemon@') && mfrom.include?('mail.ru')
+        match += 1 if msgid.end_with?('.mail.ru>', 'smailru.net>')
+        match += 1 if [
+          '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 unless match > 2
 
         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
-        localhost0 = ''     # (String) Local MTA
         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])
@@ -102,14 +102,14 @@ module Sisimai::Lhost
           #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ \t]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)\z/)
+          if e.start_with?('  ') && e.include?('    ') == false && e.index('@') > 1
             #   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'] = e[2, e.size]
             recipients += 1
 
           elsif dscontents.size == recipients
@@ -120,7 +120,7 @@ module Sisimai::Lhost
           else
             # Error message when email address above does not include '@'
             # and domain part.
-            next unless e.start_with?('    ', "\t")
+            next unless e.start_with?('    ')
             v['alterrors'] ||= ''
             v['alterrors'] << e + ' '
           end
@@ -144,16 +144,13 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        unless mhead['received'].empty?
-          # Get the name of local MTA
-          # Received: from marutamachi.example.org (c192128.example.net [192.0.2.128])
-          if cv = mhead['received'][-1].match(/from[ \t]([^ ]+)/) then localhost0 = cv[1] end
-        end
+        # Get the name of the local MTA
+        # Received: from marutamachi.example.org (c192128.example.net [192.0.2.128])
+        receivedby = mhead['received'] || []
+        recvdtoken = Sisimai::RFC5322.received(receivedby[-1])
 
         dscontents.each do |e|
-          # Set default values if each value is empty.
-          e['lhost'] ||= localhost0
-
+          # Check the error message, the rhost, the lhost, and the smtp command.
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
@@ -164,18 +161,18 @@ module Sisimai::Lhost
             e.delete('alterrors')
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-          e['diagnosis'].sub!(/\b__.+\z/, '')
+          p1 = e['diagnosis'].rindex('__') || -1
+          e['diagnosis'] = e['diagnosis'][0, p1 - 1] if p1 > 2
 
           unless e['rhost']
             # Get the remote host name
             # host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            if cv = e['diagnosis'].match(/host[ ]+([^ \t]+)[ ]\[.+\]:[ ]/) then e['rhost'] = cv[1] end
-
-            unless e['rhost']
-              # Get localhost and remote host name from Received header.
-              e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop unless mhead['received'].empty?
-            end
+            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]
           end
+          e['lhost'] ||= recvdtoken[0]
 
           unless e['command']
             # Get the SMTP command name for the session
@@ -208,7 +205,7 @@ module Sisimai::Lhost
           e['command'] ||= ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return '@mail.ru: https://mail.ru'; end
     end

data/lib/sisimai/lhost/mcafee.rb

@@ -1,49 +1,39 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::McAfee parses a bounce email which created by McAfee
-  # Email Appliance. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::McAfee parses a bounce email which created by McAfee Email Appliance. Methods in
+  # the module are called from only Sisimai::Message.
   module McAfee
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/McAfee.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['--- The following addresses had delivery problems ---'] }.freeze
-      ReFailures = {
-        'userunknown' => %r{(?:
-           [ ]User[ ][(].+[@].+[)][ ]unknown[.][ ]
-          |550[ ]Unknown[ ]user[ ][^ ]+[@][^ ]+
-          |550[ ][<].+?[@].+?[>][.]+[ ]User[ ]not[ ]exist
-          |No[ ]such[ ]user
-          )
-        }x,
-      }.freeze
+      MessagesOf = { 'userunknown' => [' User not exist', ' unknown.', '550 Unknown user ', 'No such user'] }.freeze
 
       # Parse bounce messages from McAfee Email Appliance
       # @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
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-NAI-Header: Modified by McAfee Email and Web Security Virtual Appliance
         return nil unless mhead['x-nai-header']
         return nil unless mhead['x-nai-header'].start_with?('Modified by McAfee ')
         return nil unless mhead['subject'] == 'Delivery Status'
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         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
-        diagnostic = ''     # (String) Alternative diagnostic message
+        issuedcode = ''     # (String) Alternative diagnostic message
         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
@@ -65,15 +55,15 @@ module Sisimai::Lhost
           #
           v = dscontents[-1]
 
-          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>][ \t]+[(](.+)[)]\z/)
+          if Sisimai::String.aligned(e, ['<', '@', '>', '(', ')'])
             # <kijitora@example.co.jp>   (Unknown user kijitora@example.co.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]
-            diagnostic = cv[2]
+            v['recipient'] = Sisimai::Address.s3s4(e[e.index('<'), e.index('>')])
+            issuedcode = e[e.index('(') + 1, e.size]
             recipients += 1
 
           elsif f = Sisimai::RFC1894.match(e)
@@ -82,8 +72,8 @@ module Sisimai::Lhost
             unless o
               # Fallback code for empty value or invalid formatted value
               # - Original-Recipient: <kijitora@example.co.jp>
-              if cv = e.match(/\AOriginal-Recipient:[ ]*([^ ]+)\z/)
-                v['alias'] = Sisimai::Address.s3s4(cv[1])
+              if e.start_with?('Original-Recipient: ')
+                v['alias'] = Sisimai::Address.s3s4(e[e.index(':') + 1, e.size])
               end
               next
             end
@@ -93,24 +83,24 @@ 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 do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-          ReFailures.each_key do |r|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || issuedcode)
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'McAfee Email Appliance'; end
     end