sisimai 5.1.0-java → 5.2.0-java

data/lib/sisimai/lhost/ezweb.rb

@@ -6,23 +6,23 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['--------------------------------------------------', 'Content-Type: message/rfc822'].freeze
-      MarkingsOf = { message: ['The user(s) ', 'Your message ', 'Each of the following', '<'] }.freeze
-      ReFailures = {
+      Boundaries = ["--------------------------------------------------", "Content-Type: message/rfc822"].freeze
+      StartingOf = { message: ['The user(s) ', 'Your message ', 'Each of the following', '<'] }.freeze
+      Messagesof = {
         # notaccept: ['The following recipients did not receive this message:'],
+        'expired' => [
+          # Your message was not delivered within 0 days and 1 hours.
+          # Remote host is not responding.
+          'Your message was not delivered within ',
+        ],
         'mailboxfull' => ['The user(s) account is temporarily over quota'],
+        'onhold'  => ['Each of the following recipients was rejected by a remote mail server'],
         'suspend' => [
           # http://www.naruhodo-au.kddi.com/qa3429203.html
           # The recipient may be unpaid user...?
           'The user(s) account is disabled.',
           'The user(s) account is temporarily limited.',
         ],
-        'expired' => [
-          # Your message was not delivered within 0 days and 1 hours.
-          # Remote host is not responding.
-          'Your message was not delivered within ',
-        ],
-        'onhold' => ['Each of the following recipients was rejected by a remote mail server'],
       }.freeze
 
       # @abstract Decodes the bounce message from au EZweb
@@ -48,7 +48,7 @@ module Sisimai::Lhost
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        rxmessages = []; ReFailures.each_value { |a| rxmessages << a }
+        substrings = []; Messagesof.each_value { |a| substrings << a }; substrings.flatten!
         v = nil
 
         while e = bodyslices.shift do
@@ -56,7 +56,7 @@ module Sisimai::Lhost
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.include?(a) }
+            readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.include?(a) }
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -79,81 +79,73 @@ module Sisimai::Lhost
             p1 = e.index('<') || -1
             p2 = e.index('>') || -1
 
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
+            v["recipient"]  = Sisimai::Address.s3s4(e[p1, p2 - p1])
+            v["diagnosis"] << " " << e
             recipients += 1
 
-          elsif f = Sisimai::RFC1894.match(e)
+          elsif Sisimai::RFC1894.match(e) > 0
             # "e" matched with any field defined in RFC3464
             next unless o = Sisimai::RFC1894.field(e)
             next unless fieldtable[o[0]]
             v[fieldtable[o[0]]] = o[2]
 
           else
-            # The line does not begin with a DSN field defined in RFC3464
+            # Other error messages
             next if Sisimai::String.is_8bit(e)
-            if e.include?('>>> ')
+            if e.include?(" >>> ")
               #    >>> RCPT TO:<******@ezweb.ne.jp>
-              v['command'] = Sisimai::SMTP::Command.find(e) || ''
+              v["command"] = Sisimai::SMTP::Command.find(e)
+              v["diagnosis"] << " " << e
+
+            elsif e.include?(" <<< ")
+              #    <<< 550 ...
+              v["diagnosis"] << " " << e
+
             else
               # Check error message
-              if rxmessages.any? { |messages| messages.any? { |message| e.include?(message) } }
+              isincluded = false
+              if substrings.any? { |a| e.include?(a) }
                 # Check with regular expressions of each error
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << ' ' << e
-              else
-                # >>> 550
-                v['alterrors'] ||= ''
-                v['alterrors'] << ' ' << e
+                v["diagnosis"] << " " << e
+                isincluded = true
               end
