sisimai 4.25.4 → 4.25.9

data/lib/sisimai/lhost/office365.rb

@@ -8,18 +8,30 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
-        rfc822: ['Content-Type: message/rfc822'],
         error:  ['Diagnostic information for administrators:'],
         eoerr:  ['Original message headers:'],
       }.freeze
       MarkingsOf = {
+        eoe:     %r/\A(?:Original[ ][Mm]essage[ ][Hh]eaders:?|Message[ ]Hops)/,
+        error:   %r/\A(?:Diagnostic[ ]information[ ]for[ ]administrators:|Error[ ]Details)/,
         message: %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
+          |Original[ ]Message[ ]Details
           |.+[ ]rejected[ ]your[ ]message[ ]to[ ]the[ ]following[ ]e[-]?mail[ ]addresses:
           )
         }x,
       }.freeze
+      Headers365 = %w[
+        x-ms-exchange-message-is-ndr
+        x-microsoft-antispam-prvs
+        x-exchange-antispam-report-test
+        x-exchange-antispam-report-cfa-test
+        x-ms-exchange-crosstenant-originalarrivaltime
+        x-ms-exchange-crosstenant-fromentityheader
+        x-ms-exchange-transport-crosstenantheadersstamped
+      ]
       StatusList = {
         # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
         %r/\A4[.]4[.]7\z/        => 'expired',
@@ -28,6 +40,8 @@ module Sisimai::Lhost
         %r/\A4[.]7[.]26\z/       => 'securityerror',
         %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
         %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
+        %r/\A5[.]0[.]350\z/      => 'contenterror',
+        %r/\A5[.]1[.]10\z/       => 'userunknown',
         %r/\A5[.]4[.]1\z/        => 'norelaying',
         %r/\A5[.]4[.]312\z/      => 'networkerror',
         %r/\A5[.]4[.]316\z/      => 'expired',
@@ -37,6 +51,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]1[23]\z/    => 'rejected',
         %r/\A5[.]7[.]124\z/      => 'rejected',
         %r/\A5[.]7[.]13[3-6]\z/  => 'rejected',
+        %r/\A5[.]7[.]23\z/       => 'blocked',
         %r/\A5[.]7[.]25\z/       => 'networkerror',
         %r/\A5[.]7[.]50[1-3]\z/  => 'spamdetected',
         %r/\A5[.]7[.]50[4-5]\z/  => 'filtered',
@@ -46,6 +61,7 @@ module Sisimai::Lhost
         %r/\A5[.]7[.]510\z/      => 'notaccept',
         %r/\A5[.]7[.]511\z/      => 'rejected',
         %r/\A5[.]7[.]512\z/      => 'securityerror',
+        %r/\A5[.]7[.]57\z/       => 'securityerror',
         %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
@@ -54,10 +70,12 @@ module Sisimai::Lhost
         RCPT: %r/unknown recipient or mailbox unavailable ->.+[<]?.+[@].+[.][a-zA-Z]+[>]?/,
       }.freeze
 
-      def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      def headerlist
+      # Parse bounce messages from Microsoft Office 365
+      # @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-MS-Exchange-Message-Is-Ndr:
         # X-Microsoft-Antispam-PRVS: <....@...outlook.com>
         # X-Exchange-Antispam-Report-Test: UriScan:;
@@ -65,40 +83,14 @@ module Sisimai::Lhost
         # X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2015 23:34:45.6789 (JST)
         # X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
         # X-MS-Exchange-Transport-CrossTenantHeadersStamped: ...
-        return %w[
-          content-language
-          x-ms-exchange-message-is-ndr
-          x-microsoft-antispam-prvs
-          x-exchange-antispam-report-test
-          x-exchange-antispam-report-cfa-test
-          x-ms-exchange-crosstenant-originalarrivaltime
-          x-ms-exchange-crosstenant-fromentityheader
-          x-ms-exchange-transport-crosstenantheadersstamped
-        ]
-      end
-
-      # Parse bounce messages from Microsoft Office 365
-      # @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
-      def make(mhead, mbody)
         tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
         match += 1 if mhead['subject'].include?('Undeliverable:')
-        match += 1 if mhead['x-ms-exchange-message-is-ndr']
-        match += 1 if mhead['x-microsoft-antispam-prvs']
-        match += 1 if mhead['x-exchange-antispam-report-test']
-        match += 1 if mhead['x-exchange-antispam-report-cfa-test']
-        match += 1 if mhead['x-ms-exchange-crosstenant-originalarrivaltime']
-        match += 1 if mhead['x-ms-exchange-crosstenant-fromentityheader']
-        match += 1 if mhead['x-ms-exchange-transport-crosstenantheadersstamped']
+        Headers365.each do |e|
+          next if mhead[e].nil?
+          next if mhead[e].empty?
+          match += 1
+        end
         match += 1 if mhead['received'].any? { |a| a =~ tryto }
         if mhead['message-id']
           # Message-ID: <00000000-0000-0000-0000-000000000000@*.*.prod.outlook.com>
@@ -109,11 +101,9 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
-
         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
         connheader = {}
@@ -121,85 +111,71 @@ module Sisimai::Lhost
         htmlbegins = false  # (Boolean) Flag for HTML part
         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 =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            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?
