sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/bite/email/postfix.rb

@@ -49,6 +49,10 @@ module Sisimai::Bite::Email
         # :from => %r/ [(]Mail Delivery System[)]\z/,
         return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -57,11 +61,6 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
-        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
-        connheader = {
-          'date'  => '',    # The value of Arrival-Date header
-          'lhost' => '',    # The value of Received-From-MTA header
-        }
         anotherset = {}     # Another error information
         v = nil
 
@@ -71,7 +70,7 @@ module Sisimai::Bite::Email
           p = havepassed[-2]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
@@ -79,7 +78,7 @@ module Sisimai::Bite::Email
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -87,7 +86,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -95,71 +94,43 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if connvalues == connheader.keys.size
-              # Final-Recipient: RFC822; userunknown@example.jp
-              # X-Actual-Recipient: RFC822; kijitora@example.co.jp
-              # Action: failed
-              # Status: 5.1.1
-              # Remote-MTA: DNS; mx.example.jp
-              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-              # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
+            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 cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
-                # Final-Recipient: RFC822; userunknown@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 cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                         e.match(/\AOriginal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-                # X-Actual-Recipient: RFC822; kijitora@example.co.jp
-                # Original-Recipient: rfc822;kijitora@example.co.jp
-                v['alias'] = cv[1]
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status: 5.1.1
-                # Status:5.2.0
-                # Status: 5.1.0 (permanent failure)
-                v['status'] = cv[1]
-
-              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Remote-MTA: DNS; mx.example.jp
-                v['rhost'] = cv[1].downcase
-
-              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
-                # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
-                #
-                # src/bounce/bounce_notify_util.c:
-                #   681  #if 0
-                #   682      if (dsn->time > 0)
-                #   683          post_mail_fprintf(bounce, "Last-Attempt-Date: %s",
-                #   684                            mail_date(dsn->time));
-                #   685  #endif
-                v['date'] = cv[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
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Bite.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # 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['spec'] = 'SMTP' if v['spec'] == 'X-POSTFIX'
+                v['diagnosis'] = o[2]
               else
-                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.*)\z/)
-                  # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
-                  v['spec'] = 'SMTP' if v['spec'] == 'X-POSTFIX'
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
 
-                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                  # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] << ' ' << cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' << e
-                end
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
               # If you do so, please include this problem report. You can
@@ -170,58 +141,52 @@ module Sisimai::Bite::Email
               # <userunknown@example.co.jp>: host mx.example.co.jp[192.0.2.153] said: 550
               # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
               # command)
-              if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
-                # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                commandset << cv[1]
-                anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] << ' ' << e
+              if p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
+                # Continued line of the value of Diagnostic-Code header
+                v['diagnosis'] << ' ' << cv[1]
+                havepassed[-1] = 'Diagnostic-Code: ' << e
 
-              elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                # to MAIL command)
-                commandset << cv[1]
-                anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] << ' ' << e
+              elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
+                # X-Postfix-Sender: rfc822; shironeko@example.org
+                rfc822list << cv[1] << ': ' << cv[2]
 
               else
-                if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                  # Reporting-MTA: dns; mx.example.jp
-                  next unless connheader['lhost'].empty?
-                  connheader['lhost'] = cv[1].downcase
-                  connvalues += 1
+                if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
+                  # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
+                  commandset << cv[1]
+                  anotherset['diagnosis'] ||= ''
+                  anotherset['diagnosis'] << ' ' << e
+
+                elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
+                  # to MAIL command)
+                  commandset << cv[1]
+                  anotherset['diagnosis'] ||= ''
+                  anotherset['diagnosis'] << ' ' << e
 
-                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                  # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                  next unless connheader['date'].empty?
-                  connheader['date'] = cv[1]
-                  connvalues += 1
-
-                elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
-                  # X-Postfix-Sender: rfc822; shironeko@example.org
-                  rfc822list << (cv[1] << ': ' << cv[2])
                 else
-                  # Alternative error message and recipient
-                  if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)
-                    # <r@example.ne.jp> (expanded from <kijitora@example.org>): user ...
-                    anotherset['recipient'] = cv[1]
-                    anotherset['alias']     = cv[2]
-                    anotherset['diagnosis'] = cv[3]
-
-                  elsif cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:(.*)\z/)
-                    # <kijitora@exmaple.jp>: ...
-                    anotherset['recipient'] = cv[1]
-                    anotherset['diagnosis'] = cv[2]
-                  else
-                    # Get error message continued from the previous line
-                    next unless anotherset['diagnosis']
-                    if e =~ /\A[ \t]{4}(.+)\z/
-                      #    host mx.example.jp said:...
-                      anotherset['diagnosis'] << ' ' << e
+                    # Alternative error message and recipient
+                    if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)
+                      # <r@example.ne.jp> (expanded from <kijitora@example.org>): user ...
+                      anotherset['recipient'] = cv[1]
+                      anotherset['alias']     = cv[2]
+                      anotherset['diagnosis'] = cv[3]
+
+                    elsif cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:(.*)\z/)
+                      # <kijitora@exmaple.jp>: ...
+                      anotherset['recipient'] = cv[1]
+                      anotherset['diagnosis'] = cv[2]
+                    else
+                      # Get error message continued from the previous line
+                      next unless anotherset['diagnosis']
+                      if e =~ /\A[ \t]{4}(.+)\z/
+                        #    host mx.example.jp said:...
+                        anotherset['diagnosis'] << ' ' << e
+                      end
                     end
                   end
