sisimai 5.4.0-java → 5.5.0-java

data/lib/sisimai/lhost/mimecast.rb

@@ -0,0 +1,105 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Mimecast decodes a bounce email which created by Mimecast https://www.mimecast.com/.
+  # Methods in the module are called from only Sisimai::Message.
+  module Mimecast
+    class << self
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      Boundaries = ['Content-Type: message/rfc822'].freeze # No such line in lhost-mimecast-*
+      StartingOf = {message: ['-- ']}.freeze
+
+      # @abstract Decodes the bounce message from Mimecast
+      # @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
+      def inquire(mhead, mbody)
+        match  = 0
+        match += 1 if mhead['subject'].include?('Email Delivery Failure')
+        if mhead['message-id']
+          # Message-Id: <0123456789-1102117314000@us-mta-25.us.mimecast.lan>
+          match += 1 if mhead['message-id'].include?('.mimecast.lan>')
+        end
+        return nil if match == 0
+
+        require 'sisimai/rfc1123'
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
+        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
+            readcursor |= Indicators[:deliverystatus] if e.include?(StartingOf[:message][0])
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
+
+          v = dscontents[-1]
+          if e.start_with?('-- ')
+            # An email that you attempted to send to the following address could not be delivered:
+            # -- sabineko@neko.ef.example.org
+            cv = e[3, 256]
+            if cv.include?(' ') == false
+              # -- sotoneko@cat.example.com
+              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(cv)
+              recipients += 1
+            else
+              # Deal each line begins with "-- " as an error message.
+              #   The problem appears to be :
+              #   -- Recipient email address is possibly incorrect
+              #   Additional information follows :
+              #   -- 5.4.1 Recipient address rejected: Access denied. 
+              v["diagnosis"] += cv + " "
+            end
+          else
+            # Lines after Content-Type: message/delivery-status
+            f = Sisimai::RFC1894.match(e)
+            if f > 0
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
+
+              if o[3] == '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 if fieldtable[o[0]].nil?
+                next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
+                v[fieldtable[o[0]]] = o[2]
+
+                next if f != 1
+                permessage[fieldtable[o[0]]] = o[2]
+              end
+            end
+          end
+        end
+        return nil if recipients == 0
+
+        dscontents.each do |e|
+          # Set default values if each value is empty.
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+      end
+      def description; return 'Mimecast'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/notes.rb

@@ -22,7 +22,7 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Undeliverable message')
+        return nil if mhead['subject'].start_with?('Undeliverable message') == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -89,16 +89,16 @@ module Sisimai::Lhost
           end
         end
 