+
+          # kijitora@example.com<mailto:kijitora@example.com>
+          # The email address wasn't found at the destination domain. It might
+          # be misspelled or it might not exist any longer. Try retyping the
+          # address and resending the message.
+          #
+          # Original Message Details
+          # Created Date:   4/29/2017 6:40:30 AM
+          # Sender Address: neko@example.jp
+          # Recipient Address:      kijitora@example.org
+          # Subject:        Nyaan#
+          v = dscontents[-1]
+
+          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/) ||
+                  e.match(/\ARecipient[ ]Address:[ ]+(.+)\z/)
+            # kijitora@example.com<mailto:kijitora@example.com>
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] = 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
+          elsif cv = e.match(/\AGenerating server: (.+)\z/)
+            # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
+            connheader['lhost'] = cv[1].downcase
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # kijitora@example.com<mailto:kijitora@example.com>
-            # The email address wasn't found at the destination domain. It might
-            # be misspelled or it might not exist any longer. Try retyping the
-            # address and resending the message.
-            v = dscontents[-1]
-
-            if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
-              # kijitora@example.com<mailto: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]
-              recipients += 1
-
-            elsif cv = e.match(/\AGenerating server: (.+)\z/)
-              # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
-              connheader['lhost'] = cv[1].downcase
+            if endoferror
+              # After "Original message headers:"
+              next unless f = Sisimai::RFC1894.match(e)
+              next unless o = Sisimai::RFC1894.field(e)
+              next unless fieldtable[o[0]]
+              next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
             else
-              if endoferror
-                # After "Original message headers:"
-                next unless f = Sisimai::RFC1894.match(e)
-                next unless o = Sisimai::RFC1894.field(e)
-                next unless fieldtable.key?(o[0])
-                next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+              if e =~ MarkingsOf[:error]
+                # Diagnostic information for administrators:
+                v['diagnosis'] = e
               else
-                if e == StartingOf[:error][0]
-                  # Diagnostic information for administrators:
-                  v['diagnosis'] = e
-                else
-                  # kijitora@example.com
-                  # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
-                  # t not found by SMTP address lookup'
-                  next unless v['diagnosis']
-                  if e == StartingOf[:eoerr][0]
-                    # Original message headers:
-                    endoferror = true
-                    next
-                  end
-                  v['diagnosis'] << ' ' << e
+                # kijitora@example.com
+                # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
+                # t not found by SMTP address lookup'
+                next unless v['diagnosis']
+                if e =~ MarkingsOf[:eoe]
+                  # Original message headers:
+                  endoferror = true
+                  next
                 end
+                v['diagnosis'] << ' ' << e
               end
             end
-
           end
         end
         return nil unless recipients > 0
@@ -208,10 +184,8 @@ module Sisimai::Lhost
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['status']  ||= ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
           if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
             e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
@@ -233,10 +207,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 'Microsoft Office 365: https://office.microsoft.com/'; end
     end
   end
 end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -7,6 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^[ ]+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/
@@ -34,7 +35,6 @@ module Sisimai::Lhost
         #   bounce.c/338:    "    Your message was relayed to these recipients.\n\n";
         #   bounce.c/339:
         message: ['    This is the MAILER-DAEMON, please DO NOT REPLY to this '],
-        rfc822:  ['    Below is a copy of the original message:'],
       }.freeze
       MessagesOf = {
         # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
@@ -65,108 +65,72 @@ module Sisimai::Lhost
         'securityerror' => ['Could not retrieve credentials'],
       }.freeze
 
-      def description; return 'OpenSMTPD'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from OpenSMTPD
-      # @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)
         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]
-        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
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          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?
+          #    Hi!
+          #
+          #    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.
+          #
+          #    An error has occurred while attempting to deliver a message for
+          #    the following list of recipients:
+          #
+          # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
+          #
+          #    Below is a copy of the original message:
+          v = dscontents[-1]
 
-            #    Hi!
-            #
-            #    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.
-            #
-            #    An error has occurred while attempting to deliver a message for
-            #    the following list of recipients:
-            #
+          if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\z/)
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
-            #
-            #    Below is a copy of the original message:
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\z/)
-              # 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]
-              recipients += 1
+            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]
+            recipients += 1
           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 'OpenSMTPD'; end
     end
   end
 end

data/lib/sisimai/lhost/outlook.rb

@@ -8,35 +8,21 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This is an automatically generated Delivery Status Notification'],
-        rfc822:  ['Content-Type: message/rfc822'],
-      }.freeze
+      ReBackbone = %r|^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'],
         'userunknown' => ['Requested action not taken: mailbox unavailable'],
       }.freeze
 
-      def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
-      # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
-      def headerlist;  return %w[x-message-delivery x-message-info]; end
-
       # Parse bounce messages from Microsoft Outlook.com
-      # @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)
-        # :from => %r/postmaster[@]/,
+        # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
+        # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
         match  = 0
         match += 1 if mhead['subject'].start_with?('Delivery Status Notification')
         match += 1 if mhead['x-message-delivery']
@@ -49,89 +35,66 @@ 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
         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,9 +103,7 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
-
           if e['diagnosis'].empty?
             # No message in 'diagnosis'
             if e['action'] == 'delayed'
@@ -163,10 +124,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 'Microsoft Outlook.com: https://www.outlook.com/'; end
     end
   end
 end