sisimai 4.22.3-java → 4.22.4-java

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

@@ -6,59 +6,46 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/OpenSMTPD.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from     => %r/\AMailer Daemon [<][^ ]+[@]/,
-        :subject  => %r/\ADelivery status notification/,
-        :received => %r/[ ][(]OpenSMTPD[)][ ]with[ ]/,
-      }.freeze
-      # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
-      # opensmtpd-5.4.2p1/smtpd/
-      #   bounce.c/317:#define NOTICE_INTRO \
-      #   bounce.c/318:    "    Hi!\n\n"    \
-      #   bounce.c/319:    "    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.\n"
-      #   bounce.c/320:
-      #   bounce.c/321:const char *notice_error =
-      #   bounce.c/322:    "    An error has occurred while attempting to deliver a message for\n"
-      #   bounce.c/323:    "    the following list of recipients:\n\n";
-      #   bounce.c/324:
-      #   bounce.c/325:const char *notice_warning =
-      #   bounce.c/326:    "    A message is delayed for more than %s for the following\n"
-      #   bounce.c/327:    "    list of recipients:\n\n";
-      #   bounce.c/328:
-      #   bounce.c/329:const char *notice_warning2 =
-      #   bounce.c/330:    "    Please note that this is only a temporary failure report.\n"
-      #   bounce.c/331:    "    The message is kept in the queue for up to %s.\n"
-      #   bounce.c/332:    "    You DO NOT NEED to re-send the message to these recipients.\n\n";
-      #   bounce.c/333:
-      #   bounce.c/334:const char *notice_success =
-      #   bounce.c/335:    "    Your message was successfully delivered to these recipients.\n\n";
-      #   bounce.c/336:
-      #   bounce.c/337:const char *notice_relay =
-      #   bounce.c/338:    "    Your message was relayed to these recipients.\n\n";
-      #   bounce.c/339:
-      Re1 = {
-        :begin  => %r/\A[ \t]*This is the MAILER-DAEMON, please DO NOT REPLY to this e[-]?mail[.]\z/,
-        :rfc822 => %r/\A[ \t]*Below is a copy of the original message:\z/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
+        # opensmtpd-5.4.2p1/smtpd/
+        #   bounce.c/317:#define NOTICE_INTRO \
+        #   bounce.c/318:    "    Hi!\n\n"    \
+        #   bounce.c/319:    "    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.\n"
+        #   bounce.c/320:
+        #   bounce.c/321:const char *notice_error =
+        #   bounce.c/322:    "    An error has occurred while attempting to deliver a message for\n"
+        #   bounce.c/323:    "    the following list of recipients:\n\n";
+        #   bounce.c/324:
+        #   bounce.c/325:const char *notice_warning =
+        #   bounce.c/326:    "    A message is delayed for more than %s for the following\n"
+        #   bounce.c/327:    "    list of recipients:\n\n";
+        #   bounce.c/328:
+        #   bounce.c/329:const char *notice_warning2 =
+        #   bounce.c/330:    "    Please note that this is only a temporary failure report.\n"
+        #   bounce.c/331:    "    The message is kept in the queue for up to %s.\n"
+        #   bounce.c/332:    "    You DO NOT NEED to re-send the message to these recipients.\n\n";
+        #   bounce.c/333:
+        #   bounce.c/334:const char *notice_success =
+        #   bounce.c/335:    "    Your message was successfully delivered to these recipients.\n\n";
+        #   bounce.c/336:
+        #   bounce.c/337:const char *notice_relay =
+        #   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
-      ReFailure = {
-        expired: %r{
-          # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
-          Envelope[ ]expired
-        }x,
-        hostunknown: %r{(?:
-          # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
-           Invalid[ ]domain[ ]name
-          # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
-          |Domain[ ]does[ ]not[ ]exist
-          )
-        }x,
-        notaccept: %r{
-          # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
-          Destination[ ]seem[ ]to[ ]reject[ ]all[ ]mails
-        }x,
+      ReFailures = {
+        # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
+        expired: %r/Envelope expired/,
+        # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
+        # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
+        hostunknown: %r/(?:Invalid domain name|Domain does not exist)/,
+        # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
+        notaccept: %r/Destination seem to reject all mails/,
+        #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
         networkerror: %r{(?>
-          #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
            Address[ ]family[ ]mismatch[ ]on[ ]destination[ ]MXs
           |All[ ]routes[ ]to[ ]destination[ ]blocked
           |bad[ ]DNS[ ]lookup[ ]error[ ]code
@@ -72,17 +59,13 @@ module Sisimai::Bite::Email
           |Temporary[ ]failure[ ]in[ ]MX[ ]lookup
           )
         }x,
-        securityerror: %r{
-          # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
-          Could[ ]not[ ]retrieve[ ]credentials
-        }x,
+        # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
+        securityerror: %r/Could not retrieve credentials/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'OpenSMTPD'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from OpenSMTPD
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -98,9 +81,10 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['received'].find { |a| a =~ Re0[:received] }
+
+        return nil unless mhead['subject'].start_with?('Delivery status notification')
+        return nil unless mhead['from'].start_with?('Mailer Daemon <')
+        return nil unless mhead['received'].find { |a| a.include?(' (OpenSMTPD) with ') }
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -110,10 +94,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.include?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -121,7 +105,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.include?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -135,7 +119,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -167,15 +150,15 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

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

@@ -7,22 +7,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/US/Outlook.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from     => %r/postmaster[@]/,
-        :subject  => %r/Delivery Status Notification/,
-        :received => %r/.+[.]hotmail[.]com\b/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis is an automatically generated Delivery Status Notification/,
-        :error  => %r/\A[.]+ while talking to .+[:]\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This is an automatically generated Delivery Status Notification'],
+        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      ReFailure = {
+      ReFailures = {
         hostunknown: %r/The mail could not be delivered to the recipient because the domain is not reachable/,
         userunknown: %r/Requested action not taken: mailbox unavailable/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -30,7 +23,6 @@ module Sisimai::Bite::Email
       # X-Message-Delivery: Vj0xLjE7RD0wO0dEPTA7U0NMPTk7bD0xO3VzPTE=
       # X-Message-Info: AuEzbeVr9u5fkDpn2vR5iCu5wb6HBeY4iruBjnutBzpStnUabbM...
       def headerlist;  return ['X-Message-Delivery', 'X-Message-Info']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Microsoft Outlook.com
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -47,11 +39,12 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        # :from => %r/postmaster[@]/,
         match  = 0
-        match += 1 if mhead['subject']    =~ Re0[:subject]
+        match += 1 if mhead['subject'].include?('Delivery Status Notification')
         match += 1 if mhead['x-message-delivery']
         match += 1 if mhead['x-message-info']
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['received'].find { |a| a.include?('.hotmail.com') }
         return nil if match < 2
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -68,14 +61,14 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -83,7 +76,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -97,7 +90,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -116,7 +108,7 @@ module Sisimai::Bite::Email
               # Diagnostic-Code: smtp;550 5.2.2 <kijitora@example.jp>... Mailbox Full
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              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.
@@ -126,39 +118,36 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status:5.2.0
                 v['status'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                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]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
-
               end
             else
               # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
               # Received-From-MTA: dns;BLU436-SMTP66
               # Arrival-Date: Fri, 21 Nov 2014 14:17:34 -0800
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
@@ -168,8 +157,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -181,17 +170,16 @@ module Sisimai::Bite::Email
             if e['action'] == 'delayed'
               # Set pseudo diagnostic code message for delaying
               e['diagnosis'] = 'Delivery to the following recipients has been delayed.'
-
             else
               # Set pseudo diagnostic code message
               e['diagnosis']  = 'Unable to deliver message to the following recipients, '
-              e['diagnosis'] += 'due to being unable to connect successfully to the destination mail server.'
+              e['diagnosis'] << 'due to being unable to connect successfully to the destination mail server.'
             end
           end
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

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

@@ -7,12 +7,10 @@ module Sisimai::Bite::Email
       require 'sisimai/bite/email'
 
       # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
-      Re0 = {
-        :from    => %r/ [(]Mail Delivery System[)]\z/,
-        :subject => %r/\AUndelivered Mail Returned to Sender\z/,
-      }.freeze
-      Re1 = {
-        :begin => %r{\A(?>
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'] }.freeze
+      MarkingsOf = {
+        message: %r{\A(?>
            [ ]+The[ ](?:
              Postfix[ ](?:
                program\z              # The Postfix program
@@ -30,15 +28,11 @@ module Sisimai::Bite::Email
             )
           )
         }x,
-        :rfc822 => %r!\AContent-Type:[ \t]*(?:message/rfc822|text/rfc822-headers)\z!x,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Postfix'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Postfix
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -54,7 +48,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
+
+        # :from => %r/ [(]Mail Delivery System[)]\z/,
+        return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -72,14 +68,14 @@ module Sisimai::Bite::Email
         anotherset = {}     # Another error information
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -87,7 +83,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -101,7 +97,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -116,7 +111,7 @@ module Sisimai::Bite::Email
               # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
               # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
               v = dscontents[-1]
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
+              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.
@@ -126,27 +121,27 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                         e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              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(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              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(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: DNS; mx.example.jp
                 v['rhost'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+              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:
@@ -156,22 +151,19 @@ module Sisimai::Bite::Email
                 #   684                            mail_date(dsn->time));
                 #   685  #endif
                 v['date'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                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'
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # If you do so, please include this problem report. You can
               # delete your own text from the attached returned message.
@@ -185,22 +177,22 @@ module Sisimai::Bite::Email
                 # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                 commandset << cv[1]
                 anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] += ' ' + e
+                anotherset['diagnosis'] << ' ' << e
 
               elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
                 # to MAIL command)
                 commandset << cv[1]
                 anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] += ' ' + e
+                anotherset['diagnosis'] << ' ' << e
 
               else
-                if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # Reporting-MTA: dns; mx.example.jp
                   next if connheader['lhost'].size > 0
                   connheader['lhost'] = cv[1].downcase
                   connvalues += 1
 
-                elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                   # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                   next if connheader['date'].size > 0
                   connheader['date'] = cv[1]
@@ -208,8 +200,7 @@ module Sisimai::Bite::Email
 
                 elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
                   # X-Postfix-Sender: rfc822; shironeko@example.org
-                  rfc822list << sprintf('%s: %s', cv[1], cv[2])
-
+                  rfc822list << (cv[1] << ': ' << cv[2])
                 else
                   # Alternative error message and recipient
                   if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)
@@ -222,16 +213,14 @@ module Sisimai::Bite::Email
                     # <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
+                      anotherset['diagnosis'] << ' ' << e
                     end
                   end
-
                 end
               end
             end
@@ -240,7 +229,7 @@ module Sisimai::Bite::Email
 
         if recipients.zero?
           # Fallback: set recipient address from error message
-          if anotherset['recipient'] && anotherset['recipient'].size > 0
+          if anotherset['recipient'].to_s.size > 0
             # Set recipient address
             dscontents[-1]['recipient'] = anotherset['recipient']
             recipients += 1
@@ -251,7 +240,6 @@ module Sisimai::Bite::Email
         require 'sisimai/string'
         require 'sisimai/smtp/status'
         require 'sisimai/smtp/reply'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -270,7 +258,10 @@ module Sisimai::Bite::Email
               as = nil  # status
               ar = nil  # replycode
 
-              if e['status'] == '' || e['status'] =~ /\A[45][.]0[.]0\z/
+              e['status']    ||= ''
+              e['replycode'] ||= ''
+
+              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.size > 0 && as[-3, 3] != '0.0'
@@ -279,7 +270,7 @@ module Sisimai::Bite::Email
                 end
               end
 
-              if e['replycode'] == '' || e['replycode'] =~ /\A[45]00\z/
+              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.size > 0 && ar[-2, 2].to_i != 0