-                end
               end
             end
-          end # End of if: rfc822
+          end # End of message/delivery-status
         end
 
         unless recipients > 0
@@ -236,7 +201,8 @@ module Sisimai::Bite::Email
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+          e['lhost'] ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           e['agent']   = self.smtpagent
           e['command'] = commandset.shift || ''
@@ -258,7 +224,7 @@ module Sisimai::Bite::Email
               if e['status'] == '' || e['status'].start_with?('4.0.0', '5.0.0')
                 # Check the value of D.S.N. in anotherset
                 as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
-                if !as.empty? && as[-3, 3] != '0.0'
+                if as && as[-3, 3] != '0.0'
                   # The D.S.N. is neither an empty nor *.0.0
                   e['status'] = as
                 end
@@ -267,7 +233,7 @@ module Sisimai::Bite::Email
               if e['replycode'] == '' || e['replycode'].start_with?('400', '500')
                 # Check the value of SMTP reply code in anotherset
                 ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
-                if !ar.empty? && ar[-2, 2].to_i != 0
+                if ar && ar[-2, 2].to_i != 0
                   # The SMTP reply code is neither an empty nor *00
                   e['replycode'] = ar
                 end

data/lib/sisimai/bite/email/qmail.rb

@@ -23,21 +23,21 @@ module Sisimai::Bite::Email
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        conn: %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        ehlo: %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        mail: %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        rcpt: %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-        data: %r{(?:
+        'data' => %r{(?:
            (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
           |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
@@ -57,10 +57,10 @@ module Sisimai::Bite::Email
       ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
       FailOnLDAP = {
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        suspend:     ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
-        userunknown: ['Sorry, no mailbox here by that name'],           # 5.1.1
-        exceedlimit: ['The message exeeded the maximum size the user accepts'], # 5.2.3
-        systemerror: [
+        'suspend'     => ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
+        'userunknown' => ['Sorry, no mailbox here by that name'],           # 5.1.1
+        'exceedlimit' => ['The message exeeded the maximum size the user accepts'], # 5.2.3
+        'systemerror' => [
             'Automatic homedir creator crashed',                # 4.3.0
             'Illegal value in LDAP attribute',                  # 5.3.5
             'LDAP attribute is not given but mandatory',        # 5.3.5
@@ -77,22 +77,22 @@ module Sisimai::Bite::Email
       MessagesOf = {
         # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        userunknown: ['no mailbox here by that name', 'does not like recipient.'],
+        'userunknown'  => ['no mailbox here by that name', 'does not like recipient.'],
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        mailboxfull: ['disk quota exceeded'],
+        'mailboxfull'  => ['disk quota exceeded'],
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        mesgtoobig:  ['Message size exceeds fixed maximum message size:'],
+        'mesgtoobig'   => ['Message size exceeds fixed maximum message size:'],
         # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
         # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        hostunknown: ["Sorry, I couldn't find any host "],
-        systemfull:  ['Requested action not taken: mailbox unavailable (not enough free space)'],
-        systemerror: [
+        'hostunknown'  => ["Sorry, I couldn't find any host "],
+        'systemfull'   => ['Requested action not taken: mailbox unavailable (not enough free space)'],
+        'systemerror'  => [
           'bad interpreter: No such file or directory',
           'system error',
           'Unable to',
         ],
-        networkerror: [
+        'networkerror' => [
           "Sorry, I wasn't able to establish an SMTP connection",
           "Sorry, I couldn't find a mail exchanger or IP address",
           "Sorry. Although I'm listed as a best-preference MX or A for that host",
@@ -151,7 +151,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -159,7 +159,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -203,7 +203,7 @@ module Sisimai::Bite::Email
             ReSMTP.each_key do |r|
               # Verify each regular expression of SMTP commands
               next unless e['diagnosis'] =~ ReSMTP[r]
-              e['command'] = r.to_s.upcase
+              e['command'] = r.upcase
               break
             end
 
@@ -234,12 +234,12 @@ module Sisimai::Bite::Email
                 if e['alterrors']
                   # Check the value of "alterrors"
                   next unless MessagesOf[r].any? { |a| e['alterrors'].include?(a) }
-                  e['reason'] = r.to_s
+                  e['reason'] = r
                 end
                 break if e['reason']
 
                 next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-                e['reason'] = r.to_s
+                e['reason'] = r
                 break
               end
 
@@ -247,7 +247,7 @@ module Sisimai::Bite::Email
                 FailOnLDAP.each_key do |r|
                   # Verify each regular expression of LDAP errors
                   next unless FailOnLDAP[r].any? { |a| e['diagnosis'].include?(a) }
-                  e['reason'] = r.to_s
+                  e['reason'] = r
                   break
                 end
               end
@@ -258,7 +258,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
+          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
           e.each_key { |a| e[a] ||= '' }
         end
 

data/lib/sisimai/bite/email/receivingses.rb

@@ -15,10 +15,10 @@ module Sisimai::Bite::Email
       }.freeze
       MessagesOf = {
         # The followings are error messages in Rule sets/*/Actions/Template
-        filtered:     ['Mailbox does not exist'],
-        mesgtoobig:   ['Message too large'],
-        mailboxfull:  ['Mailbox full'],
-        contenterror: ['Message content rejected'],
+        'filtered'     => ['Mailbox does not exist'],
+        'mesgtoobig'   => ['Message too large'],
+        'mailboxfull'  => ['Mailbox full'],
+        'contenterror' => ['Message content rejected'],
       }.freeze
 
       def description; return 'Amazon SES(Receiving): http://aws.amazon.com/ses/'; end
@@ -26,7 +26,7 @@ module Sisimai::Bite::Email
 
       # X-SES-Outgoing: 2015.10.01-54.240.27.7
       # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
-      def headerlist;  return ['X-SES-Outgoing']; end
+      def headerlist;  return %w[x-ses-outgoing]; end
 
       # Parse bounce messages from Amazon SES/Receiving
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -44,6 +44,10 @@ module Sisimai::Bite::Email
         # :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
         return nil unless mhead['x-ses-outgoing']
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -51,11 +55,6 @@ module Sisimai::Bite::Email
         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
-        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
-        connheader = {
-          'date'  => '',    # The value of Arrival-Date header
-          'lhost' => '',    # The value of Reporting-MTA header
-        }
         v = nil
 
         while e = hasdivided.shift do
@@ -64,7 +63,7 @@ module Sisimai::Bite::Email
           p = havepassed[-2]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
@@ -72,7 +71,7 @@ module Sisimai::Bite::Email
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -80,7 +79,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -88,90 +87,59 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if connvalues == connheader.keys.size
-              # Action: failed
-              # Final-Recipient: rfc822; kijitora@neko.example.jp
-              # Original-Recipient: rfc822; kijitora@neko.example.jp
-              # Diagnostic-Code: smtp; 550 5.1.1 Mailbox does not exist
-              # Status: 5.1.1
+            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 cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-                # Final-Recipient: RFC822; kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Bite.DELIVERYSTATUS
-                  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
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Bite.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
-                v['recipient'] = cv[1]
-                recipients += 1
-
-              elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                         e.match(/\AOriginal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
-                # X-Actual-Recipient: RFC822; kijitora@example.co.jp
-                # Original-Recipient: rfc822; kijitora@example.co.jp
-                v['alias'] = cv[1]
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1].downcase
-
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status: 5.1.1
-                v['status'] = cv[1]
-
-              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Remote-MTA: DNS; mx.example.jp
-                v['rhost'] = cv[1].downcase
-
-              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
-                # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
-                v['date'] = cv[1]
+              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
-                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
-                  # Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
-
-                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                  # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] << ' ' << cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' << e
-                end
+                # 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]
               end
             else
-              # This message could not be delivered.
-              # ------=_Part_0_1984813963.1443707337938
-              # Content-Type: message/delivery-status
-              # Content-Transfer-Encoding: 7bit
-              # Content-Description: Delivery Status Notification
-              #
-              # Reporting-MTA: dns; inbound-smtp.us-west-2.amazonaws.com
-              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns; mx.example.jp
-                next unless connheader['lhost'].empty?
-                connheader['lhost'] = cv[1].downcase
-                connvalues += 1
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
-              end
+              # 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
-          end
+          end # End of message/delivery-status
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
+          e['lhost'] ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
             # Get other D.S.N. value from the error message
@@ -181,18 +149,17 @@ module Sisimai::Bite::Email
               # 5.1.0 - Unknown address error 550-'5.7.1 ...
               errormessage = cv[1]
             end
-            pseudostatus = Sisimai::SMTP::Status.find(errormessage)
-            e['status'] = pseudostatus unless pseudostatus.empty?
+            e['status'] = Sisimai::SMTP::Status.find(errormessage) || e['status']
           end
 
           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.to_s
+            e['reason'] = r
             break
           end
 
-          e['reason'] ||= Sisimai::SMTP::Status.name(e['status'])
+          e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
           e['agent']    = self.smtpagent
         end