-        unless recipients > 0
+        if recipients == 0
           # Fallback: Get the recpient address from RFC822 part
           p1 = emailparts[1].index("\nTo: ")     || -1
           p2 = emailparts[1].index("\n", p1 + 6) || -1
           if p1 > 0
             v['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1 + 5, p2 - p1 - 5])
-            recipients += 1 unless v['recipient'].empty?
+            recipients += 1 if v['recipient'].empty? == false
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -106,7 +106,7 @@ module Sisimai::Lhost
 
           MessagesOf.each_key do |r|
             # Check each regular expression of Notes error messages
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
             break

data/lib/sisimai/lhost/opensmtpd.rb

@@ -72,9 +72,9 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Delivery status notification')
-        return nil unless mhead['from'].start_with?('Mailer Daemon <')
-        return nil unless mhead['received'].any? { |a| a.include?(' (OpenSMTPD) with ') }
+        return nil if mhead['subject'].start_with?('Delivery status notification') == false
+        return nil if mhead['from'].start_with?('Mailer Daemon <') == false
+        return nil if mhead['received'].none? { |a| a.include?(' (OpenSMTPD) with ') }
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -116,13 +116,13 @@ module Sisimai::Lhost
             recipients += 1
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/postfix.rb

@@ -6,6 +6,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
       require 'sisimai/rfc1123'
       require 'sisimai/smtp/reply'
+      require 'sisimai/smtp/status'
       require 'sisimai/smtp/command'
 
       # Postfix manual - bounce(5) - http://www.postfix.org/bounce.5.html
@@ -55,8 +56,7 @@ module Sisimai::Lhost
           require 'sisimai/smtp/transcript'
           transcript = Sisimai::SMTP::Transcript.rise(emailparts[0], 'In:', 'Out:')
 
-          return nil unless transcript
-          return nil if transcript.size == 0
+          return nil if transcript.nil? || transcript.size == 0
 
           transcript.each do |e|
             # Pick email addresses, error messages, and the last SMTP command.
@@ -113,18 +113,22 @@ module Sisimai::Lhost
               if o[3] == '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::Lhost.DELIVERYSTATUS
-                    v = dscontents[-1]
+                if Sisimai::Address.is_emailaddress(o[2])
+                  # The email address is a valid email address, avoid an email address
+                  # without a valid domain part such as "neko@mailhost".
+                  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::Lhost.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'] = o[2]
-                  recipients += 1
-                else
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  v['alias'] = o[2]
                 end
               elsif o[3] == 'code'
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
@@ -133,11 +137,11 @@ module Sisimai::Lhost
                 v['diagnosis'] = o[2]
               else
                 # Other DSN fields defined in RFC3464
-                next unless fieldtable[o[0]]
+                next if fieldtable[o[0]].nil?
                 next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f == 1
+                next if f != 1
                 permessage[fieldtable[o[0]]] = o[2]
               end
             else
@@ -161,15 +165,15 @@ module Sisimai::Lhost
                 # Alternative error message and recipient
                 if e.include?(' (in reply to ') || e.include?('command)')
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                  cv = Sisimai::SMTP::Command.find(e) || ""; commandset << cv unless cv.empty?
+                  cv = Sisimai::SMTP::Command.find(e) || ""; commandset << cv if cv.empty? == false
                   anotherset['diagnosis'] ||= ''
                   anotherset['diagnosis']  += " #{e}"
 
-                elsif Sisimai::String.aligned(e, ['<', '@', '>', '(expanded from<', '):'])
+                elsif Sisimai::String.aligned(e, ['<', '@', '>', '(expanded from ', '):'])
                   # <r@example.ne.jp> (expanded from <kijitora@example.org>): user ...
-                  p1 = e.index('> ')
-                  p2 = e.index('(expanded from ', p1)
-                  p3 = e.index('>): ', p2 + 14)
+                  p1 = e.index('> ');                   next unless p1
+                  p2 = e.index('(expanded from ', p1);  next unless p2
+                  p3 = e.index('>): ', p2 + 14);        next unless p3
                   anotherset['recipient'] = Sisimai::Address.s3s4(e[0, p1])
                   anotherset['alias']     = Sisimai::Address.s3s4(e[p2 + 15, p3 - p2 - 15])
                   anotherset['diagnosis'] = e[p3 + 3, e.size]
@@ -192,7 +196,7 @@ module Sisimai::Lhost
                   nomessages = true
                 else
                   # Get an error message continued from the previous line
-                  next unless anotherset['diagnosis']
+                  next if anotherset['diagnosis'].nil?
                   if e.start_with?('    ')
                     #    host mx.example.jp said:...
                     anotherset['diagnosis'] += " #{e[4, e.size]}"
@@ -201,16 +205,20 @@ module Sisimai::Lhost
               end
             end
           end # end of while()
-
         end
 
         if recipients == 0
           # Fallback: get a recipient address from error messages
-          if anotherset['recipient'].to_s.size > 0
-            # Set a recipient address
-            dscontents[-1]['recipient'] = anotherset['recipient']
+          %w[recipient alias].each do |e|
+            # Set a valid recipient address picked from the anotherset
+            next  if anotherset[e].nil? || Sisimai::Address.is_emailaddress(anotherset[e]) == false
+            break if dscontents[-1]['recipient'].empty? == false
+            dscontents[-1]['recipient'] = anotherset[e]
             recipients += 1
-          else
+            break
+          end
+
+          if recipients == 0
             # Get a recipient address from message/rfc822 part if the delivery report was unavailable:
             # '--- Delivery report unavailable ---'
             p1 = emailparts[1].index("\nTo: ")     || -1
@@ -222,7 +230,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
@@ -240,13 +248,11 @@ module Sisimai::Lhost
               # More detailed error message is in "anotherset"
               as = '' # status
               ar = '' # replycode
-              if e['status'].empty? || e['status'].start_with?('4.0.0', '5.0.0')
+              if Sisimai::SMTP::Status.is_ambiguous(e['status'])
                 # Check the value of D.S.N. in anotherset
+                # The D.S.N. is neither an empty nor *.0.0
                 as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
-                if as.size > 0 && as[-4, 4] != '.0.0'
-                  # The D.S.N. is neither an empty nor *.0.0
-                  e['status'] = as
-                end
+                e['status'] = as if Sisimai::SMTP::Status.is_ambiguous(as) == false
               end
 
               if e['replycode'].empty? || e['replycode'].end_with?('00')

data/lib/sisimai/lhost/qmail.rb

@@ -182,7 +182,7 @@ module Sisimai::Lhost
             next if v["rhost"] != ""
             StartingOf["rhost"].each do |r|
               # Find a remote host name
-              p1 = e.index(r); next unless p1
+              p1 = e.index(r); next if p1.nil?
               cm = r.size
               p2 = e.index(" ", p1 + cm + 1) || p2 = e.rindex(".") 
 
@@ -191,7 +191,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Tidy up the error message in e['diagnosis'], Try to detect the bounce reason.
@@ -200,7 +200,7 @@ module Sisimai::Lhost
           # Get the SMTP command name for the session
           CommandSet.each_key do |r|
             # Get the last SMTP command
-            next unless CommandSet[r].any? { |a| e["diagnosis"].include?(a) }
+            next if CommandSet[r].none? { |a| e["diagnosis"].include?(a) }
             e["command"] = r
             break
           end
@@ -224,10 +224,10 @@ module Sisimai::Lhost
               [e["alterrors"], e["diagnosis"]].each do |f|
                 # Try to detect an error reason
                 break if e["reason"] != ""
-                next unless f
+                next  if f.nil?
                 MessagesOf.each_key do |r|
                   # The key is a bounce reason name
-                  next unless MessagesOf[r].any? { |a| f.include?(a) }
+                  next if MessagesOf[r].none? { |a| f.include?(a) }
                   e["reason"] = r
                   break
                 end
@@ -235,7 +235,7 @@ module Sisimai::Lhost
 
                 FailOnLDAP.each_key do |r|
                   # The key is a bounce reason name
-                  next unless FailOnLDAP[r].any? { |a| f.include?(a) }
+                  next if FailOnLDAP[r].none? { |a| f.include?(a) }
                   e["reason"] = r
                   break
                 end

data/lib/sisimai/lhost/sendmail.rb

@@ -31,10 +31,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         return nil if mhead['x-aol-ip']
-        match   = nil
+        match   = false
         match ||= true if mhead['subject'].end_with?('see transcript for details')
         match ||= true if mhead['subject'].start_with?('Warning: ')
-        return nil unless match
+        return nil if match == false
 
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
@@ -89,11 +89,11 @@ module Sisimai::Lhost
               v['diagnosis'] = o[2]
             else
               # Other DSN fields defined in RFC3464
-              next unless fieldtable[o[0]]
+              next if fieldtable[o[0]].nil?
               next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next if f != 1
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -108,7 +108,7 @@ module Sisimai::Lhost
             # Reporting-MTA: dns; mx.example.jp
             # Received-From-MTA: DNS; x1x2x3x4.dhcp.example.ne.jp
             # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-            unless e.start_with?(' ')
+            if e.start_with?(' ') == false
               if e.start_with?('>>> ')
                 # >>> DATA (Client Command)
                 thecommand = Sisimai::SMTP::Command.find(e) if thecommand.empty?
@@ -116,7 +116,7 @@ module Sisimai::Lhost
               elsif e.start_with?('<<< ')
                 # <<< Response from the SMTP server
                 cv = e[4, e.size - 4]
-                esmtpreply << cv unless esmtpreply.index(cv)
+                esmtpreply << cv if esmtpreply.index(cv).nil?
               else
                 # Detect an SMTP session error or a connection error
                 next if sessionerr
@@ -157,14 +157,14 @@ module Sisimai::Lhost
               end
             else
               # Continued line of the value of Diagnostic-Code field
-              next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless e.start_with?(' ')
+              next if readslices[-2].start_with?('Diagnostic-Code:') == false
+              next if e.start_with?(' ') == false
               v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
               readslices[-1]  = "Diagnostic-Code: #{e}"
             end
           end
         end # End of message/delivery-status
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
@@ -193,9 +193,9 @@ module Sisimai::Lhost
 
           while true
             # Check alternative status code and override it
-            break unless anotherset.has_key?('status')
-            break unless anotherset['status'].size > 0
-            break if     Sisimai::SMTP::Status.test(e['status'])
+            break if anotherset.has_key?('status') == false
+            break if anotherset['status'].size == 0
+            break if Sisimai::SMTP::Status.test(e['status'])
 
             e['status'] = anotherset['status']
             break
@@ -203,7 +203,7 @@ module Sisimai::Lhost
 
           # @example.jp, no local part
           # # Get email address from the value of Diagnostic-Code field
-          next unless e['recipient'].start_with?('@')
+          next if e['recipient'].start_with?('@') == false
           cv = Sisimai::Address.find(e['diagnosis'], true) || []
           e['recipient'] = cv[0][:address] if cv.size > 0
         end

data/lib/sisimai/lhost/{interscanmss.rb → trendmicro.rb}

@@ -1,13 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::InterScanMSS decodes a bounce email which created by Trend Micro InterScan
-  # Messaging Security Suite https://www.trendmicro.com/en_us/business/products/user-protection/sps/email-and-collaboration/interscan-messaging.html.
+  # Sisimai::Lhost::TrendMicro decodes a bounce email which created by TREND VISION ONE: Email and
+  # Collaboration Security: https://www.trendmicro.com/en_us/business/products/email-and-collaboration.html
   # Methods in the module are called from only Sisimai::Message.
-  module InterScanMSS
+  module TrendMicro
     class << self
       require 'sisimai/lhost'
       Boundaries = ['Content-Type: message/rfc822'].freeze
 
-        # @abstract Decodes the bounce message from Trend Micro InterScanMSS Messaging Secutiry Suie
+        # @abstract Decodes the bounce message from Trend Micro TREND VISION ONE
       # @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
@@ -23,7 +23,7 @@ module Sisimai::Lhost
         match += 1 if mhead['from'].start_with?('"InterScan MSS"')
         match += 1 if mhead['from'].start_with?('"InterScan Notification"')
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
-        return nil unless match > 0
+        return nil if match == 0
 
         require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
@@ -65,12 +65,11 @@ module Sisimai::Lhost
           else
             # Error message in non-English
             v['command'] = Sisimai::SMTP::Command.find(e) if e.include?(' >>> ')
-            p3 = e.index(' <<< ')
-            next unless p3
+            p3 = e.index(' <<< '); next if p3.nil?
             v['diagnosis'] = e[p3 + 4, e.size]
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -78,7 +77,7 @@ module Sisimai::Lhost
         end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
-      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
+      def description; return 'TREND VISION ONE(Email and Collaboration Security)'; end
     end
   end
 end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -36,10 +36,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # :from => %r/\AMail Delivery Subsystem/,
-        return nil unless mhead['subject'].start_with?('Returned mail: ')
+        return nil if mhead['subject'].start_with?('Returned mail: ') == false
 
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
-        return nil unless emailparts[1].size > 0
+        return nil if emailparts[1].size == 0
 
         require 'sisimai/rfc1123'
         require 'sisimai/smtp/command'
@@ -133,7 +133,7 @@ module Sisimai::Lhost
           # There is no recipient address in the error message
           anotherone.each_key do |e|
             # Try to pick an recipient address, a reply code, and error messages
-            cv = Sisimai::Address.s3s4(anotherone[e]); next unless Sisimai::Address.is_emailaddress(cv)
+            cv = Sisimai::Address.s3s4(anotherone[e]); next if Sisimai::Address.is_emailaddress(cv) == false
             cr = Sisimai::SMTP::Reply.find(anotherone[e])
 
             dscontents[e]["recipient"] = cv
@@ -150,13 +150,13 @@ module Sisimai::Lhost
             if p1 > 0
               # Get the recipient address from "To:" header at the original message
               cv = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
-              return nil unless Sisimai::Address.is_emailaddress(cv)
+              return nil if Sisimai::Address.is_emailaddress(cv) == false
               dscontents[0]["recipient"] = cv
               recipients += 1
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         j = 0; dscontents.each do |e|
           # Tidy up the error message in e.Diagnosis
@@ -169,8 +169,8 @@ module Sisimai::Lhost
           # @example.jp, no local part
           # Get email address from the value of Diagnostic-Code header
           next if e['recipient'].include?('@')
-          p1 = e['diagnosis'].index('<'); next unless p1
-          p2 = e['diagnosis'].index('>'); next unless p2
+          p1 = e['diagnosis'].index('<'); next if p1.nil?
+          p2 = e['diagnosis'].index('>'); next if p2.nil?
           e['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
         end
 

data/lib/sisimai/lhost/verizon.rb

@@ -16,7 +16,7 @@ module Sisimai::Lhost
         while true
           # Check the value of "From" header
           # :'subject' => %r/Undeliverable Message/,
-          break unless mhead['received'].any? { |a| a.include?('.vtext.com (') }
+          break if mhead['received'].none? { |a| a.include?('.vtext.com (') }
           match = 1 if mhead['from'] == 'post_master@vtext.com'
           match = 0 if Sisimai::String.aligned(mhead['from'], ['sysadmin@', '.vzwpix.com'])
           break
@@ -130,7 +130,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         # Set the value of "MAIL FROM:" and "From:"
         emailparts[1] += "From: #{senderaddr}\n"    if emailparts[1].include?("\nFrom: ")    == false
@@ -140,7 +140,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           messagesof.each_key do |r|
             # Verify each regular expression of session errors
-            next unless messagesof[r].any? { |a| e['diagnosis'].include?(a) }
+            next if messagesof[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/x1.rb

@@ -6,7 +6,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['Received: from '].freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Received: from '].freeze
       MarkingsOf = {message: ['The original message was received at ']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #1
@@ -15,8 +15,11 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Returned Mail: ')
-        return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
+        proceedsto = false
+        proceedsto = true if mhead['subject'].start_with?('Returned Mail: ')
+        proceedsto = true if mhead['subject'].start_with?('Mail Delivery Failure')
+        proceedsto = true if Sisimai::String.aligned(mhead['from'], ['"Mail Deliver', 'System" '])
+        return nil if proceedsto == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -61,7 +64,7 @@ module Sisimai::Lhost
             datestring = e[MarkingsOf[:message][0].size, e.size]
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])