sisimai 5.4.1-java → 5.6.0-java

data/lib/sisimai/reason/virusdetected.rb

@@ -14,13 +14,10 @@ module Sisimai
     #
     module VirusDetected
       class << self
-        Index = [
-          'it has a potentially executable attachment',
-          'the message was rejected because it contains prohibited virus or spam content',
-          'this form of attachment has been used by recent viruses or other malware',
-          'virus detected',
-          'virus phishing/malicious_url detected',
-          'your message was infected with a virus',
+        Index = ["it has a potentially executable attachment"].freeze
+        Pairs = [
+          ["message was ", "ected", " virus"],
+          ["virus", " detected"],
         ].freeze
 
         def text; return 'virusdetected'; end
@@ -31,8 +28,9 @@ module Sisimai
         # @return   [Boolean]       false: Did not match, true: Matched
         # @since 4.22.0
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
@@ -47,7 +45,7 @@ module Sisimai
           # to be sent before the SMTP DATA command because all the MTAs read the headers and the
           # entire message body after the DATA command.
           return true  if argvs['reason'] == 'virusdetected'
-          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['command'])
+          return false if Sisimai::SMTP::Command::ExceptDATA.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason.rb

@@ -7,10 +7,10 @@ module Sisimai
       # @return   [Array] Reason list
       def index
         return %w[
-          AuthFailure BadReputation Blocked ContentError ExceedLimit Expired FailedSTARTTLS Filtered
-          HasMoved HostUnknown MailboxFull MailerError MesgTooBig NetworkError NotAccept NotCompliantRFC
-          OnHold Rejected NoRelaying Speeding SpamDetected VirusDetected PolicyViolation SecurityError
-          Suspend RequirePTR SystemError SystemFull TooManyConn Suppressed UserUnknown SyntaxError
+          AuthFailure BadReputation Blocked ContentError EmailTooLarge Expired FailedSTARTTLS Filtered
+          HasMoved HostUnknown MailboxFull MailerError NetworkError NotAccept NotCompliantRFC RateLimited
+          OnHold Rejected NoRelaying SpamDetected VirusDetected PolicyViolation SecurityError Suspend
+          RequirePTR SystemError SystemFull Suppressed UserUnknown SyntaxError
         ]
       end
 
@@ -46,20 +46,20 @@ module Sisimai
       GetRetried = Sisimai::Reason.retry
       ClassOrder = [
         %w[
-          MailboxFull MesgTooBig ExceedLimit Suspend HasMoved NoRelaying AuthFailure UserUnknown
-          Filtered RequirePTR NotCompliantRFC BadReputation ContentError Rejected HostUnknown
-          SpamDetected Speeding TooManyConn Blocked
+          MailboxFull EmailTooLarge Suspend HasMoved NoRelaying AuthFailure UserUnknown Filtered
+          RequirePTR NotCompliantRFC BadReputation ContentError Rejected HostUnknown SpamDetected
+          RateLimited Blocked
         ],
         %w[
-          MailboxFull AuthFailure BadReputation Speeding SpamDetected VirusDetected PolicyViolation 
-          NoRelaying SystemError NetworkError Suspend ContentError SystemFull NotAccept Expired
-          FailedSTARTTLS SecurityError Suppressed MailerError
+          MailboxFull AuthFailure BadReputation SpamDetected VirusDetected PolicyViolation NoRelaying
+          SystemError NetworkError Suspend ContentError SystemFull NotAccept Expired FailedSTARTTLS
+          SecurityError Suppressed MailerError
         ],
         %w[
-          MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected HostUnknown
-          SpamDetected Speeding TooManyConn Blocked SpamDetected AuthFailure FailedSTARTTLS
-          SecurityError SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
-          NotAccept MailerError NoRelaying Suppressed SyntaxError OnHold
+          MailboxFull EmailTooLarge Suspend UserUnknown Filtered Rejected HostUnknown SpamDetected
+          RateLimited Blocked SpamDetected AuthFailure FailedSTARTTLS SecurityError SystemError
+          NetworkError Suspend Expired ContentError HasMoved SystemFull NotAccept MailerError
+          NoRelaying Suppressed SyntaxError OnHold
         ]
       ]
 