+              v["diagnosis"] << " " << e if isincluded
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          unless e['alterrors'].to_s.empty?
-            # Copy alternative error message
-            e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
-              # Override the value of diagnostic code message
-              e['diagnosis'] = e['alterrors'] unless e['alterrors'].empty?
-            end
-            e.delete('alterrors')
-          end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+          # Check each value of DeliveryMatter{}, try to detect the bounce reason.
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # 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
-              catch :SESSION do
-                ReFailures.each_key do |r|
-                  # Try to match with each session error message
-                  ReFailures[r].each do |rr|
-                    # Check each error message pattern
-                    next unless e['diagnosis'].include?(rr)
-                    e['reason'] = r
-                    throw :SESSION
-                  end
+            # There is no X-SPASIGN header or the value of the header is not "NG"
+            catch :FINDREASON do
+              Messagesof.each_key do |r|
+                # Try to match with each session error message
+                Messagesof[r].each do |f|
+                  # Check each error message pattern
+                  next unless e['diagnosis'].include?(f)
+                  e['reason'] = r
+                  throw :FINDREASON
                 end
               end
-
             end
           end
-          next if e['reason']
+          next if e['reason'] != ""
           next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')
-          e['reason'] = 'userunknown'
+          e["reason"] = "userunknown" if e["diagnosis"].start_with?("<")
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/fml.rb

@@ -68,7 +68,7 @@ module Sisimai::Lhost
           p2 = e.rindex('>') || -1
           if p1 > 0 && p2 > 0
             # You are not a member of this mailing list <neko-nyaan@example.org>.
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -79,7 +79,6 @@ module Sisimai::Lhost
           else
             # If you know the general guide of this list, please send mail with
             # the mail body
-            v['diagnosis'] ||= ''
             v['diagnosis'] << e
           end
         end
@@ -98,7 +97,7 @@ module Sisimai::Lhost
             # Error messages in the message body did not matched
             ErrorTitle.each_key do |f|
               # Try to match with the Subject string
-              next unless mhead['subject'] =~ ErrorTitle[f]
+              next unless ErrorTitle[f].any? { |a| mhead["subject"].include?(a) }
               e['reason'] = f
               break
             end

data/lib/sisimai/lhost/gmail.rb

@@ -28,7 +28,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support TLS (state 6).
-        '6'  => { 'command' => 'MAIL', 'reason' => 'systemerror' },
+        '6'  => { 'command' => 'MAIL', 'reason' => 'failedstarttls' },
 
         # https://www.google.td/support/forum/p/gmail/thread?tid=08a60ebf5db24f7b&hl=en
         # Technical details of permanent failure:
@@ -44,7 +44,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 454 454 TLS missing certificate: error:0200100D:system library:fopen:Permission denied (#4.3.0) (state 9).
-        '9'  => { 'command' => 'AUTH', 'reason' => 'systemerror' },
+        '9'  => { 'command' => 'AUTH', 'reason' => 'failedstarttls' },
 
         # https://www.google.com/support/forum/p/gmail/thread?tid=5cfab8c76ec88638&hl=en
         # Technical details of permanent failure:
@@ -151,6 +151,7 @@ module Sisimai::Lhost
         return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
 
+        require 'sisimai/address'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
@@ -187,7 +188,7 @@ module Sisimai::Lhost
 
           if e.start_with?(' ') && e.include?('@')
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -198,41 +199,44 @@ module Sisimai::Lhost
             v['recipient'] = r
             recipients += 1
           else
-            v['diagnosis'] ||= ''
-            v['diagnosis'] << e + ' '
+            v["diagnosis"] << e << " "
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/string'
+        require 'sisimai/rfc1123'
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          unless e['rhost']
+          if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
             # Get the value of remote host
-            if Sisimai::String.aligned(e['diagnosis'], [' by ', '. [', ']. '])
-              # Google tried to deliver your message, but it was rejected by the server for the recipient
-              # domain example.jp by mx.example.jp. [192.0.2.153].
-              p1 = e['diagnosis'].rindex(' by ') || -1
-              p2 = e['diagnosis'].rindex('. [' ) || -1
-              hostname = e['diagnosis'][p1 + 4, p2 - p1 - 4]
-              ipv4addr = e['diagnosis'][p2 + 3, e['diagnosis'].rindex(']. ') - p2 - 3]
-              lastchar = hostname[-1, 1].upcase.ord
+            # Google tried to deliver your message, but it was rejected by the server for the recipient
+            # domain example.jp by mx.example.jp. [192.0.2.153].
+            p1 = e['diagnosis'].rindex(' by ') || -1
+            p2 = e['diagnosis'].rindex('. [' ) || -1
+            hostname = e['diagnosis'][p1 + 4, p2 - p1 - 4]
+            ipv4addr = e['diagnosis'][p2 + 3, e['diagnosis'].rindex(']. ') - p2 - 3]
 
-              e['rhost']   = hostname if lastchar > 64 && lastchar < 91
-              e['rhost'] ||= ipv4addr
-            end
+            e['rhost'] = hostname if Sisimai::RFC1123.is_internethost(hostname)
+            e['rhost'] = ipv4addr if e["rhost"].empty?
           end
 
-          p1 = e['diagnosis'].rindex(' ') || -1
-          p2 = e['diagnosis'].rindex(')') || -1
-          statecode0 = e['diagnosis'][p1 + 1, p2 - p1 - 1] || 0
+          while true do
+            # Find "(state 18)" and pick "18" as a key of statetable
+            p1 = e['diagnosis'].rindex(' (state ');   break unless p1
+            p2 = e['diagnosis'].rindex(')');          break unless p2
+                                                      break if p1 > p2
+            cu = e['diagnosis'][p1 + 8, p2 - p1 - 8]
+            break if cu.empty?
+            break unless StateTable[cu]
+            e['reason']  = StateTable[cu]['reason']
+            e['command'] = StateTable[cu]['command']
+            break
+          end
 
-          if StateTable[statecode0]
-            # (state *)
-            e['reason']  = StateTable[statecode0]['reason']
-            e['command'] = StateTable[statecode0]['command']
-          else
-            # No state code
+          if e['reason'].empty?
+            # There is no no state code in the error message
             MessagesOf.each_key do |r|
               # Verify each regular expression of session errors
               next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
@@ -240,10 +244,10 @@ module Sisimai::Lhost
               break
             end
           end
-          next unless e['reason']
+          next if e['reason'].empty?
 
           # Set pseudo status code
-          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
           next if e['status'].size == 0 || e['status'].include?('.0')
           e['reason'] = Sisimai::SMTP::Status.name(e['status']).to_s || ''
         end

data/lib/sisimai/lhost/gmx.rb

@@ -60,7 +60,7 @@ module Sisimai::Lhost
             #
             # Reason:
             # delivery retry timeout exceeded
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -76,21 +76,9 @@ module Sisimai::Lhost
             # host: mx.example.jp
             v['rhost'] = e[6, e.size]
           else
-            # Get error message
-            if Sisimai::SMTP::Status.find(e) || Sisimai::String.aligned(e, ['<', '@', '>'])
-              # 5.1.1 <shironeko@example.jp>... User Unknown
-              v['diagnosis'] ||= e
-            else
-              next if e.empty?
-              if e.start_with?('Reason:')
-                # Reason:
-                # delivery retry timeout exceeded
-                v['diagnosis'] = e
-
-              elsif v['diagnosis'] == 'Reason:'
-                v['diagnosis'] = e
-              end
-            end
+            # Get error messages
+            next if e.empty?
+            v['diagnosis']  += e + ' '
           end
         end
         return nil unless recipients > 0

data/lib/sisimai/lhost/googlegroups.rb

@@ -4,9 +4,7 @@ module Sisimai::Lhost
   module GoogleGroups
     class << self
       require 'sisimai/lhost'
-
-      Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['----- Original message -----'].freeze
+      Boundaries = ['----- Original message -----', 'Content-Type: message/rfc822'].freeze
 
       # @abstract Decodes the bounce message from Google Groups
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -15,6 +13,7 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.25.6
       def inquire(mhead, mbody)
+        return nil unless mbody.include?("Google Groups")
         return nil unless mhead['from'].end_with?('<mailer-daemon@googlemail.com>')
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
         return nil unless mhead['x-failed-recipients']
@@ -39,7 +38,6 @@ module Sisimai::Lhost
         # Google Groups
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
-        recordwide = { 'rhost' => '', 'reason' => '', 'diagnosis' => '' }
         recipients = 0
         v = dscontents[-1]
 
@@ -49,15 +47,18 @@ module Sisimai::Lhost
         # * This group may not be open to posting.
         entiremesg = emailparts[0].split(/\n\n/, 5).slice(0, 4).join(' ').tr("\n", ' ');
         receivedby = mhead['received'] || []
-        recordwide['diagnosis'] = Sisimai::String.sweep(entiremesg)
-        recordwide['reason']    = emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4 ? 'rejected' : 'onhold'
-        recordwide['rhost']     = Sisimai::RFC5322.received(receivedby[0])[1]
+        recordwide = {
+          'diagnosis' => Sisimai::String.sweep(entiremesg),
+          'reason'    => 'onhold',
+          'rhost'     => Sisimai::RFC5322.received(receivedby[0])[1],
+        }
+        recordwide['reason'] = 'rejected' if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...
           next unless Sisimai::Address.is_emailaddress(e)
 
-          if v['recipient']
+          if v["recipient"] != ""
             # There are multiple recipient addresses in the message body.
             dscontents << Sisimai::Lhost.DELIVERYSTATUS
             v = dscontents[-1]

data/lib/sisimai/lhost/googleworkspace.rb

@@ -0,0 +1,94 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::GoogleWorkspace decodes a bounce email which created by Google Workspace.
+  # Methods in the module are called only from Sisimai::Message.
+  module GoogleWorkspace
+    class << self
+      require 'sisimai/lhost'
+      require 'sisimai/string'
+      require 'sisimai/address'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      Boundaries = ["Content-Type: message/rfc822", "Content-Type: text/rfc822-headers"].freeze
+      StartingOf = {
+        message: ["** "],
+        error:   ["The response was:", "The response from the remote server was:"],
+      }.freeze
+      MessagesOf = {
+        "userunknown"  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
+        "notaccept"    => ["Null MX"],
+        "networkerror" => [" had no relevant answers.", " responded with code NXDOMAIN"],
+      }.freeze
+
+      # @abstract Decodes the bounce message from Google Workspace
+      # @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 decode or the arguments are missing
+      # @see https://workspace.google.com/.
+      def inquire(mhead, mbody)
+        return nil if     mbody.include?("\nDiagnostic-Code:")
+        return nil if     mbody.include?("\nFinal-Recipient:")
+        return nil unless mhead["from"].include?('<mailer-daemon@googlemail.com>')
+        return nil unless mhead["subject"].include?("Delivery Status Notification")
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
+        entiremesg = ""
+        readcursor = 0      # (Integer) Points the current cursor position
+        recipients = 0      # (Integer) The number of 'Final-Recipient' header
+
+        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 message/delivery-status part
+            if e.start_with?(StartingOf[:message][0])
+              # ** Message not delivered **
+              readcursor |= Indicators[:deliverystatus]
+              entiremesg << e + " "
+            end
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # ** Message not delivered **
+          # You're sending this from a different address or alias using the 'Send mail as' feature.
+          # The settings for your 'Send mail as' account are misconfigured or out of date. Check those settings and try resending.
+          # Learn more here: https://support.google.com/mail/?p=CustomFromDenied
+          # The response was:
+          # Unspecified Error (SENT_SECOND_EHLO): Smtp server does not advertise AUTH capability
+          next if e.start_with?("Content-Type: ")
+          entiremesg << e + " "
+        end
+
+        while recipients == 0 do
+          # Pick the recipient address from the value of To: header of the original message after
+          # Content-Type: message/rfc822 field
+          p0 = emailparts[1].index("\nTo:"); break unless p0
+          p1 = emailparts[1].index("\n", p0 + 2)
+          cv = Sisimai::Address.s3s4(emailparts[1][p0 + 4, p1 - p0])
+          dscontents[0]["recipient"] = cv
+          recipients += 1
+        end
+        return nil if recipients == 0
+
+        dscontents[0]["diagnosis"] = entiremesg
+        dscontents.each do |e|
+          # Tidy up the error message in e["diagnosis"], Try to detect the bounce reason.
+          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
+          MessagesOf.each_key do |r|
+            # Guess an reason of the bounce
+            next unless MessagesOf[r].any? { |a| e["diagnosis"].include?(a) }
+            e["reason"] = r
+            break
+          end
+        end
+
+        return { "ds" => dscontents, "rfc822" => emailparts[1] }
+      end
+      def description; return "Google Workspace: https://workspace.google.com/"; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/imailserver.rb

@@ -8,12 +8,12 @@ module Sisimai::Lhost
 
       Boundaries = ['Original message follows.'].freeze
       StartingOf = { error: ['Body of message generated response:'] }.freeze
-      ReFailures = {
+      MessagesOf = {
         'hostunknown'   => ['Unknown host'],
         'userunknown'   => ['Unknown user', 'Invalid final delivery userid'],
         'mailboxfull'   => ['User mailbox exceeds allowed size'],
         'virusdetected' => ['Requested action not taken: virus detected'],
-        'undefined'     => ['undeliverable to'],
+        'spamdetected'  => ['Blacklisted URL in message'],
         'expired'       => ['Delivery failed '],
       }.freeze
 
@@ -45,24 +45,15 @@ module Sisimai::Lhost
           v = dscontents[-1]
 
           p0 = e.index(': ') || -1
-          if p0 > 8 && Sisimai::String.aligned(e, [': ', '@'])
+          if (p0 > 8 && Sisimai::String.aligned(e, [': ', '@'])) || e.start_with?('undeliverable ')
             # Unknown user: kijitora@example.com
-            if v['recipient']
-              # There are multiple recipient addresses in the message body.
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-              v = dscontents[-1]
-            end
-            v['diagnosis'] = e
-            v['recipient'] = Sisimai::Address.s3s4(e[p0 + 2, e.size])
-            recipients += 1
-
-          elsif e.start_with?('undeliverable ')
             # undeliverable to kijitora@example.com
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
+            v['diagnosis'] = e
             v['recipient'] = Sisimai::Address.s3s4(e)
             recipients += 1
           else
@@ -88,9 +79,9 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
           e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless ReFailures[r].any? { |a| e['diagnosis'].include?(a) }
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/interscanmss.rb

@@ -46,7 +46,7 @@ module Sisimai::Lhost
             # Unable to deliver message to <kijitora@neko.example.jp>
             cr = e[e.rindex('<') + 1, e.rindex('>') - e.rindex('<') - 1]
 
-            if v['recipient'] && cr != v['recipient']
+            if v["recipient"] != "" && cr != v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/kddi.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      MarkingsOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
+      StartingOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
       MessagesOf = {
         'mailboxfull' => ['As their mailbox is full'],
         'norelaying'  => ['Due to the following SMTP relay error'],
@@ -40,7 +40,7 @@ module Sisimai::Lhost
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.start_with?(a) }
+            readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -51,7 +51,7 @@ module Sisimai::Lhost
             # 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']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -66,7 +66,6 @@ module Sisimai::Lhost
             v['date'] = e[19, e.size]
           else
             #     As their mailbox is full.
-            v['diagnosis'] ||= ''
             v['diagnosis'] << e + ' ' if e.start_with?(' ')
           end
         end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -47,7 +47,7 @@ module Sisimai::Lhost
 
           if e.start_with?('Unable to deliver message to: <') && e.index('@') > 1
             # Unable to deliver message to: <kijitora@example.org>
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -55,17 +55,14 @@ module Sisimai::Lhost
             v['recipient'] = e[e.index('<'), e.size]
             recipients += 1
           else
-            # Error message
+            # Error messages
             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

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -28,7 +28,6 @@ module Sisimai::Lhost
         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
         q = Sisimai::RFC2045.boundary(mhead['content-type'], 1); Boundaries << q if q
         v = nil
 
@@ -56,7 +55,7 @@ module Sisimai::Lhost
           if e.start_with?('    ') && e.index('@') > 1
             # The following recipients were affected:
             #    dummyuser@blabla.xxxxxxxxxxxx.com
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]