sisimai 4.25.4 → 4.25.9

data/lib/sisimai/lhost/mcafee.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['--- The following addresses had delivery problems ---'],
-        rfc822:  ['Content-Type: message/rfc822'],
-      }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['--- The following addresses had delivery problems ---'] }.freeze
       ReFailures = {
         'userunknown' => %r{(?:
            [ ]User[ ][(].+[@].+[)][ ]unknown[.][ ]
@@ -21,22 +19,13 @@ module Sisimai::Lhost
         }x,
       }.freeze
 
-      def description; return 'McAfee Email Appliance'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-nai-header]; end
-
       # Parse bounce messages from McAfee Email Appliance
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
+        # 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'
@@ -44,113 +33,86 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[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
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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 delivery status part
-            if e.include?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.include?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Content-Type: text/plain; name="deliveryproblems.txt"
+          #
+          #    --- The following addresses had delivery problems ---
+          #
+          # <user@example.com>   (User unknown user@example.com)
+          #
+          # --------------Boundary-00=_00000000000000000000
+          # Content-Type: message/delivery-status; name="deliverystatus.txt"
+          #
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>][ \t]+[(](.+)[)]\z/)
+            # <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
-          end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
+            v['recipient'] = cv[1]
+            diagnostic = cv[2]
+            recipients += 1
+
+          elsif f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            o = Sisimai::RFC1894.field(e)
+            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])
+              end
               next
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            next unless fieldtable[o[0]]
+            v[fieldtable[o[0]]] = o[2]
 
-            # Content-Type: text/plain; name="deliveryproblems.txt"
-            #
-            #    --- The following addresses had delivery problems ---
-            #
-            # <user@example.com>   (User unknown user@example.com)
-            #
-            # --------------Boundary-00=_00000000000000000000
-            # Content-Type: message/delivery-status; name="deliverystatus.txt"
-            #
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>][ \t]+[(](.+)[)]\z/)
-              # <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]
-              recipients += 1
-
-            elsif f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              o = Sisimai::RFC1894.field(e)
-              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])
-                end
-                next
-              end
-              next unless fieldtable.key?(o[0])
-              v[fieldtable[o[0]]] = o[2]
-
-            else
-              # Continued line of the value of Diagnostic-Code field
-              next unless p.start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
-              havepassed[-1] = 'Diagnostic-Code: ' << e
-            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]
+            readslices[-1] = 'Diagnostic-Code: ' << e
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-
           ReFailures.each_key do |r|
             # Verify each regular expression of session errors
             next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'McAfee Email Appliance'; end
     end
   end
 end

data/lib/sisimai/lhost/messagelabs.rb

@@ -8,37 +8,24 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['Content-Type: message/delivery-status'],
-        rfc822:  ['Content-Type: text/rfc822-headers'],
-      }.freeze
+      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      StartingOf = { message: ['Content-Type: message/delivery-status'] }.freeze
       ReFailures = {
         'userunknown'   => %r/(?:542 .+ Rejected|No such user)/,
         'securityerror' => %r/Please turn on SMTP Authentication in your mail client/,
       }.freeze
 
-      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
-      # X-Originating-IP: [10.245.230.38]
-      # X-StarScan-Received:
-      # X-StarScan-Version: 6.12.5; banners=-,-,-
-      # X-VirusChecked: Checked
-      def headerlist;  return %w[x-msg-ref]; end
-
       # Parse bounce messages from Symantec.cloud(MessageLabs)
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
+        # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
+        # X-Originating-IP: [10.245.230.38]
+        # X-StarScan-Received:
+        # X-StarScan-Version: 6.12.5; banners=-,-,-
+        # X-VirusChecked: Checked
         return nil unless mhead['x-msg-ref']
         return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
         return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
@@ -48,90 +35,67 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
+        readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            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'
+          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'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                if o[0] == 'final-recipient'
-                  # Final-Recipient: rfc822; kijitora@example.jp
-                  if v['recipient']
-                    # 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]
+                if v['recipient']
+                  # There are multiple recipient addresses in the message body.
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                  v = dscontents[-1]
                 end
-              elsif o[-1] == 'code'
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = o[1]
-                v['diagnosis'] = o[2]
+                v['recipient'] = o[2]
+                recipients += 1
               else
-                # Other DSN fields defined in RFC3464
-                next unless fieldtable.key?(o[0])
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
               end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
             else
-              # Continued line of the value of Diagnostic-Code field
-              next unless p.start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
-              havepassed[-1] = 'Diagnostic-Code: ' << e
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
             end
-          end # End of message/delivery-status
+          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]
+            readslices[-1] = 'Diagnostic-Code: ' << e
+          end
         end
         return nil unless recipients > 0
 
@@ -140,7 +104,6 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['command']   = commandset.shift || ''
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           ReFailures.each_key do |r|
@@ -151,10 +114,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
     end
   end
 end

data/lib/sisimai/lhost/messagingserver.rb

@@ -8,25 +8,15 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)>.freeze
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
-      MarkingsOf = { rfc822: %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)! }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
-      def description; return 'Oracle Communications Messaging Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MessagingServer
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         # :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
         match  = 0