@@ -68,11 +68,11 @@ module Sisimai
       # @return   [String] Bounce reason or an empty string if the argument is missing or not Hash
       # @see anotherone
       def find(argvs)
-        return "" unless argvs
-        unless GetRetried[argvs['reason']]
+        return "" if argvs.nil?
+        if GetRetried[argvs['reason']].nil?
           # Return reason text already decided except reason match with the regular expression of
           # retry() method.
-          return argvs['reason'] unless argvs['reason'].empty?
+          return argvs['reason'] if argvs['reason'].empty? == false
         end
         return 'delivered' if argvs['deliverystatus'].start_with?('2.')
 
@@ -94,7 +94,7 @@ module Sisimai
               warn " ***warning: Failed to load #{p}"
               next
             end
-            next unless r.true(argvs)
+            next if r.true(argvs) == false
             reasontext = r.text
             break
           end
@@ -113,7 +113,7 @@ module Sisimai
             # Try to match with message patterns in Sisimai::Reason::Vacation
             require 'sisimai/reason/vacation'
             reasontext   = 'vacation' if Sisimai::Reason::Vacation.match(issuedcode.downcase)
-            reasontext ||= 'onhold'   unless issuedcode.empty?
+            reasontext ||= 'onhold'   if issuedcode.empty? == false
             reasontext ||= 'undefined'
           end
         end
@@ -125,7 +125,7 @@ module Sisimai
       # @return   [String, Nil] Bounce reason or nli if the argument is missing or not Hash
       # @see      find()
       def anotherone(argvs)
-        return argvs['reason'] unless argvs['reason'].empty?
+        return argvs['reason'] if argvs['reason'].empty? == false
 
         require 'sisimai/smtp/status'
         issuedcode = argvs['diagnosticcode'].downcase || ''
@@ -150,11 +150,11 @@ module Sisimai
               next
             end
 
-            next unless r.match(issuedcode)
+            next if r.match(issuedcode) == false
             reasontext = e.downcase
             break
           end
-          break unless reasontext.empty?
+          break if reasontext.empty? == false
 
           # Check the value of Status:
           code2digit = statuscode[0, 3] || ''
@@ -175,7 +175,7 @@ module Sisimai
             require 'sisimai/reason/syntaxerror'
             reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
           end
-          break unless reasontext.empty?
+          break if reasontext.empty? == false
 
           # Check the value of Action: field, first
           if actiontext.start_with?('delayed', 'expired')
@@ -195,7 +195,7 @@ module Sisimai
       # @param    [String] argv1  Error message
       # @return   [String]        Bounce reason
       def match(argv1)
-        return "" unless argv1
+        return "" if argv1.nil?
 
         reasontext = ''
         issuedcode = argv1.downcase
@@ -214,11 +214,11 @@ module Sisimai
             next
           end
 
-          next unless r.match(issuedcode)
+          next if r.match(issuedcode) == false
           reasontext = r.text
           break
         end
-        return reasontext unless reasontext.empty?
+        return reasontext if reasontext.empty? == false
 
         if issuedcode.upcase.include?('X-UNIX; ')
           # X-Unix; ...

data/lib/sisimai/rfc1123.rb

@@ -3,6 +3,7 @@ module Sisimai
   module RFC1123
     class << self
       require 'sisimai/string'
