sisimai 5.4.0 → 5.5.0

data/lib/sisimai/reason/hasmoved.rb

@@ -17,7 +17,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/hostunknown.rb

@@ -35,7 +35,7 @@ module Sisimai
         # @return   [Boolean]       false: Did not match, true: Matched
         # @since v4.0.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
@@ -55,7 +55,7 @@ module Sisimai
           if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
             # To prevent classifying DNS errors as "HostUnknown"
             require 'sisimai/reason/networkerror'
-            return true unless Sisimai::Reason::NetworkError.match(issuedcode)
+            return true if Sisimai::Reason::NetworkError.match(issuedcode) == false
           else
             # Status: 5.1.2
             # Diagnostic-Code: SMTP; 550 Host unknown

data/lib/sisimai/reason/mailboxfull.rb

@@ -66,7 +66,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/mailererror.rb

@@ -30,7 +30,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/mesgtoobig.rb

@@ -29,7 +29,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/networkerror.rb

@@ -36,7 +36,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/norelaying.rb

@@ -28,7 +28,7 @@ module Sisimai
           'specified domain is not allowed',
           "that domain isn't in my list of allowed rcpthost",
           'this system is not configured to relay mail',
-          'unable to relay for',
+          'unable to relay ',
           "we don't handle mail for",
         ].freeze
 
@@ -39,7 +39,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/notaccept.rb

@@ -11,9 +11,8 @@ module Sisimai
       class << self
         # Destination mail server does not accept any message
         Index = [
-          'does not accept mail (nullmx)',
+          'does not accept mail',             # Sendmail
           'host/domain does not accept mail', # iCloud
-          'host does not accept mail',        # Sendmail
           'mail receiving disabled',
           'name server: .: host not found',   # Sendmail
           'no mx record found for domain=',   # Oath(Yahoo!)
@@ -28,7 +27,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -25,7 +25,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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

data/lib/sisimai/reason/policyviolation.rb

@@ -19,7 +19,6 @@ module Sisimai
         Index = [
           'an illegal attachment on your message',
           'because the recipient is not accepting mail with ',    # AOL Phoenix
-          'by non-member to a members-only list',
           'closed mailing list',
           'denied by policy',
           'email not accepted for policy reasons',
@@ -35,9 +34,8 @@ module Sisimai
           'messages with multiple addresses',
           'rejected for policy reasons',
           'protocol violation',
-          'the email address used to send your message is not subscribed to this group',
           'the message was rejected by organization policy',
-          'this message was blocked because its content presents a potential',
+          'this message was blocked because its content presents a potential', # https://support.google.com/mail/answer/6590
           'we do not accept messages containing images or other attachments',
           "you're using a mass mailer",
         ].freeze
@@ -53,7 +51,7 @@ 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

data/lib/sisimai/reason/rejected.rb

@@ -23,11 +23,12 @@ module Sisimai
           'access denied (sender blacklisted)',
           'address rejected',
           'administrative prohibition',
-          'batv failed to verify',    # SoniWall
-          'batv validation failure',  # SoniWall
+          'batv failed to verify',    # SonicWall
+          'batv validation failure',  # SonicWall
           'backscatter protection detected an invalid or expired email address',  # MDaemon
           "because the sender isn't on the recipient's list of senders to accept mail from",
           'bogus mail from',          # IMail - block empty sender
+          'by non-member to a members-only list',
           "can't determine purported responsible address",
           'connections not accepted from servers without a valid sender domain',
           'denied [bouncedeny]',      # McAfee
@@ -66,6 +67,7 @@ module Sisimai
           'sender was rejected',      # qmail
           'spam reporting address',   # SendGrid|a message to an address has previously been marked as Spam by the recipient.
           'syntax error: empty email address',
+          'the email address used to send your message is not subscribed to this group',
           'the message has been rejected by batv defense',
           'this server does not accept mail from',
           'transaction failed unsigned dsn for',
@@ -83,7 +85,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return false if IsNot.any? { |a| argv1.include?(a) }
           return true  if Index.any? { |a| argv1.include?(a) }
           return false

data/lib/sisimai/reason/requireptr.rb

@@ -44,7 +44,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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

data/lib/sisimai/reason/securityerror.rb

@@ -48,7 +48,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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

data/lib/sisimai/reason/spamdetected.rb

@@ -122,7 +122,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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

data/lib/sisimai/reason/speeding.rb

@@ -18,7 +18,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/suspend.rb

@@ -22,6 +22,7 @@ module Sisimai
           'mailbox unavailable or access denied',
           'recipient rejected: temporarily inactive',
           'recipient suspend the service',
+          "the email account that you tried to reach is inactive",
           'this account has been disabled or discontinued',
           'this account has been temporarily suspended',
           'this address no longer accepts mail',
@@ -38,7 +39,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/systemerror.rb

@@ -45,7 +45,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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

data/lib/sisimai/reason/systemfull.rb

@@ -20,7 +20,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/toomanyconn.rb

@@ -34,7 +34,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/userunknown.rb

@@ -112,6 +112,7 @@ module Sisimai
           'user unknown',
           'utilisateur inconnu !',
           'vdeliver: invalid or unknown virtual user',
+          'weil die adresse nicht gefunden wurde oder keine e-mails empfangen kann',
           'your envelope recipient is in my badrcptto list',
         ].freeze
         Pairs = [
@@ -147,7 +148,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         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
@@ -183,12 +184,12 @@ module Sisimai
                 next
               end
 
-              next unless r.match(issuedcode)
+              next if r.match(issuedcode) == false
               # Match with reason defined in Sisimai::Reason::* except UserUnknown.
               matchother = true
               break
             end
-            return true unless matchother # Did not match with other message patterns
+            return true if matchother == false  # Did not match with other message patterns
 
           elsif argvs['command'] == 'RCPT'
             # When the SMTP command is not "RCPT", the session rejected by other

data/lib/sisimai/reason/vacation.rb

@@ -18,7 +18,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/virusdetected.rb

@@ -31,7 +31,7 @@ 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 false
         end

data/lib/sisimai/reason.rb

@@ -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