sisimai 4.25.2-java → 4.25.8-java

data/lib/sisimai/lhost/interscanmss.rb

@@ -0,0 +1,88 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::InterScanMSS parses a bounce email which created by
+  # Trend Micro InterScan Messaging Security Suite. Methods in the module are
+  # called from only Sisimai::Message.
+  module InterScanMSS
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
+      require 'sisimai/lhost'
+      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
+
+      # Parse bounce messages from InterScanMSS
+      # @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/[ ][(]InterScanMSS[)][ ]with[ ]/,
+        match = 0
+        tryto = [
+          'Mail could not be delivered',
+          'メッセージを配信できません。',
+          'メール配信に失敗しました',
+        ]
+        match += 1 if mhead['from'].start_with?('"InterScan MSS"')
+        match += 1 if mhead['from'].start_with?('"InterScan Notification"')
+        match += 1 if tryto.any? { |a| mhead['subject'] == a }
+        return nil unless match > 0
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
+        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.
+          next if e.empty?
+
+          v = dscontents[-1]
+          if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
+                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)   ||
+                  e.match(/\A(?:Reason:[ ]+)?Unable[ ]to[ ]deliver[ ]message[ ]to[ ][<](.+)[>]/)
+            # Sent <<< RCPT TO:<kijitora@example.co.jp>
+            # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            # Unable to deliver message to <kijitora@neko.example.jp>
+            if v['recipient'] && cv[1] != 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'] = e if e =~ /Unable[ ]to[ ]deliver[ ]/
+            recipients = dscontents.size
+          end
+
+          if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
+            # Sent <<< RCPT TO:<kijitora@example.co.jp>
+            v['command'] = cv[1]
+
+          elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
+            # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            v['diagnosis'] = cv[1]
+          else
+            # Error message in non-English
+            if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
+              # >>> RCPT TO ...
+              v['command'] = cv[1]
+
+            elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
+              # <<< 550 5.1.1 User unknown
+              v['diagnosis'] = cv[1]
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['reason'] = 'userunknown' if e['diagnosis'] =~ /Unable[ ]to[ ]deliver/
+        end
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/kddi.rb

@@ -0,0 +1,113 @@
+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.
+  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
+      MessagesOf = {
+        'mailboxfull' => ['As their mailbox is full'],
+        'norelaying'  => ['Due to the following SMTP relay error'],
+        'hostunknown' => ['As the remote domain doesnt exist'],
+      }.freeze
+
+      # Parse bounce messages from au by KDDI
+      # @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)
+        # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
+        match  = 0
+        match += 1 if 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")
+        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.
+          if readcursor == 0
+            # Beginning of the bounce message or delivery status part
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            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: [<]([^ ]+[@][^ ]+)[>]/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            #     Could not be delivered to: <******@**.***.**>
+            #     As their mailbox is full.
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            r = Sisimai::Address.s3s4(cv[1])
+            next unless Sisimai::RFC5322.is_emailaddress(r)
+            v['recipient'] = r
+            recipients += 1
+
+          elsif cv = e.match(/Your mail sent on: (.+)\z/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            v['date'] = cv[1]
+          else
+            #     As their mailbox is full.
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+
+          if mhead['x-spasign'].to_s == 'NG'
+            # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by KDDI)
+            # Filtered recipient returns message that include 'X-SPASIGN' header
+            e['reason'] = 'filtered'
+          else
+            if e['command'] == 'RCPT'
+              # set "userunknown" when the remote server rejected after RCPT
+              # command.
+              e['reason'] = 'userunknown'
+            else
+              # SMTP command is not RCPT
+              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
+            end
+          end
+
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'au by KDDI: https://www.au.kddi.com'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/mailfoundry.rb

@@ -0,0 +1,83 @@
+module Sisimai::Lhost
+  # 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
+      StartingOf = {
+        message: ['This is a MIME encoded message'],
+        error:   ['Delivery failed for the following reason:'],
+      }.freeze
+
+      # Parse bounce messages from MailFoundry
+      # @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'] == '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")
+        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.
+          if readcursor == 0
+            # Beginning of the bounce message or delivery status part
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Unable to deliver message to: <kijitora@example.org>
+          # Delivery failed for the following reason:
+          # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
+          #
+          # 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/)
+            # 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]
+            recipients += 1
+          else
+            # Error message
+            if e == StartingOf[:error][0]
+              # Delivery failed for the following reason:
+              v['diagnosis'] = e
+            else
+              # Detect error message
+              next if e.empty?
+              next if v['diagnosis'].nil? || v['diagnosis'].empty?
+              next if e.start_with?('-')
+
+              # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
+              v['diagnosis'] << ' ' << e
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'MailFoundry'; end
+    end
+  end
+end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -0,0 +1,127 @@
+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.
+  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
+      StartingOf = {
+        message: ['Your message:'],
+        error:   ['Could not be delivered because of'],
+        rcpts:   ['The following recipients were affected:'],
+      }.freeze
+
+      # Parse bounce messages from MailMarshalSMTP
+      # @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?('Undeliverable Mail: "')
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
+        endoferror = false  # (Boolean) Flag for the end of error message
+        regularexp = nil
+        v = nil
+
+        boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
+        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.
+          if readcursor == 0
+            # Beginning of the bounce message or delivery status part
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+
+          # Your message:
+          #    From:    originalsender@example.com
+          #    Subject: IIdentifica蟾ｽ驕俳
+          #
+          # Could not be delivered because of
+          #
+          # 550 5.1.1 User unknown
+          #
+          # The following recipients were affected:
+          #    dummyuser@blabla.xxxxxxxxxxxx.com
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ ]{4}([^ ]+[@][^ ]+)\z/)
+            # The following recipients were affected:
+            #    dummyuser@blabla.xxxxxxxxxxxx.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
+          else
+            # Get error message lines
+            if e == StartingOf[:error][0]
+              # Could not be delivered because of
+              #
+              # 550 5.1.1 User unknown
+              v['diagnosis'] = e
+
+            elsif !v['diagnosis'].to_s.empty? && endoferror == false
+              # Append error messages
+              endoferror = true if e.start_with?(StartingOf[:rcpts][0])
+              next if endoferror
+              v['diagnosis'] << ' ' << e
+            else
+              # Additional Information
+              # ======================
+              # Original Sender:    <originalsender@example.com>
+              # Sender-MTA:         <10.11.12.13>
+              # Remote-MTA:         <10.0.0.1>
+              # 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/)
+                # Original Sender:    <originalsender@example.com>
+                # Use this line instead of "From" header of the original
+                # message.
+                emailsteak[1] << ('From: ' << cv[1] << "\n")
+
+              elsif cv = e.match(/\ASender-MTA:[ \t]+[<](.+)[>]\z/)
+                # Sender-MTA:         <10.11.12.13>
+                v['lhost'] = cv[1]
+
+              elsif cv = e.match(/\AReporting-MTA:[ \t]+[<](.+)[>]\z/)
+                # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
+                v['rhost'] = cv[1]
+
+              elsif cv = e.match(/\A\s+(From|Subject):\s*(.+)\z/)
+                #    From:    originalsender@example.com
+                #    Subject: ...
+                emailsteak[1] << sprintf("%s: %s\n", cv[1], cv[2])
+              end
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Trustwave Secure Email Gateway'; end
+    end
+  end
+end
+