+      require 'sisimai/rfc791'
       Sandwiched = [
           # (Postfix) postfix/src/smtp/smtp_proto.c: "host %s said: %s (in reply to %s)",
           # - <kijitora@example.com>: host re2.example.com[198.51.100.2] said: 550 ...
@@ -37,32 +38,72 @@ module Sisimai
       # @return   [Boolean]      false: is not a valid internet host, true: is a valid interneet host
       # @since v5.2.0
       def is_internethost(argv0 = '')
-        return false unless argv0
-        return false if argv0.size < 4 || argv0.size > 255
+        return false if argv0.nil? || argv0.size < 4 || argv0.size > 255
+        return true  if argv0 == 'localhost' || argv0 == 'localhost6'
         return false if argv0.include?(".") == false
         return false if argv0.include?("..") || argv0.include?("--")
         return false if argv0.start_with?(".", "-") || argv0.end_with?("-")
 
-        hostnameok = true
         characters = argv0.upcase.split("")
         characters.each do |e|
           # Check each characater is a number or an alphabet
           f = e.ord
-          if f <  45            then hostnameok = false; break; end  # 45 = '-'
-          if f == 47            then hostnameok = false; break; end  # 47 = '/'
-          if f >  57 && f <  65 then hostnameok = false; break; end  # 57 = '9', 65 = 'A'
-          if f >  90            then hostnameok = false; break; end  # 90 = 'Z'
+          return false if f <  45             # 45 = '-'
+          return false if f == 47             # 47 = '/'
+          return false if f >  57 && f <  65  # 57 = '9', 65 = 'A'
+          return false if f >  90             # 90 = 'Z'
         end
-        return false if hostnameok == false
 
         p1 = argv0.rindex(".")
         cv = argv0[p1 + 1, argv0.size - p1]; return false if cv.size > 63
         cv.split("").each do |e|
           # The top level domain should not include a number
-          f = e.ord
-          if f > 47 && f < 58 then hostnameok = false; break; end
+          f = e.ord; return false if f > 47 && f < 58
         end
-        return hostnameok
+        return true
+      end
+
+      # returns true if the domain part is [IPv4:...] or [IPv6:...].
+      # @param    [String] email  Email address.
+      # @return   [Boolean]       false: the domain part is not a domain literal.
+      #                           true:  the domain part is a domain literal.
+      def is_domainliteral(email)
+        return false if email.is_a?(::String) == false
+
+        email = email.delete_prefix('<').delete_suffix('>')
+        return false if email.size < 16 # e@[IPv4:0.0.0.0] is 16 characters
+        return false if email[-1, 1] != ']'
+
+        lastb = email.rindex('@[IPv'); return false if lastb == false
+        dpart = email.split('@')[-1]
+
+        if email.include?('@[IPv4:')
+          # neko@[IPv4:192.0.2.25]
+          ipv4a = email[lastb + 7, 16].delete_suffix(']')
+          return Sisimai::RFC791.is_ipv4address(ipv4a)
+
+        elsif email.include?('@[IPv6:')
+          # neko@[IPv6:2001:0DB8:0000:0000:0000:0000:0000:0001]
+          # neko@[IPv6:2001:0DB8:0000:0000:0000:0000:0000:0001]
+          # IPv6-address-literal  = "IPv6:" IPv6-addr
+          #    IPv6-addr      = IPv6-full / IPv6-comp / IPv6v4-full / IPv6v4-comp
+          #    IPv6-hex       = 1*4HEXDIG
+          #    IPv6-full      = IPv6-hex 7(":" IPv6-hex)
+          #    IPv6-comp      = [IPv6-hex *5(":" IPv6-hex)] "::"
+          #                     [IPv6-hex *5(":" IPv6-hex)]
+          #                     ; The "::" represents at least 2 16-bit groups of
+          #                     ; zeros.  No more than 6 groups in addition to the
+          #                     ; "::" may be present.
+          #    IPv6v4-full    = IPv6-hex 5(":" IPv6-hex) ":" IPv4-address-literal
+          #    IPv6v4-comp    = [IPv6-hex *3(":" IPv6-hex)] "::"
+          #                     [IPv6-hex *3(":" IPv6-hex) ":"]
+          #                     IPv4-address-literal
+          #                     ; The "::" represents at least 2 16-bit groups of
+          #                     ; zeros.  No more than 4 groups in addition to the
+          #                     ; "::" and IPv4-address-literal may be present.
+          return true if dpart.size > 2 && dpart.rindex(':') > 7
+        end
+        return false
       end
 
       # find() returns a valid internet hostname found from the argument
@@ -70,8 +111,7 @@ module Sisimai
       # @return   string        A valid internet hostname found in the argument
       # @since v5.2.0
       def find(argv1 = "")
-        return "" unless argv1
-        return "" unless argv1.size > 4
+        return "" if argv1.nil? || argv1.size < 5
 
         sourcetext = argv1.downcase
         sourcelist = []
@@ -91,7 +131,7 @@ module Sisimai
           Sandwiched.each do |e|
             # Check a hostname exists between the $e->[0] and $e->[1] at array "Sandwiched"
             # Each array in Sandwiched have 2 elements
-            next unless Sisimai::String.aligned(sourcetext, e)
+            next if Sisimai::String.aligned(sourcetext, e) == false
 
             p1 = sourcetext.index(e[0])
             p2 = sourcetext.index(e[1])
@@ -112,7 +152,7 @@ module Sisimai
           end
           ExistUntil.each do |e|
             # ExistUntil have some strings, not an array
-            p1 = sourcetext.index(e); next unless p1
+            p1 = sourcetext.index(e); next if p1.nil?
             sourcelist = sourcetext[0, p1].split(" ")
             throw :MAKELIST
           end
@@ -126,9 +166,9 @@ module Sisimai
           e.chop! if e[-1, 1] == "." # Remove "." at the end of the string
           e.delete!('[]()<>:;')
 
-          next unless e.size > 3
-          next unless e.include?(".")
-          next unless Sisimai::RFC1123.is_internethost(e)
+          next if e.size < 4
+          next if e.include?(".") == false
+          next if Sisimai::RFC1123.is_internethost(e) == false
           foundtoken << e
         end
         return ""            if foundtoken.size == 0

data/lib/sisimai/rfc1894.rb

@@ -59,7 +59,7 @@ module Sisimai
 
       SubtypeSet = {"addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS"}.freeze
       ActionList = ["failed", "delayed", "delivered", "relayed", "expanded"].freeze
-      Correction = {'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed'}
+      Correction = {'deliverable' => 'delivered', 'expired' => 'failed', 'failure' => 'failed'}
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -114,16 +114,16 @@ module Sisimai
 
         FieldNames[0].each_key do |e|
           # Per-Message fields
-          next unless label == e
-          next unless argv0.include?(FieldNames[0][label])
+          next if label != e
+          next if argv0.include?(FieldNames[0][label]) == false
           match = 1; break
         end
         return match if match > 0
 
         FieldNames[1].each_key do |e|
           # Per-Recipient field
-          next unless label == e
-          next unless argv0.include?(FieldNames[1][label])
+          next if label != e
+          next if argv0.include?(FieldNames[1][label]) == false
           match = 2; break
         end
         return match
@@ -147,9 +147,7 @@ module Sisimai
         label = Sisimai::RFC1894.label(argv0)
         group = FieldGroup[label] || ''
         parts = argv0.split(":", 2); parts[1] = parts[1].nil? ? "" : Sisimai::String.sweep(parts[1])
-
-        return nil if group.empty?
-        return nil unless CapturesOn[group]
+        return nil if group.empty? || CapturesOn[group].nil?
 
         # Try to match with each pattern of Per-Message field, Per-Recipient field
         #   - 0: Field-Name

data/lib/sisimai/rfc2045.rb

@@ -9,7 +9,7 @@ module Sisimai
       # @param    [String] argvs  String to be checked
       # @return   [Boolean]       false: Not MIME encoded string, true: MIME encoded string
       def is_encoded(argv1)
-        return false unless argv1
+        return false if argv1.nil? || argv1.empty?
 
         text1 = argv1.delete('"')
         mime1 = false
@@ -69,7 +69,7 @@ module Sisimai
           # utf8 => UTF-8
           ctxcharset = 'UTF-8' if ctxcharset.casecmp('UTF8') == 0
 
-          unless ctxcharset.casecmp('UTF-8') == 0
+          if ctxcharset.casecmp('UTF-8') != 0
             # Characterset is not UTF-8
             begin
               p = p.encode!('UTF-8', ctxcharset)
@@ -109,12 +109,11 @@ module Sisimai
       def parameter(argv0 = '', argv1 = '')
         return "" if argv0.empty?
         parameterq = argv1.size > 0 ? argv1 + '=' : ''
-        paramindex = argv1.size > 0 ? argv0.index(parameterq) : 0
-        return '' unless paramindex
+        paramindex = argv1.size > 0 ? argv0.index(parameterq) : 0; return '' if paramindex.nil?
 
         # Find the value of the parameter name specified in argv1
         foundtoken = argv0[paramindex + parameterq.size, argv0.size].split(';', 2)[0] || ''
-        foundtoken = foundtoken.downcase unless argv1 == 'boundary'
+        foundtoken = foundtoken.downcase if argv1 != 'boundary'
         foundtoken = foundtoken.delete('"').delete("'")
         return foundtoken
       end
@@ -147,8 +146,8 @@ module Sisimai
         return nil if block.empty?
 
         (upperchunk, lowerchunk) = block.split("\n\n", 2)
-        return ['', ''] if     upperchunk.to_s.empty?
-        return ['', ''] unless upperchunk.index('Content-Type')
+        return ['', ''] if upperchunk.nil? || upperchunk.empty?
+        return ['', ''] if upperchunk.index('Content-Type').nil?
 
         headerpart = ['', ''] # ["text/plain; charset=iso-2022-jp; ...", "quoted-printable"]
         multipart1 = []       # [headerpart, "body"]
@@ -224,8 +223,10 @@ module Sisimai
         multiparts = argv1.split(Regexp.new(Regexp.escape(boundary01) + "\n"))
         partstable = []
 
-        multiparts.shift if multiparts[0].size  < 8
-        multiparts.pop   if multiparts[-1].size < 8
+        # Remove empty or useless preamble and epilogue of multipart/* block
+        multiparts.shift if multiparts[0].size < 8
+        return []        if multiparts.empty?
+        multiparts.pop   if multiparts.size > 2 && multiparts[-1].size < 8
 
         while e = multiparts.shift do
           # Check each part and breaks up internal multipart/* block
@@ -234,8 +235,7 @@ module Sisimai
             # There is nested multipart/* block
             boundary02 = boundary(f[0], -1); next if boundary02.empty?
             bodyinside = f[-1].split("\n\n", 2)[-1]
-            next unless bodyinside.size > 8
-            next unless bodyinside.index(boundary02)
+            next if bodyinside.size < 9 || bodyinside.index(boundary02).nil?
 
             v = levelout(f[0], bodyinside)
             partstable += v if v.size > 0
@@ -299,6 +299,16 @@ module Sisimai
             if ctencoding == 'base64'
               # Content-Transfer-Encoding: base64
               bodystring = decodeB(bodyinside) || ''
+              dontappend = false; while first10 = bodystring[0,10] do
+                # Don't pick the decoded part as an error message when the part is
+                # - BASE64 encoded.
+                # - the value of the charset is not utf-8.
+                # - NOT a plain text.
+                break if     Sisimai::String.aligned(e[0], ['charset', '=', 'utf-8'])
+                break unless first10 =~ /[\x00-\x08\x0E-\x1F\x7F-]/
+                dontappend = true; break
+              end
+              next if dontappend
 
             elsif ctencoding == 'quoted-printable'
               # Content-Transfer-Encoding: quoted-printable
@@ -328,7 +338,7 @@ module Sisimai
             # the following errors:
             #   - incompatible character encodings: ASCII-8BIT and UTF-8
             #   - invalid byte sequence in UTF-8
-            unless bodystring.encoding.to_s == 'UTF-8'
+            if bodystring.encoding.to_s != 'UTF-8'
               # ASCII-8BIT or other 8bit encodings
               ctxcharset = parameter(e[0], 'charset')
               if ctxcharset.empty?
@@ -346,6 +356,8 @@ module Sisimai
 
           else
             # There is no Content-Transfer-Encoding header in the part
+            be = bodyinside.encoding.to_s
+            bodyinside  = Sisimai::String.to_utf8(bodyinside, be) if be != 'UTF-8' 
             bodystring += bodyinside
           end
 
@@ -357,7 +369,7 @@ module Sisimai
           end
 
           # Append "\n" when the last character of $bodystring is not LF
-          bodystring += "\n\n" unless bodystring[-2, 2] == "\n\n"
+          bodystring += "\n\n" if bodystring[-2, 2] != "\n\n"
           flattenout += bodystring
         end
 

data/lib/sisimai/rfc3464/thirdparty.rb

@@ -22,8 +22,7 @@ module Sisimai
         # @param    string argv1   A line of a bounce mail
         # @return   string         An MTA name of the 3rd party
         def returnedby(argv1 = "")
-          return "" unless argv1
-          return "" unless argv1.start_with?("X-")
+          return "" if argv1.nil? || argv1.start_with?("X-") == false
 
           ThirdParty.each_key do |e|
             # Does the argument include the 3rd party specific field?
@@ -53,7 +52,7 @@ module Sisimai
           MessagesOf = {
             "bad-domain"          => "hostunknown",
             "bad-mailbox"         => "userunknown",
-            "inactive-mailbox"    => "disabled",
+            "inactive-mailbox"    => "suspend",
             "message-expired"     => "expired",
             "no-answer-from-host" => "networkerror",
             "policy-related"      => "policyviolation",

data/lib/sisimai/rfc3464.rb

@@ -151,7 +151,7 @@ module Sisimai
               if o[0] == "final-recipient"
                 # Final-Recipient: rfc822; kijitora@example.jp
                 # Final-Recipient: x400; /PN=...
-                cv = Sisimai::Address.s3s4(o[2]); next unless Sisimai::Address.is_emailaddress(cv)
+                cv = Sisimai::Address.s3s4(o[2]); next if Sisimai::Address.is_emailaddress(cv) == false
                 cw = dscontents.size;             next if cw > 0 && cv == dscontents[cw - 1]["recipient"]
 
                 if v["recipient"] != ""
@@ -177,18 +177,18 @@ module Sisimai
                 # Status: 4.0.0 (cat.example.net: host name lookup failure)
                 v["diagnosis"] += " #{o[4]} "
               end
-              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
             # Check that the line is a continued line of the value of Diagnostic-Code: field or not
             if e.start_with?("X-") && e.include?(": ")
               # This line is a MTA-Specific fields begins with "X-"
-              next unless Sisimai::RFC3464::ThirdParty.is3rdparty(e)
+              next if Sisimai::RFC3464::ThirdParty.is3rdparty(e) == false
               cv = Sisimai::RFC3464::ThirdParty.xfield(e)
 
               if cv.size > 0 && FieldTable[cv[0].downcase] == nil
@@ -197,7 +197,7 @@ module Sisimai
                 v["reason"] = cv[4][p1 + 1, cv[4].size] if cv[4].start_with?("reason:")
               else
                 # Set the value picked from "X-*" field to $dscontents when the current value is empty
-                z = FieldTable[cv[0].downcase]; next unless z
+                z = FieldTable[cv[0].downcase]; next if z.nil?
                 v[z] ||=  cv[2]
               end
             else
@@ -211,7 +211,7 @@ module Sisimai
 
               # Diagnostic-Code: SMTP; 550-5.7.26 The MAIL FROM domain [email.example.jp]
               #    has an SPF record with a hard fail
-              next unless e.start_with?(" ")
+              next if e.start_with?(" ") == false
               v["diagnosis"] += " #{Sisimai::String.sweep(e)}"
             end
           end

data/lib/sisimai/rfc3834.rb

@@ -28,6 +28,9 @@ module Sisimai
         )
         [ ]*(.+)\z
       }x.freeze
