sisimai 4.25.17 → 5.0.0

data/lib/sisimai/rfc3464.rb

@@ -1,108 +1,112 @@
 module Sisimai
   # Sisimai::RFC3464 - bounce mail parser class for Fallback.
   module RFC3464
-    # Imported from p5-Sisimail/lib/Sisimai/RFC3464.pm
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/address'
+      require 'sisimai/rfc1894'
 
       # http://tools.ietf.org/html/rfc3464
       Indicators = Sisimai::Lhost.INDICATORS
-      MarkingsOf = {
-        message: %r{\A(?>
-           content-type:[ ]*(?:
-             message/x?delivery-status
-            |message/disposition-notification
-            |text/plain;[ ]charset=
-            )
-          |the[ ]original[ ]message[ ]was[ ]received[ ]at[ ]
-          |this[ ]report[ ]relates[ ]to[ ]your[ ]message
-          |your[ ]message[ ](?:
-             could[ ]not[ ]be[ ]delivered
-            |was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
-            )
-          )
-        }x,
-        rfc822:  %r{\A(?>
-           content-type:[ ]*(?:message/rfc822|text/rfc822-headers)
-          |return-path:[ ]*[<].+[>]
-          )\z
-        }x,
-        error:   %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/,
-        command: %r/[ ](RCPT|MAIL|DATA)[ ]+command\b/,
+      StartingOf = {
+        message: [
+          'content-type: message/delivery-status',
+          'content-type: message/disposition-notification',
+          'content-type: text/plain; charset=',
+          'the original message was received at ',
+          'this report relates to your message',
+          'your message could not be delivered',
+          'your message was not delivered to ',
+          'your message was not delivered to the following recipients',
+        ],
+        rfc822: [
+          'content-type: message/rfc822',
+          'content-type: text/rfc822-headers',
+          'return-path: <'
+        ],
       }.freeze
-      ReSkip = %r{(?>
-         \A[-]+=
-        |\A\s+\z
-        |\A\s*--
-        |\A\s+[=]\d+
-        |\Ahi[ ][!]
-        |content-(?:description|disposition|transfer-encoding|type):[ ]
-        |(?:name|charset)=
-        |--\z
-        |:[ ]--------
-        )
-      }x.freeze
-      ReStop = %r{(?:
-         \A[*][*][*][ ].+[ ].+[ ][*][*][*]
-        |\Acontent-type:[ ]message/delivery-status
-        |\Ahere[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]first[ ]part[ ]of[ ]the[ ]message
-        |\Athe[ ]non-delivered[ ]message[ ]is[ ]attached[ ]to[ ]this[ ]message.
-        |\Areceived:[ \t]*
-        |\Areceived-from-mta:[ \t]*
-        |\Areporting-mta:[ \t]*
-        |\Areturn-path:[ \t]*
-        |\Aa[ ]copy[ ]of[ ]the[ ]original[ ]message[ ]below[ ]this[ ]line:
-        |attachment[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
-        |below[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]original[ ]message:
-        |below[ ]this[ ]line[ ]is[ ]a[ ]copy[ ]of[ ]the[ ]message
-        |message[ ]contains[ ].+[ ]file[ ]attachments
-        |message[ ]text[ ]follows:[ ]
-        |original[ ]message[ ]follows
-        |the[ ]attachment[ ]contains[ ]the[ ]original[ ]mail[ ]headers
-        |the[ ]first[ ]\d+[ ]lines[ ]
-        |unsent[ ]Message[ ]below
-        |your[ ]message[ ]reads[ ][(]in[ ]part[)]:
-        )
-      }x.freeze
-      ReAddr = %r{(?:
-         \A\s*
-        |\A["].+["]\s*
-        |\A[ \t]*Recipient:[ \t]*
-        |\A[ ]*Address:[ ]
-        |addressed[ ]to[ ]
-        |Could[ ]not[ ]be[ ]delivered[ ]to:[ ]
-        |delivered[ ]to[ ]+
-        |delivery[ ]failed:[ ]
-        |Did[ ]not[ ]reach[ ]the[ ]following[ ]recipient:[ ]
-        |Error-for:[ ]+
-        |Failed[ ]Recipient:[ ]
-        |Failed[ ]to[ ]deliver[ ]to[ ]
-        |Intended[ ]recipient:[ ]
-        |Mailbox[ ]is[ ]full:[ ]
-        |RCPT[ ]To:
-        |SMTP[ ]Server[ ][<].+[>][ ]rejected[ ]recipient[ ]
-        |The[ ]following[ ]recipients[ ]returned[ ]permanent[ ]errors:[ ]
-        |The[ ]following[ ]message[ ]to[ ]
-        |Unknown[ ]user:[ ]
-        |undeliverable[ ]to[ ]
-        |Undeliverable[ ]Address:[ ]*
-        |You[ ]sent[ ]mail[ ]to[ ]
-        |Your[ ]message[ ]to[ ]
-        )
-        ['"]?[<]?([^\s\n\r@=<>]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
-      }xi.freeze
+      ReadUntil0 = [
+        # Stop reading when the following string have appeared at the first of a line
+        'a copy of the original message below this line:',
+        'content-type: message/delivery-status',
+        'for further assistance, please contact ',
+        'here is a copy of the first part of the message',
+        'received:',
+        'received-from-mta:',
+        'reporting-mta:',
+        'reporting-ua:',
+        'return-path:',
+        'the non-delivered message is attached to this message',
+      ].freeze
+      ReadUntil1 = [
+        # Stop reading when the following string have appeared in a line
+        'attachment is a copy of the message',
+        'below is a copy of the original message:',
+        'below this line is a copy of the message',
+        'message contains ',
+        'message text follows: ',
+        'original message follows',
+        'the attachment contains the original mail headers',
+        'the first ',
+        'unsent message below',
+        'your message reads (in part):',
+      ].freeze
+      ReadAfter0 = [
+        # Do not read before the following strings
+        '	the postfix ',
+        'a summary of the undelivered message you sent follows:',
+        'the following is the error message',
+        'the message that you sent was undeliverable to the following',
+        'your message was not delivered to ',
+      ].freeze
+      DoNotRead0 = ['   -----', ' -----', '--', '|--', '*'].freeze
+      DoNotRead1 = ['mail from:', 'message-id:', '  from: '].freeze
+      ReadEmail0 = [' ', '"', '<',].freeze
+      ReadEmail1 = [
+        # There is an email address around the following strings
+        'address:',
+        'addressed to',
+        'could not be delivered to:',
+        'delivered to',
+        'delivery failed:',
+        'did not reach the following recipient:',
+        'error-for:',
+        'failed recipient:',
+        'failed to deliver to',
+        'intended recipient:',
+        'mailbox is full:',
+        'recipient:',
+        'rcpt to:',
+        'smtp server <',
+        'the following recipients returned permanent errors:',
+        'the following addresses had permanent errors',
+        'the following message to',
+        'to: ',
+        'unknown user:',
+        'unable to deliver mail to the following recipient',
+        'undeliverable to',
+        'undeliverable address:',
+        'you sent mail to',
+        'your message has encountered delivery problems to the following recipients:',
+        'was automatically rejected',
+        'was rejected due to',
+      ].freeze
 
       # Detect an error for RFC3464
       # @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)
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         bodyslices = mbody.scrub('?').split("\n")
         readslices = ['']
         rfc822text = ''   # (String) message/rfc822 part text
         maybealias = nil  # (String) Original-Recipient Field
+        lowercased = ''   # (String) Lowercased each line of the loop
         blanklines = 0    # (Integer) The number of blank lines
         readcursor = 0    # (Integer) Points the current cursor position
         recipients = 0    # (Integer) The number of 'Final-Recipient' header
@@ -115,14 +119,14 @@ module Sisimai
         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
-          d = e.downcase
+          lowercased = e.downcase
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if d =~ MarkingsOf[:message]
+            if StartingOf[:message].any? { |a| lowercased.start_with?(a) }
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -130,7 +134,7 @@ module Sisimai
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
-            if d =~ MarkingsOf[:rfc822]
+            if StartingOf[:rfc822].any? { |a| lowercased == a }
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -150,189 +154,75 @@ module Sisimai
             next if e.empty?
 
             v = dscontents[-1]
-            if cv = e.match(/\A(Final|Original)-[Rr]ecipient:[ ]*.+;[ ]*([^ ]+)\z/)
-              # 2.3.2 Final-Recipient field
-              #   The Final-Recipient field indicates the recipient for which this set
-              #   of per-recipient fields applies.  This field MUST be present in each
-              #   set of per-recipient data.
-              #   The syntax of the field is as follows:
-              #
-              #       final-recipient-field =
-              #           "Final-Recipient" ":" address-type ";" generic-address
-              #
-              # 2.3.1 Original-Recipient field
-              #   The Original-Recipient field indicates the original recipient address
-              #   as specified by the sender of the message for which the DSN is being
-              #   issued.
-              #
-              #       original-recipient-field =
-              #           "Original-Recipient" ":" address-type ";" generic-address
-              #
-              #       generic-address = *text
-              if cv[1] == 'Original'
-                # Original-Recipient: ...
-                maybealias = cv[2]
-              else
-                # Final-Recipient: ...
-                x = v['recipient'] || ''
-                y = Sisimai::Address.s3s4(cv[2])
-                y = maybealias unless Sisimai::RFC5322.is_emailaddress(y)
-
-                if !x.empty? && x != y
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                  v = dscontents[-1]
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
+
+              if o[-1] == 'addr'
+                # Final-Recipient: rfc822; kijitora@example.jp
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                if o[0] == 'final-recipient' || o[0] == 'original-recipient'
+                  # Final-Recipient: rfc822; kijitora@example.jp
+                  if o[0] == 'original-recipient'
+                    # Original-Recipient: ...
+                    maybealias = o[2]
+                  else
+                    # Final-Recipient: ...
+                    x = v['recipient'] || ''
+                    y = Sisimai::Address.s3s4(o[2])
+                    y = maybealias unless Sisimai::Address.is_emailaddress(y)
+
+                    if !x.empty? && x != y
+                      # There are multiple recipient addresses in the message body.
+                      dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                      v = dscontents[-1]
+                    end
+                    v['recipient'] = y
+                    recipients  += 1
+                    itisbounce ||= true
+
+                    v['alias'] ||= maybealias
+                    maybealias = nil
+                  end
+                elsif o[0] == 'x-actual-recipient'
+                  # X-Actual-Recipient: RFC822; |IFS=' ' && exec procmail -f- || exit 75 ...
+                  # X-Actual-Recipient: rfc822; kijitora@neko.example.jp 
+                  v['alias'] = o[2] unless o[2].include?(' ')
                 end
-                v['recipient'] = y
-                recipients += 1
-                itisbounce ||= true
+              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
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable[o[0]]
+                v[fieldtable[o[0]]] = o[2]
 
-                v['alias'] ||= maybealias
-                maybealias = nil
+                next unless f
+                permessage[fieldtable[o[0]]] = o[2]
               end
-
-            elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-              # X-Actual-Recipient: RFC822; |IFS=' ' && exec procmail -f- || exit 75 ...
-              # X-Actual-Recipient: rfc822; kijitora@neko.example.jp
-              v['alias'] = cv[1] unless cv[1] =~ /[ \t]+/
-
-            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-              # 2.3.3 Action field
-              #   The Action field indicates the action performed by the Reporting-MTA
-              #   as a result of its attempt to deliver the message to this recipient
-              #   address.  This field MUST be present for each recipient named in the
-              #   DSN.
-              #   The syntax for the action-field is:
-              #
-              #       action-field = "Action" ":" action-value
-              #       action-value =
-              #           "failed" / "delayed" / "delivered" / "relayed" / "expanded"
-              #
-              #   The action-value may be spelled in any combination of upper and lower
-              #   case characters.
-              v['action'] = cv[1].downcase
-
-              # failed (bad destination mailbox address)
-              if cv = v['action'].match(/\A([^ ]+)[ ]/) then v['action'] = cv[1] end
-
-            elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-              # 2.3.4 Status field
-              #   The per-recipient Status field contains a transport-independent
-              #   status code that indicates the delivery status of the message to that
-              #   recipient.  This field MUST be present for each delivery attempt
-              #   which is described by a DSN.
-              #
-              #   The syntax of the status field is:
-              #
-              #       status-field = "Status" ":" status-code
-              #       status-code = DIGIT "." 1*3DIGIT "." 1*3DIGIT
-              v['status'] = cv[1]
-
-            elsif cv = e.match(/\AStatus:[ ]*(\d+[ ]+.+)\z/)
-              # Status: 553 Exceeded maximum inbound message size
-              v['alterrors'] = cv[1]
-
-            elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-              # 2.3.5 Remote-MTA field
-              #   The value associated with the Remote-MTA DSN field is a printable
-              #   ASCII representation of the name of the "remote" MTA that reported
-              #   delivery status to the "reporting" MTA.
-              #
-              #       remote-mta-field = "Remote-MTA" ":" mta-name-type ";" mta-name
-              #
-              #   NOTE: The Remote-MTA field preserves the "while talking to"
-              #   information that was provided in some pre-existing nondelivery
-              #   reports.
-              #
-              #   This field is optional.  It MUST NOT be included if no remote MTA was
-              #   involved in the attempted delivery of the message to that recipient.
-              v['rhost'] = cv[1].downcase
-
-            elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
-              # 2.3.7 Last-Attempt-Date field
-              #   The Last-Attempt-Date field gives the date and time of the last
-              #   attempt to relay, gateway, or deliver the message (whether successful
-              #   or unsuccessful) by the Reporting MTA.  This is not necessarily the
-              #   same as the value of the Date field from the header of the message
-              #   used to transmit this delivery status notification: In cases where
-              #   the DSN was generated by a gateway, the Date field in the message
-              #   header contains the time the DSN was sent by the gateway and the DSN
-              #   Last-Attempt-Date field contains the time the last delivery attempt
-              #   occurred.
-              #
-              #       last-attempt-date-field = "Last-Attempt-Date" ":" date-time
-              v['date'] = cv[1]
             else
-              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
-                # 2.3.6 Diagnostic-Code field
-                #   For a "failed" or "delayed" recipient, the Diagnostic-Code DSN field
-                #   contains the actual diagnostic code issued by the mail transport.
-                #   Since such codes vary from one mail transport to another, the
-                #   diagnostic-type sub-field is needed to specify which type of
-                #   diagnostic code is represented.
-                #
-                #       diagnostic-code-field =
-                #           "Diagnostic-Code" ":" diagnostic-type ";" *text
-                v['spec'] = cv[1].upcase
-                v['diagnosis'] = cv[2]
-
-              elsif cv = e.match(/\ADiagnostic-Code:[ ]*(.+)\z/)
-                # No value of "diagnostic-type"
-                # Diagnostic-Code: 554 ...
-                v['diagnosis'] = cv[1]
-
-              elsif readslices[-2].start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
+              # The line did not match with any fields defined in RFC3464
+              if e.start_with?('Diagnostic-Code: ') && e.include?(';') == false
+                # There is no value of "diagnostic-type" such as Diagnostic-Code: 554 ...
+                v['diagnosis'] = e[e.index(' ') + 1, e.size]
+
+              elsif e.start_with?('Status: ') && Sisimai::SMTP::Reply.find(e[8, 3])
+                # Status: 553 Exceeded maximum inbound message size
+                v['alterrors'] = e[8, e.size]
+
+              elsif readslices[-2].start_with?('Diagnostic-Code:') && cv = e.start_with?(' ')
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] << ' ' << cv[1]
+                v['diagnosis'] << ' ' << e
                 readslices[-1] = 'Diagnostic-Code: ' << e
               else
-                if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                  # 2.2.2 The Reporting-MTA DSN field
-                  #
-                  #       reporting-mta-field =
-                  #           "Reporting-MTA" ":" mta-name-type ";" mta-name
-                  #       mta-name = *text
-                  #
-                  #   The Reporting-MTA field is defined as follows:
-                  #
-                  #   A DSN describes the results of attempts to deliver, relay, or gateway
-                  #   a message to one or more recipients.  In all cases, the Reporting-MTA
-                  #   is the MTA that attempted to perform the delivery, relay, or gateway
-                  #   operation described in the DSN.  This field is required.
-                  connheader['rhost'] ||= cv[1].downcase
-
-                elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                  # 2.2.4 The Received-From-MTA DSN field
-                  #   The optional Received-From-MTA field indicates the name of the MTA
-                  #   from which the message was received.
-                  #
-                  #       received-from-mta-field =
-                  #           "Received-From-MTA" ":" mta-name-type ";" mta-name
-                  #
-                  #   If the message was received from an Internet host via SMTP, the
-                  #   contents of the mta-name sub-field SHOULD be the Internet domain name
-                  #   supplied in the HELO or EHLO command, and the network address used by
-                  #   the SMTP client SHOULD be included as a comment enclosed in
-                  #   parentheses.  (In this case, the MTA-name-type will be "dns".)
-                  connheader['lhost'] = cv[1].downcase
-
-                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                  # 2.2.5 The Arrival-Date DSN field
-                  #   The optional Arrival-Date field indicates the date and time at which
-                  #   the message arrived at the Reporting MTA.  If the Last-Attempt-Date
-                  #   field is also provided in a per-recipient field, this can be used to
-                  #   determine the interval between when the message arrived at the
-                  #   Reporting MTA and when the report was issued for that recipient.
-                  #
-                  #       arrival-date-field = "Arrival-Date" ":" date-time
-                  connheader['date'] = cv[1]
-                else
-                  # Get error message
-                  next if e.start_with?(' ', '-')
-                  next unless e =~ MarkingsOf[:error]
-
-                  # 500 User Unknown
-                  # <kijitora@example.jp> Unknown
+                # Get error messages which is written in the message body directly
+                next if e.start_with?(' ', '	', 'X')
+                cr = Sisimai::SMTP::Reply.find(e) || ''
+                ca = Sisimai::Address.find(e)     || []
+                co = Sisimai::String.aligned(e, ['<', '@', '>']) 
+
+                if cr.size > 0 || (ca.size > 0 && co)
                   v['alterrors'] ||= ' '
                   v['alterrors']  << ' ' << e
                 end
@@ -341,50 +231,101 @@ module Sisimai
           end # End of if: rfc822
         end
 
+        # -----------------------------------------------------------------------------------------
         while true
           # Fallback, parse entire message body
           break if recipients > 0
-          match = 0
-          mfrom = mhead['from'].downcase
 
           # Failed to get a recipient address at code above
-          match += 1 if mfrom.include?('postmaster@') || mfrom.include?('mailer-daemon@') || mfrom.include?('root@')
-          match += 1 if mhead['subject'].downcase =~ %r{(?>
-             delivery[ ](?:failed|failure|report)
-            |failure[ ]notice
-            |mail[ ](?:delivery|error)
-            |non[-]delivery
-            |returned[ ]mail
-            |undeliverable[ ]mail
-            |warning:[ ]
-            )
-          }x
-
-          if mhead['return-path']
-            # Check the value of Return-Path of the message
-            rpath  = mhead['return-path'].downcase
-            match += 1 if rpath.include?('<>') || rpath.include?('mailer-daemon')
-          end
-          break unless match > 0
+          returnpath = (mhead['return-path'] || '').downcase
+          headerfrom = (mhead['from']        || '').downcase
+          errortitle = (mhead['subject']     || '').downcase
+          patternsof = {
+            'from'        => ['postmaster@', 'mailer-daemon@', 'root@'],
+            'return-path' => ['<>', 'mailer-daemon'],
+            'subject'     => ['delivery fail', 'delivery report', 'failure notice', 'mail delivery',
+                              'mail failed', 'mail error', 'non-delivery', 'returned mail',
+                              'undeliverable mail', 'warning: '],
+          }
+
+          match   = nil
+          match ||= patternsof['from'].any?        { |v| headerfrom.include?(v) }
+          match ||= patternsof['subject'].any?     { |v| errortitle.include?(v) }
+          match ||= patternsof['return-path'].any? { |v| returnpath.include?(v) }
+          break unless match
 
           b = dscontents[-1]
+          hasmatched = 0  # There may be an email address around the line
+          readslices = [] # Previous line of this loop
+
+          ReadAfter0.each do |e|
+            # Cut strings from the begining of "mbody" to the strings defined in ReadAfter0
+            i = mbody.downcase.index(e)
+            next unless i
+            mbody = mbody[i, mbody.size - i]
+          end
+          lowercased = mbody.downcase
           bodyslices = mbody.split("\n")
+
           while e = bodyslices.shift do
             # Get the recipient's email address and error messages.
-            d = e.downcase
-            break if d =~ MarkingsOf[:rfc822]
-            break if d =~ ReStop
-
             next if e.empty?
-            next if d =~ ReSkip
-            next if e.start_with?('*')
+            hasmatched = 0
+            lowercased = e.downcase
+            readslices << lowercased
+
+            break if StartingOf[:rfc822].include?(lowercased)
+            break if ReadUntil0.any? { |v| lowercased.start_with?(v) }
+            break if ReadUntil1.any? { |v| lowercased.include?(v) }
+            next  if DoNotRead0.any? { |v| lowercased.start_with?(v) }
+            next  if DoNotRead1.any? { |v| lowercased.include?(v) }
+
+            while true do
+              # There is an email address with an error message at this line(1)
+              break unless ReadEmail0.any? { |v| lowercased.start_with?(v) }
+              break unless lowercased.include?('@')
+
+              hasmatched = 1
+              break
+            end
+
+            while true do
+              # There is an email address with an error message at this line(2)
+              break if hasmatched > 0
+              break unless ReadEmail1.any? { |v| lowercased.include?(v) }
+              break unless lowercased.include?('@')
+
+              hasmatched = 2
+              break
+            end
 
-            if cv = e.match(ReAddr)
+            while true do
+              # There is an email address without an error message at this line
+              break if hasmatched > 0
+              break if readslices.size < 2
+              break unless ReadEmail1.any? { |v| readslices[-2].include?(v) }
+              break unless lowercased.include?('@') # Must contain '@'
+              break unless lowercased.include?('.') # Must contain '.'
+              break if     lowercased.include?('$')
+
+              hasmatched = 3
+              break
+            end
+
+            if hasmatched > 0 && lowercased.include?('@')
               # May be an email address
+              w = e.split(' ')
               x = b['recipient'] || ''
-              y = Sisimai::Address.s3s4(cv[1])
-              next unless Sisimai::RFC5322.is_emailaddress(y)
-
+              y = ''
+
+              w.each do |ee|
+                # Find an email address (including "@")
+                next unless ee.include?('@')
+                y = Sisimai::Address.s3s4(ee)
+                next unless Sisimai::Address.is_emailaddress(y)
+                break
+              end
+              
               if !x.empty? && x != y
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
@@ -394,9 +335,9 @@ module Sisimai
               recipients += 1
               itisbounce ||= true
 
-            elsif cv = e.match(/[(](?:expanded|generated)[ ]from:?[ ]([^@]+[@][^@]+)[)]/)
+            elsif e.include?('(expanded from') || e.include?('(generated from')
               # (expanded from: neko@example.jp)
-              b['alias'] = Sisimai::Address.s3s4(cv[1])
+              b['alias'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
             end
             b['diagnosis'] ||= ''
             b['diagnosis']  << ' ' << e
@@ -406,9 +347,11 @@ module Sisimai
         end
         return nil unless itisbounce
 
-        if recipients == 0 && cv = rfc822text.match(/^To:[ ]*(.+)/)
+        p1 = rfc822text.index("\nTo: ")     || -1
+        p2 = rfc822text.index("\n", p1 + 6) || -1
+        if recipients == 0 && p1 > 0
           # Try to get a recipient address from "To:" header of the original message
-          if r = Sisimai::Address.find(cv[1], true)
+          if r = Sisimai::Address.find(rfc822text[p1 + 5, p2 - p1 - 5], true)
             # Found a recipient address
             dscontents << Sisimai::Lhost.DELIVERYSTATUS if dscontents.size == recipients
             b = dscontents[-1]
@@ -418,8 +361,9 @@ module Sisimai
         end
         return nil unless recipients > 0
 
+        require 'sisimai/smtp/command'
         require 'sisimai/mda'
-        mdabounced = Sisimai::MDA.make(mhead, mbody)
+        mdabounced = Sisimai::MDA.inquire(mhead, mbody)
         dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -438,18 +382,16 @@ module Sisimai
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           if mdabounced
-            # Make bounce data by the values returned from Sisimai::MDA.make()
+            # Make bounce data by the values returned from Sisimai::MDA.inquire()
             e['agent']     = mdabounced['mda'] || 'RFC3464'
             e['reason']    = mdabounced['reason'] || 'undefined'
             e['diagnosis'] = mdabounced['message'] unless mdabounced['message'].empty?
-            e['command']   = ''
+            e['command']   = nil
           end
 
-          e['status'] ||= Sisimai::SMTP::Status.find(e['diagnosis']) || ''
-          if cv = e['diagnosis'].match(MarkingsOf[:command])
-            e['command'] = cv[1]
-          end
-          e['date'] ||= mhead['date']
+          e['date']    ||= mhead['date']
+          e['status']  ||= Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+          e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => rfc822text }