sisimai 5.4.0-java → 5.5.0-java

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]

data/lib/sisimai/rfc791.rb

@@ -31,13 +31,13 @@ module Sisimai
         ipv4a = []
         %w|( ) [ ] ,|.each do |e|
           # Rewrite: "mx.example.jp[192.0.2.1]" => "mx.example.jp 192.0.2.1"
-          p0 = given.index(e); next unless p0
+          p0 = given.index(e); next if p0.nil?
           given[p0, 1] = ' '
         end
 
         given.split(' ').each do |e|
           # Find string including an IPv4 address
-          next unless e.index('.')  # IPv4 address must include "." character
+          next if e.index('.').nil? # IPv4 address must include "." character
 
           lx = e.size; next if lx < 7 || lx > 17  # 0.0.0.0 = 7, [255.255.255.255] = 17
           cu = 0  # Cursor for seeking each octet of an IPv4 address

data/lib/sisimai/rhost/aol.rb

@@ -14,6 +14,9 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for Aol
         # @since v5.2.0
+        # @see
+        # - Y!Sender Hub/SMTP Error Codes: https://senders.yahooinc.com/smtp-error-codes/
+        # - The MX record of Aol points "mx-aol.mail.gm0.yahoodns.net".
         def find(argvs)
           return "" if argvs["diagnosticcode"].empty?
           issuedcode = argvs["diagnosticcode"]
@@ -21,7 +24,7 @@ module Sisimai
 
           MessagesOf.each_key do |e|
             # Try to match the error message with message patterns defined in $MessagesOf
-            next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+            next if MessagesOf[e].none? { |a| issuedcode.include?(a) }
             reasontext = e
             break
           end

data/lib/sisimai/rhost/apple.rb

@@ -53,10 +53,14 @@ module Sisimai
             #   Try again later - https://support.apple.com/en-us/HT204137
             'due to excessive volume',
           ],
+          'suspend' => [
+            # - https://support.apple.com/guide/icloud/stop-using-or-reactivate-addresses-mm3adb030cbf/icloud
+            # - 550 5.1.1 <****@icloud.com>: inactive email address (in reply to RCPT TO command)
+            "inactive email address",
+          ],
           'userunknown' => [
               # - 550 5.1.1 <****@icloud.com>: inactive email address (in reply to RCPT TO command)
               # - 550 5.1.1 unknown or illegal alias: ****@icloud.com
-              'inactive email address',
               'user does not exist',
               'unknown or illegal alias',
           ],
@@ -65,20 +69,20 @@ module Sisimai
         # Detect bounce reason from Apple iCloud Mail
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for Apple
-        # @see      https://support.apple.com/en-us/102322
-        #           https://www.postmastery.com/icloud-postmastery-page/
-        #           https://smtpfieldmanual.com/provider/apple
+        # @see
+        # - Postmaster information for iCloud Mail: https://support.apple.com/en-us/102322
+        # - https://www.postmastery.com/icloud-postmastery-page/
+        # - https://smtpfieldmanual.com/provider/apple
         # @since v5.1.0
         def find(argvs)
-          return '' unless argvs
-          return '' unless argvs['diagnosticcode'].size > 0
+          return '' if argvs.nil? || argvs['diagnosticcode'].size == 0
 
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 
           MessagesOf.each_key do |e|
             MessagesOf[e].each do |f|
-              next unless issuedcode.include?(f)
+              next if issuedcode.include?(f) == false
               reasontext = e
               break
             end

data/lib/sisimai/rhost/cox.rb

@@ -61,7 +61,7 @@ module Sisimai
           'IPBL0101'  => 'blocked',       # The sending IP is in the Spamhaus Zen and Invaluement ivmSIP DNSBLs.
           'IPBL0110'  => 'blocked',       # The sending IP is in the Return Path and Invaluement ivmSIP DNSBLs.
           'IPBL0111'  => 'blocked',       # The sending IP is in the Spamhaus Zen, Return Path and Invaluement ivmSIP DNSBLs.
-          'IPBL1000'  => 'blocked',       # The sending IP address is listed on a CSI blacklist. You can check your status on the CSI website.
+          'IPBL1000'  => 'blocked',       # The sending IP address is listed on a CSI blacklist.
           'IPBL1001'  => 'blocked',       # The sending IP is listed in the Cloudmark CSI and Spamhaus Zen DNSBLs.
           'IPBL1010'  => 'blocked',       # The sending IP is listed in the Cloudmark CSI and Return Path DNSBLs.
           'IPBL1011'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen and Return Path DNSBLs.