+      Suspending = [
+        ["this email inbox", " is no longer in use."],
+      ].freeze
 
       # Detect auto reply message as RFC3834
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -41,15 +44,14 @@ module Sisimai
 
         LowerLabel.each do |e|
           # Set lower-cased value of each header related to auto-response
-          next unless mhead.has_key?(e)
+          next if mhead.has_key?(e) == false
           lower[e] = mhead[e].downcase
         end
 
         # DETECT_EXCLUSION_MESSAGE
         DoNotParse.each_key do |e|
           # Exclude message from root@
-          next unless lower[e]
-          next unless DoNotParse[e].any? { |a| lower[e].include?(a) }
+          next if lower[e].nil? || DoNotParse[e].none? { |a| lower[e].include?(a) }
           leave = 1
           break
         end
@@ -58,8 +60,7 @@ module Sisimai
         # DETECT_AUTO_REPLY_MESSAGE0
         AutoReply0.each_key do |e|
           # RFC3834 Auto-Submitted and other headers
-          next unless lower[e]
-          next unless AutoReply0[e].any? { |a| lower[e].include?(a) }
+          next if lower[e].nil? || AutoReply0[e].none? { |a| lower[e].include?(a) }
           match += 1
           break
         end
@@ -78,7 +79,7 @@ module Sisimai
         # RECIPIENT_ADDRESS
         %w[from return-path].each do |e|
           # Try to get the address of the recipient