data/lib/sisimai/{bite/email → lhost}/mailru.rb

@@ -1,18 +1,15 @@
-module Sisimai::Bite::Email
-  # Sisimai::Bite::Email::MailRu parses a bounce email which created by @mail.ru.
+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.
   module MailRu
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailRu.pm
-      # Based on Sisimai::Bite::Email::Exim
-      require 'sisimai/bite/email'
-
-      Indicators = Sisimai::Bite::Email.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software.'],
-        rfc822:  ['------ This is a copy of the message, including all the headers. ------'],
-      }.freeze
+      # 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
+      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})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
@@ -48,22 +45,12 @@ module Sisimai::Bite::Email
         'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
-      def description; return '@mail.ru: https://mail.ru'; end
-      def smtpagent;   return Sisimai::Bite.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from @mail.ru
-      # @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 scan(mhead, mbody)
+      # @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['from'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
         return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
         return nil unless mhead['subject'] =~ %r{(?:
@@ -76,87 +63,66 @@ module Sisimai::Bite::Email
           )
         }x
 
-        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
         localhost0 = ''     # (String) Local MTA
         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 == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Это письмо создано автоматически
+          # сервером Mail.Ru, # отвечать на него не
+          # нужно.
+          #
+          # К сожалению, Ваше письмо не может
+          # быть# доставлено одному или нескольким
+          # получателям:
+          #
+          # **********************
+          #
+          # This message was created automatically by mail delivery software.
+          #
+          # A message that you sent could not be delivered to one or more of its
+          # recipients. This is a permanent error. The following address(es) failed:
+          #
+          #  kijitora@example.jp
+          #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
+          #    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/)
+            #   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'] = 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
+          elsif dscontents.size == recipients
+            # Error message
             next if e.empty?
-
-            # Это письмо создано автоматически
-            # сервером Mail.Ru, # отвечать на него не
-            # нужно.
-            #
-            # К сожалению, Ваше письмо не может
-            # быть# доставлено одному или нескольким
-            # получателям:
-            #
-            # **********************
-            #
-            # This message was created automatically by mail delivery software.
-            #
-            # A message that you sent could not be delivered to one or more of its
-            # recipients. This is a permanent error. The following address(es) failed:
-            #
-            #  kijitora@example.jp
-            #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
-            #    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/)
-              #   kijitora@example.jp
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Bite.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-
-            elsif dscontents.size == recipients
-              # Error message
-              next if e.empty?
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' '
-            else
-              # Error message when email address above does not include '@'
-              # and domain part.
-              next unless e.start_with?('    ', "\t")
-              v['alterrors'] ||= ''
-              v['alterrors'] << e + ' '
-            end
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' '
+          else
+            # Error message when email address above does not include '@'
+            # and domain part.
+            next unless e.start_with?('    ', "\t")
+            v['alterrors'] ||= ''
+            v['alterrors'] << e + ' '
           end
         end
 
@@ -172,7 +138,7 @@ module Sisimai::Bite::Email
               # Insert each recipient address into dscontents
               dscontents[-1]['recipient'] = e
               next if dscontents.size == recipients
-              dscontents << Sisimai::Bite.DELIVERYSTATUS
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
             end
           end
         end
@@ -240,13 +206,11 @@ module Sisimai::Bite::Email
             end
           end
           e['command'] ||= ''
-          e['agent']     = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '@mail.ru: https://mail.ru'; end
     end
   end
 end