@@ -35,152 +25,127 @@ module Sisimai::Lhost
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        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 delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # --Boundary_(ID_0000000000000000000000)
+          # Content-type: text/plain; charset=us-ascii
+          # Content-language: en-US
+          #
+          # This report relates to a message you sent with the following header fields:
+          #
+          #   Message-id: <CD8C6134-C312-41D5-B083-366F7FA1D752@me.example.com>
+          #   Date: Fri, 21 Nov 2014 23:34:45 +0900
+          #   From: Shironeko <shironeko@me.example.com>
+          #   To: kijitora@example.jp
+          #   Subject: Nyaaaaaaaaaaaaaaaaaaaaaan
+          #
+          # Your message cannot be delivered to the following recipients:
+          #
+          #   Recipient address: kijitora@example.jp
+          #   Reason: Remote SMTP server has rejected address
+          #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
+          #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]+Recipient address:[ \t]*([^ ]+[@][^ ]+)\z/)
+            #   Recipient address: kijitora@example.jp
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            recipients += 1
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+          elsif cv = e.match(/\A[ \t]+Original address:[ \t]*([^ ]+[@][^ ]+)\z/)
+            #   Original address: kijitora@example.jp
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
 
-            # --Boundary_(ID_0000000000000000000000)
-            # Content-type: text/plain; charset=us-ascii
-            # Content-language: en-US
-            #
-            # This report relates to a message you sent with the following header fields:
-            #
-            #   Message-id: <CD8C6134-C312-41D5-B083-366F7FA1D752@me.example.com>
+          elsif cv = e.match(/\A[ \t]+Date:[ \t]*(.+)\z/)
             #   Date: Fri, 21 Nov 2014 23:34:45 +0900
-            #   From: Shironeko <shironeko@me.example.com>
-            #   To: kijitora@example.jp
-            #   Subject: Nyaaaaaaaaaaaaaaaaaaaaaan
-            #
-            # Your message cannot be delivered to the following recipients:
-            #
-            #   Recipient address: kijitora@example.jp
+            v['date'] = cv[1]
+
+          elsif cv = e.match(/\A[ \t]+Reason:[ \t]*(.+)\z/)
             #   Reason: Remote SMTP server has rejected address
+            v['diagnosis'] = cv[1]
+
+          elsif cv = e.match(/\A[ \t]+Diagnostic code:[ \t]*([^ ]+);(.+)\z/)
             #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-            #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]+Recipient address:[ \t]*([^ ]+[@][^ ]+)\z/)
-              #   Recipient address: 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'] = Sisimai::Address.s3s4(cv[1])
-              recipients += 1
-
-            elsif cv = e.match(/\A[ \t]+Original address:[ \t]*([^ ]+[@][^ ]+)\z/)
-              #   Original address: kijitora@example.jp
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-
-            elsif cv = e.match(/\A[ \t]+Date:[ \t]*(.+)\z/)
-              #   Date: Fri, 21 Nov 2014 23:34:45 +0900
-              v['date'] = cv[1]
-
-            elsif cv = e.match(/\A[ \t]+Reason:[ \t]*(.+)\z/)
-              #   Reason: Remote SMTP server has rejected address
-              v['diagnosis'] = cv[1]
-
-            elsif cv = e.match(/\A[ \t]+Diagnostic code:[ \t]*([^ ]+);(.+)\z/)
-              #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-              v['spec'] = cv[1].upcase
-              v['diagnosis'] = cv[2]
-
-            elsif cv = e.match(/\A[ \t]+Remote system:[ ]*dns;([^ ]+)[ ]*([^ ]+)[ ]*.+\z/)
-              #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
-              #     (6jo.example.jp ESMTP SENDMAIL-VM)
-              remotehost = cv[1]  # remote host
-              sessionlog = cv[2]  # smtp session
-              v['rhost'] = remotehost
-
-              # The value does not include ".", use IP address instead.
-              # (TCP|17.111.174.67|47323|192.0.2.225|25)
-              next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
-              v['lhost'] = cv[1]
-              v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
-            else
-              # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
-              # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
-              # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-              #
-              # Original-recipient: rfc822;kijitora@example.jp
-              # Final-recipient: rfc822;kijitora@example.jp
-              # Action: failed
+            v['spec'] = cv[1].upcase
+            v['diagnosis'] = cv[2]
+
+          elsif cv = e.match(/\A[ \t]+Remote system:[ ]*dns;([^ ]+)[ ]*([^ ]+)[ ]*.+\z/)
+            #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
+            #     (6jo.example.jp ESMTP SENDMAIL-VM)
+            remotehost = cv[1]  # remote host
+            sessionlog = cv[2]  # smtp session
+            v['rhost'] = remotehost
+
+            # The value does not include ".", use IP address instead.
+            # (TCP|17.111.174.67|47323|192.0.2.225|25)
+            next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
+            v['lhost'] = cv[1]
+            v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
+          else
+            # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
+            # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
+            # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
+            #
+            # Original-recipient: rfc822;kijitora@example.jp
+            # Final-recipient: rfc822;kijitora@example.jp
+            # Action: failed
+            # Status: 5.1.1 (Remote SMTP server has rejected address)
+            # Remote-MTA: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
+            #  (6jo.example.jp ESMTP SENDMAIL-VM)
+            # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
+            #
+            if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
               # Status: 5.1.1 (Remote SMTP server has rejected address)
-              # Remote-MTA: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
-              #  (6jo.example.jp ESMTP SENDMAIL-VM)
-              # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-              #
-              if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
-                # Status: 5.1.1 (Remote SMTP server has rejected address)
-                v['status'] = cv[1]
-                v['diagnosis'] ||= cv[2]
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-                v['date'] ||= cv[1]
-
-              elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
-                localhost = cv[1]
-                v['lhost'] ||= localhost
-                v['lhost']   = localhost unless v['lhost'] =~ /[^.]+[.][^ ]+/
-              end
+              v['status'] = cv[1]
+              v['diagnosis'] ||= cv[2]
+
+            elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
+              # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
+              v['date'] ||= cv[1]
+
+            elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
+              localhost = cv[1]
+              v['lhost'] ||= localhost
+              v['lhost']   = localhost unless v['lhost'] =~ /[^.]+[.][^ ]+/
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Oracle Communications Messaging Server'; end
     end
   end
 end