-          next unless mhead[e]
+          next if mhead[e].nil?
           v['recipient'] = mhead[e]
           break
         end
@@ -88,12 +89,12 @@ module Sisimai
           v['recipient'] = Sisimai::Address.s3s4(v['recipient'])
           recipients += 1
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         if mhead['content-type']
           # Get the boundary string and set regular expression for matching with the boundary string.
           q = Sisimai::RFC2045.boundary(mhead['content-type'], 0) || ''
-          MarkingsOf[:boundary] = q unless q.empty?
+          MarkingsOf[:boundary] = q if q.empty? == false
         end
 
         # MESSAGE_BODY: Get the vacation message
@@ -117,6 +118,15 @@ module Sisimai
         v['diagnosis'] ||= mhead['subject']
         v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
         v['reason']    = 'vacation'
+
+        cv = v['diagnosis'].downcase
+        Suspending.each do |e|
+          # Check that the auto-replied message indicates the "Suspend" reason or not.
+          next unless Sisimai::String.aligned(cv, e)
+          v['reason'] = 'suspend'
+          break
+        end
+
         v['date']      = mhead['date']
         v['status']    = ''
 

data/lib/sisimai/rfc5322.rb

@@ -36,7 +36,7 @@ module Sisimai
       # @param    [String] argv1  Received header
       # @return   [Array]         Received header as a structured data
       def received(argv1)