@@ -69,12 +69,12 @@ module Sisimai
           'IPBL1101'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen and Invaluement IVMsip DNSBLs.
           'IPBL1110'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Return Path and Invaluement ivmSIP DNSBLs.
           'IPBL1111'  => 'blocked',       # The sending IP is in the Cloudmark CSI, Spamhaus Zen, Return Path and Invaluement ivmSIP DNSBLs.
-          'IPBL00001' => 'blocked',       # The sending IP address is listed on a Spamhaus blacklist. Check your status at Spamhaus.
+          'IPBL00001' => 'blocked',       # The sending IP address is listed on a Spamhaus blacklist.
 
           'URLBL011'  => 'spamdetected',  # A URL within the body of the message was found on blocklists SURBL and Spamhaus DBL.
           'URLBL101'  => 'spamdetected',  # A URL within the body of the message was found on blocklists SURBL and ivmURI.
           'URLBL110'  => 'spamdetected',  # A URL within the body of the message was found on blocklists Spamhaus DBL and ivmURI.
-          'URLBL1001' => 'spamdetected',  # The URL is listed on a Spamhaus blacklist. Check your status at Spamhaus.
+          'URLBL1001' => 'spamdetected',  # The URL is listed on a Spamhaus blacklist.
         }.freeze
         MessagesOf = {
           'blocked' => [
@@ -82,6 +82,8 @@ module Sisimai
             #   a three-hour block of the client's IP address.
             # - The sending IP address has exceeded the threshold of invalid recipients and has
             #   been blocked.
+            # - Cox enforces various rate limits to protect our platform. The sending IP address
+            #   has exceeded one of these rate limits and has been temporarily blocked.
             'cox too many bad commands from',
             'too many invalid recipients',
           ],
@@ -127,7 +129,9 @@ module Sisimai
         # Detect bounce reason from https://cox.com/
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String, Nil]           The bounce reason at Cox
-        # @see      https://www.cox.com/residential/support/email-error-codes.html
+        # @see
+        # - Email Error Codes: https://www.cox.com/business/support/email-error-codes.html
+        # - Feedback Loop Service https://www.cox.com/business/support/feedback-loop-service.html
         # @since v4.25.8
         def find(argvs)
           return "" if argvs["diagnosticcode"].empty?
@@ -145,7 +149,7 @@ module Sisimai
             # The error code was not found in ErrorCodes
             MessagesOf.each_key do |e|
               # Try to find with each error message defined in MessagesOf
-              next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+              next if MessagesOf[e].none? { |a| issuedcode.include?(a) }
               reasontext = e
               break
             end

data/lib/sisimai/rhost/facebook.rb

@@ -27,6 +27,9 @@ module Sisimai
             "RCP-P2",   # The attempted recipient's preferences prevent messages from being delivered.
             "RCP-P3",   # The attempted recipient's privacy settings blocked the delivery.
           ],
+          "mailboxfull" => [
+            "INT-P7",   # The attempted recipient has exceeded their storage quota.
+          ],
           "mesgtoobig" => [
             "MSG-P1",   # The message exceeds Facebook's maximum allowed size.
             "INT-P2",   # The message exceeds Facebook's maximum allowed size.
@@ -34,6 +37,9 @@ module Sisimai
           "notcompliantrfc" => [
             "MSG-P3",   # The message contains multiple instances of a header field that can only be present once.
           ],
+          "policyviolation" => [
+            "POL-P8",   # The message does not comply with Facebook's abuse policies and will not be accepted.
+          ],
           "rejected" => [
             "DNS-P1",   # Your SMTP MAIL FROM domain does not exist.
             "DNS-P2",   # Your SMTP MAIL FROM domain does not have an MX record.
@@ -45,13 +51,13 @@ module Sisimai
           ],
           "spamdetected" => [
             "POL-P6",   # The message contains a url that has been blocked by Facebook.
-            "POL-P7",   # The message does not comply with Facebook's abuse policies and will not be accepted.
           ],
           "suspend" => [
             "RCP-T4",   # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
           ],
           "systemerror" => [
-            "RCP-T1",   # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
+            "RCP-T1",   # The attempted recipient address is not currently available due to an internal system issue.
+            "INT-Tx",   # These codes indicate a temporary issue internal to Facebook's system.
           ],
           "toomanyconn" => [
             "CON-T1",   # Facebook's mail server currently has too many connections open to allow another one.
@@ -85,7 +91,7 @@ module Sisimai
 
           ErrorCodes.each_key do |e|
             # The key is a bounce reason name
-            next unless ErrorCodes[e].any? { |a| errorlabel == a }
+            next if ErrorCodes[e].none? { |a| errorlabel == a }
             reasontext = e
             break
           end