-        return [] unless argv1.is_a?(::String)
+        return [] if argv1.is_a?(::String) == false
         return [] if argv1.include?(' invoked by uid') || argv1.include?(' invoked from network')
 
         # - https://datatracker.ietf.org/doc/html/rfc5322
@@ -63,14 +63,14 @@ module Sisimai
         recvd.each do |e|
           # Look up each label defined in "label" from Received header
           index += 1
-          break unless index < range; f = e.downcase
-          next  unless label.any? { |a| f == a }
+          break if index >= range; f = e.downcase
+          next  if label.none? { |a| f == a }
           token[f] = recvd[index + 1] || next
           token[f] = token[f].downcase.delete('();')
 
-          next  unless f == 'from'
-          break unless index + 2 < range
-          next  unless recvd[index + 2].start_with?('(')
+          next  if f != 'from'
+          break if index + 2 >= range
+          next  if recvd[index + 2].start_with?('(') == false
 
           # Get and keep a hostname in the comment as follows:
           # from mx1.example.com (c213502.kyoto.example.ne.jp [192.0.2.135]) by mx.example.jp (V8/cf)
@@ -90,7 +90,7 @@ module Sisimai
 
           # The 2nd element after the current element is a continuation of the current element.
           # such as "(c213502.kyoto.example.ne.jp", "[192.0.2.135])"
-          break unless index + 3 < range
+          break if index + 3 >= range
           other << recvd[index + 3].delete('();')
         end
 
@@ -173,7 +173,7 @@ module Sisimai
 
         cutby.each do |e|
           # Find a boundary string(2nd argument) from the 1st argument
-          positionor = email.index(e); next unless positionor
+          positionor = email.index(e); next if positionor.nil?
           boundaryor = e
           break
         end
@@ -200,7 +200,7 @@ module Sisimai
             #  Remove text after the first blank line: \n\n when "keeps" is false
             latterpart = latterpart[0, latterpart.index("\n\n")] if latterpart.include?("\n\n")
           end
-          latterpart << "\n" unless latterpart.end_with?("\n")
+          latterpart << "\n" if latterpart.end_with?("\n") == false
         end
 
         return [formerpart, latterpart]