sisimai 5.6.0-java → 5.7.1-java

data/lib/sisimai/reason/virusdetected.rb

@@ -1,10 +1,10 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::VirusDetected checks the bounce reason is "virusdetected" or not. This class
+    # Sisimai::Reason::VirusDetected checks the bounce reason is "VirusDetected" or not. This class
     # is called only Sisimai::Reason class.
     #
     # This is an error that any virus or trojan horse detected in the message by a virus scanner program
-    # at a destination mail server. This reason has been divided from "securityerror" at Sisimai 4.22.0.
+    # at a destination mail server. This reason has been divided from "SecurityError" at Sisimai 4.22.0.
     #
     #   Your message was infected with a virus. You should download a virus
     #   scanner and check your computer for viruses.
@@ -14,13 +14,14 @@ module Sisimai
     #
     module VirusDetected
       class << self
+        require 'sisimai/eb'
         Index = ["it has a potentially executable attachment"].freeze
         Pairs = [
           ["message was ", "ected", " virus"],
           ["virus", " detected"],
         ].freeze
 
-        def text; return 'virusdetected'; end
+        def text; return Sisimai::Eb::ReEXEC; end
         def description; return 'Email rejected due to a virus scanner on a destination host'; end
 
         # Try to match that the given text and regular expressions
@@ -34,7 +35,7 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is "virusdetected" or not
+        # The bounce reason is "VirusDetected" or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [Boolean]               true:  virus detected
         #                                   false: virus was not detected
@@ -44,7 +45,7 @@ module Sisimai
           # The value of "reason" isn't "visusdetected" when the value of "command" is an SMTP command
           # 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 true  if argvs['reason'] == Sisimai::Eb::ReEXEC
           return false if Sisimai::SMTP::Command::ExceptDATA.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end

data/lib/sisimai/reason.rb

@@ -3,24 +3,28 @@ module Sisimai
   # Sisimai::Fact object as an argument of find() method. This class is called only Sisimai::Fact.
   module Reason
     class << self
+      require 'sisimai/eb'
+
       # All the error reason list Sisimai support
       # @return   [Array] Reason list
       def index
-        return %w[
-          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
+        return [
+          Sisimai::Eb::ReAUTH, Sisimai::Eb::ReFAMA, Sisimai::Eb::ReBLOC, Sisimai::Eb::ReBODY, Sisimai::Eb::ReSIZE,
+          Sisimai::Eb::ReTIME, Sisimai::Eb::ReTTLS, Sisimai::Eb::ReFILT, Sisimai::Eb::ReMOVE, Sisimai::Eb::ReHOST,
+          Sisimai::Eb::ReFULL, Sisimai::Eb::ReUNIX, Sisimai::Eb::ReINET, Sisimai::Eb::Re00MX, Sisimai::Eb::ReNRFC,
+          Sisimai::Eb::ReRATE, Sisimai::Eb::Re___1, Sisimai::Eb::ReFROM, Sisimai::Eb::RePASS, Sisimai::Eb::ReSPAM,
+          Sisimai::Eb::ReEXEC, Sisimai::Eb::ReWONT, Sisimai::Eb::ReSAFE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReQPTR,
+          Sisimai::Eb::RePROC, Sisimai::Eb::ReDISK, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReUSER, Sisimai::Eb::ReCOMM,
         ]
       end
 
-      # @abstract is_explicit() returns 0 when the argument is empty or is "undefined" or is "onhold"
+      # @abstract is_explicit() returns 0 when the argument is empty or is "Undefined" or is "OnHold"
       # @param    string argv1  Reason name
       # @return   bool          false: The reaosn is not explicit
       def is_explicit(argv1 = '')
         return false if argv1.nil?
         return false if argv1.empty?
-        return false if argv1 == "undefined" || argv1 == "onhold" || argv1.empty?
+        return false if argv1 == Sisimai::Eb::Re___0 || argv1 == Sisimai::Eb::Re___1 || argv1.empty?
         return true
       end
 
@@ -38,29 +42,30 @@ module Sisimai
       # @return   [Hash] Reason list
       def retry
         return {
-          'undefined' => true, 'onhold' => true, 'systemerror' => true, 'securityerror' => true,
-          'expired' => true, 'networkerror' => true, 'hostunknown' => true, 'userunknown' => true
+          Sisimai::Eb::Re___0 => true, Sisimai::Eb::Re___1 => true, Sisimai::Eb::RePROC => true,
+          Sisimai::Eb::ReSAFE => true, Sisimai::Eb::ReTIME => true, Sisimai::Eb::ReINET => true,
+          Sisimai::Eb::ReHOST => true, Sisimai::Eb::ReUSER => true, 
         }.freeze
       end
       ModulePath = Sisimai::Reason.path
       GetRetried = Sisimai::Reason.retry
       ClassOrder = [
-        %w[
-          MailboxFull EmailTooLarge Suspend HasMoved NoRelaying AuthFailure UserUnknown Filtered
-          RequirePTR NotCompliantRFC BadReputation ContentError Rejected HostUnknown SpamDetected
-          RateLimited Blocked
-        ],
-        %w[
-          MailboxFull AuthFailure BadReputation SpamDetected VirusDetected PolicyViolation NoRelaying
-          SystemError NetworkError Suspend ContentError SystemFull NotAccept Expired FailedSTARTTLS
-          SecurityError Suppressed MailerError
-        ],
-        %w[
-          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
-        ]
+        # 0. true() meethod in the following reasons are called from Reason->find()
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSIZE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReMOVE, Sisimai::Eb::RePASS,
+         Sisimai::Eb::ReAUTH, Sisimai::Eb::ReUSER, Sisimai::Eb::ReFILT, Sisimai::Eb::ReQPTR, Sisimai::Eb::ReNRFC,
+         Sisimai::Eb::ReFAMA, Sisimai::Eb::ReBODY, Sisimai::Eb::ReFROM, Sisimai::Eb::ReHOST, Sisimai::Eb::ReSPAM, 
+         Sisimai::Eb::ReRATE, Sisimai::Eb::ReBLOC, Sisimai::Eb::ReTTLS, Sisimai::Eb::Re00MX, Sisimai::Eb::ReEXEC,
+         Sisimai::Eb::ReWONT],
+
+        # 1. match() method in the following reasons are called from Reason->find()
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSPAM, Sisimai::Eb::ReEXEC, Sisimai::Eb::RePASS, Sisimai::Eb::RePROC,
+         Sisimai::Eb::ReINET, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReDISK, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReUNIX,
+         Sisimai::Eb::ReSAFE, Sisimai::Eb::ReWONT, Sisimai::Eb::ReCOMM, Sisimai::Eb::ReTIME],
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSIZE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReUSER, Sisimai::Eb::ReFILT,
+         Sisimai::Eb::ReFROM, Sisimai::Eb::ReHOST, Sisimai::Eb::ReSPAM, Sisimai::Eb::ReRATE, Sisimai::Eb::ReBLOC,
+         Sisimai::Eb::ReAUTH, Sisimai::Eb::ReTTLS, Sisimai::Eb::ReSAFE, Sisimai::Eb::RePROC, Sisimai::Eb::ReINET,
+         Sisimai::Eb::ReTIME, Sisimai::Eb::ReBODY, Sisimai::Eb::ReMOVE, Sisimai::Eb::ReDISK, Sisimai::Eb::Re00MX,
+         Sisimai::Eb::ReUNIX, Sisimai::Eb::RePASS, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReCOMM, Sisimai::Eb::Re___1],
       ]
 
       # Detect the bounce reason
@@ -74,7 +79,7 @@ module Sisimai
           # retry() method.
           return argvs['reason'] if argvs['reason'].empty? == false
         end
-        return 'delivered' if argvs['deliverystatus'].start_with?('2.')
+        return Sisimai::Eb::ReSENT if argvs['deliverystatus'].start_with?('2.')
 
         reasontext = ''
         issuedcode = argvs['diagnosticcode'] || ''
@@ -100,21 +105,21 @@ module Sisimai
           end
         end
 
-        if reasontext.empty? || reasontext == 'undefined'
+        if reasontext.empty? || reasontext == Sisimai::Eb::Re___0
           # Bounce reason is not detected yet.
           reasontext = self.anotherone(argvs)
 
-          if reasontext == 'undefined' || reasontext.empty?
+          if reasontext == Sisimai::Eb::Re___0 || reasontext.empty?
             # Action: delayed => "expired"
             reasontext   = nil
-            reasontext ||= 'expired' if argvs['action'] == 'delayed'
+            reasontext ||= Sisimai::Eb::ReTIME if argvs['action'] == Sisimai::Eb::AeSTAY
             return reasontext if reasontext
 
             # 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'   if issuedcode.empty? == false
-            reasontext ||= 'undefined'
+            reasontext   = Sisimai::Eb::ReAWAY if Sisimai::Reason::Vacation.match(issuedcode.downcase)
+            reasontext ||= Sisimai::Eb::Re___1 if issuedcode.empty? == false
+            reasontext ||= Sisimai::Eb::Re___0
           end
         end
         return reasontext
@@ -151,7 +156,7 @@ module Sisimai
             end
 
             next if r.match(issuedcode) == false
-            reasontext = e.downcase
+            reasontext = e
             break
           end
           break if reasontext.empty? == false
@@ -160,31 +165,31 @@ module Sisimai
           code2digit = statuscode[0, 3] || ''
           if code2digit == '5.6' || code2digit == '4.6'
             #  X.6.0   Other or undefined media error
-            reasontext = 'contenterror'
+            reasontext = Sisimai::Eb::ReBODY
 
           elsif code2digit == '5.7' || code2digit == '4.7'
             #  X.7.0   Other or undefined security status
-            reasontext = 'securityerror'
+            reasontext = Sisimai::Eb::ReSAFE
 
           elsif codeformat.start_with?('X-UNIX')
             # Diagnostic-Code: X-UNIX; ...
-            reasontext = 'mailererror'
+            reasontext = Sisimai::Eb::ReUNIX
 
           else
             # 50X Syntax Error?
             require 'sisimai/reason/syntaxerror'
-            reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
+            reasontext = Sisimai::Eb::ReCOMM if Sisimai::Reason::SyntaxError.true(argvs)
           end
           break if reasontext.empty? == false
 
           # Check the value of Action: field, first
-          if actiontext.start_with?('delayed', 'expired')
+          if actiontext.start_with?(Sisimai::Eb::AeSTAY, 'expired')
             # Action: delayed, expired
-            reasontext = 'expired'
+            reasontext = Sisimai::Eb::ReTIME
           else
             # Rejected at connection or after EHLO|HELO
             thecommand = argvs['command'] || ''
-            reasontext = 'blocked' if %w[HELO EHLO].index(thecommand)
+            reasontext = Sisimai::Eb::ReBLOC if %w[HELO EHLO].index(thecommand)
           end
           break
         end
@@ -222,12 +227,12 @@ module Sisimai
 
         if issuedcode.upcase.include?('X-UNIX; ')
           # X-Unix; ...
-          reasontext = 'mailererror'
+          reasontext = Sisimai::Eb::ReUNIX
         else
           # Detect the bounce reason from "Status:" code
           require 'sisimai/smtp/status'
           reasontext = Sisimai::SMTP::Status.name(Sisimai::SMTP::Status.find(argv1))
-          reasontext = "undefined" if reasontext.empty?
+          reasontext = Sisimai::Eb::Re___0 if reasontext.empty?
         end
         return reasontext
       end

data/lib/sisimai/rfc1123.rb

@@ -125,7 +125,7 @@ module Sisimai
         sourcetext = sourcetext.gsub("[", " [").gsub("(", " (").gsub("<", " <") # Prefix a space character before each bracket
         sourcetext = sourcetext.gsub("]", "] ").gsub(")", ") ").gsub(">", "> ") # Suffix a space character behind each bracket
         sourcetext = sourcetext.gsub(":", ": ").gsub(";", "; ")                 # Suffix a space character behind : and ;
-        sourcetext = Sisimai::String.sweep(sourcetext)
+        sourcetext = sourcetext.split.join(" ")
 
         catch :MAKELIST do
           Sandwiched.each do |e|

data/lib/sisimai/rfc1894.rb

@@ -2,6 +2,7 @@ module Sisimai
   # Sisimai::RFC1894 DSN field defined in RFC3464 (obsoletes RFC1894)
   module RFC1894
     class << self
+      require 'sisimai/eb'
       require 'sisimai/string'
       FieldNames = [
         # https://tools.ietf.org/html/rfc3464#section-2.2
@@ -58,8 +59,13 @@ module Sisimai
       }.freeze
 
       SubtypeSet = {"addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS"}.freeze
-      ActionList = ["failed", "delayed", "delivered", "relayed", "expanded"].freeze
-      Correction = {'deliverable' => 'delivered', 'expired' => 'failed', 'failure' => 'failed'}
+      ActionList = [Sisimai::Eb::AeFAIL, Sisimai::Eb::AeSTAY, Sisimai::Eb::AeSENT,
+                    Sisimai::Eb::AePASS, Sisimai::Eb::AeEXPN].freeze
+      Correction = {
+        'deliverable' => Sisimai::Eb::AeSENT,
+        'expired'     => Sisimai::Eb::AeFAIL,
+        'failure'     => Sisimai::Eb::AeFAIL,
+      }
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -146,7 +152,7 @@ module Sisimai
         return nil if argv0.empty?
         label = Sisimai::RFC1894.label(argv0)
         group = FieldGroup[label] || ''
-        parts = argv0.split(":", 2); parts[1] = parts[1].nil? ? "" : Sisimai::String.sweep(parts[1])
+        parts = argv0.split(":", 2); parts[1] = parts[1].nil? ? "" : parts[1].split.join(" ")
         return nil if group.empty? || CapturesOn[group].nil?
 
         # Try to match with each pattern of Per-Message field, Per-Recipient field
@@ -157,24 +163,25 @@ module Sisimai
         #   - 4: Comment
         table = [label, "", "", group, ""]
 
-        if group == 'addr' || group == 'code' || group == 'host'
+        case group
+        when "addr", "code", "host"
           # - Final-Recipient: RFC822; kijitora@nyaan.jp
           # - Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
           # - Remote-MTA: DNS; mx.example.jp
           if parts[1].include?(";")
             # There is a valid sub type (including ";")
             v = parts[1].split(";", 2)
-            table[1] = Sisimai::String.sweep(v[0]).upcase if v.size > 0
-            table[2] = Sisimai::String.sweep(v[1])        if v.size > 1
+            table[1] = v[0].split.join(" ").upcase if v.size > 0
+            table[2] = v[1].split.join(" ")        if v.size > 1
           else
             # There is no sub type like "Diagnostic-Code: 550 5.1.1 <kijitora@example.jp>..."
-            table[2] = Sisimai::String.sweep(parts[1])
+            table[2] = parts[1]
             table[1] = SubtypeSet[group] || ""
           end
           table[2] = table[2].downcase if group == "host"
           table[2] = "" if table[2] =~ /\A\s+\z/
 
-        elsif group == "list"
+        when "list"
           # Action: failed
           # Check that the value is an available value defined in "ActionList" or not.
           # When the value is invalid, convert to an available value defined in "Correction"

data/lib/sisimai/rfc2045.rb

@@ -146,7 +146,7 @@ module Sisimai
         return nil if block.empty?
 
         (upperchunk, lowerchunk) = block.split("\n\n", 2)
-        return ['', ''] if upperchunk.nil? || upperchunk.empty?
+        return ['', ''] if upperchunk.nil? || upperchunk.empty? || lowerchunk.nil?
         return ['', ''] if upperchunk.index('Content-Type').nil?
 
         headerpart = ['', ''] # ["text/plain; charset=iso-2022-jp; ...", "quoted-printable"]
@@ -213,14 +213,17 @@ module Sisimai
       # Split argv1: multipart/* blocks by a boundary string in argv0
       # @param    [String] argv0  The value of Content-Type header
       # @param    [String] argv1  A pointer to multipart/* message blocks
+      # @param    [String] depth  Depth of MIME parts
       # @return   [Array]         List of each part of multipart/*
       # @since v5.0.0
-      def levelout(argv0 = '', argv1 = '')
+      def levelout(argv0 = '', argv1 = '', depth = 0)
         return [] if argv0.empty?
         return [] if argv1.empty?
+        return [] if depth > 100
 
         boundary01 = boundary(argv0, 0); return [] if boundary01.empty?
         multiparts = argv1.split(Regexp.new(Regexp.escape(boundary01) + "\n"))
+        partsdepth = depth + 1
         partstable = []
 
         # Remove empty or useless preamble and epilogue of multipart/* block
@@ -237,7 +240,7 @@ module Sisimai
             bodyinside = f[-1].split("\n\n", 2)[-1]
             next if bodyinside.size < 9 || bodyinside.index(boundary02).nil?
 
-            v = levelout(f[0], bodyinside)
+            v = levelout(f[0], bodyinside, partsdepth)
             partstable += v if v.size > 0
           else
             # The part is not a multipart/* block
@@ -263,7 +266,7 @@ module Sisimai
       # @return   [String]        Message body
       def makeflat(argv0 = '', argv1 = '')
         return "" if argv0.nil? || argv1.nil?
-        return "" if argv0.index('multipart/') == false || argv0.index('boundary=') == false
+        return "" if argv0.downcase.index('multipart/') == false || argv0.downcase.index('boundary=') == false
 
         # Some bounce messages include lower-cased "content-type:" field such as the followings:
         #   - content-type: message/delivery-status        => Content-Type: message/delivery-status
@@ -271,7 +274,7 @@ module Sisimai
         #   - CHARSET=, BOUNDARY=                          => charset-, boundary=
         #   - message/xdelivery-status                     => message/delivery-status
         iso2022set = %r/charset=["']?(iso-2022-[-a-z0-9]+)['"]?\b/
-        multiparts = levelout(argv0, argv1)
+        multiparts = levelout(argv0, argv1, 0)
         flattenout = ''
         delimiters = ["/delivery-status", "/rfc822", "/feedback-report", "/partial"]
 

data/lib/sisimai/rfc3464/thirdparty.rb

@@ -2,6 +2,7 @@ module Sisimai
   module RFC3464
     module ThirdParty
       class << self
+        require 'sisimai/eb'
         ThirdParty = {
           #"Aol"     => ["X-Outbound-Mail-Relay-"], # X-Outbound-Mail-Relay-(Queue-ID|Sender)
           "PowerMTA" => ["X-PowerMTA-"],            # X-PowerMTA-(VirtualMTA|BounceCategory)
@@ -50,15 +51,15 @@ module Sisimai
             "x-powermta-bouncecategory" => "text", # X-PowerMTA-BounceCategory: bad-mailbox
           }.freeze
           MessagesOf = {
-            "bad-domain"          => "hostunknown",
-            "bad-mailbox"         => "userunknown",
-            "inactive-mailbox"    => "suspend",
-            "message-expired"     => "expired",
-            "no-answer-from-host" => "networkerror",
-            "policy-related"      => "policyviolation",
-            "quota-issues"        => "mailboxfull",
-            "routing-errors"      => "systemerror",
-            "spam-related"        => "spamdetected",
+            "bad-domain"          => Sisimai::Eb::ReHOST,
+            "bad-mailbox"         => Sisimai::Eb::ReUSER,
+            "inactive-mailbox"    => Sisimai::Eb::ReQUIT,
+            "message-expired"     => Sisimai::Eb::ReTIME,
+            "no-answer-from-host" => Sisimai::Eb::ReINET,
+            "policy-related"      => Sisimai::Eb::ReWONT,
+            "quota-issues"        => Sisimai::Eb::ReFULL,
+            "routing-errors"      => Sisimai::Eb::RePROC,
+            "spam-related"        => Sisimai::Eb::ReSPAM,
           }.freeze
 
           # Returns an array which is compatible with the value returned from Sisimai::RFC1894->field()
@@ -71,7 +72,7 @@ module Sisimai
             fieldparts = argv1.split(":", 2)
             xfieldname = fieldparts[0].downcase
             xgroupname = FieldGroup[xfieldname]; return [] if xgroupname.nil?
-            xfieldlist = ["", "", Sisimai::String.sweep(fieldparts[1]), xgroupname, "", "PowerMTA"]
+            xfieldlist = ["", "", fieldparts[1].split.join(" "), xgroupname, "", "PowerMTA"]
 
             # - 0: Field-Name
             # - 1: Sub Type: RFC822, DNS, X-Unix, and so on)

data/lib/sisimai/rfc3464.rb

@@ -109,16 +109,12 @@ module Sisimai
               if isboundary.any? { |a| e == a } then goestonext = false; break; end
               if e.start_with?("Content-Type:")
                 # Content-Type: field in multipart/*
-                if e.include?("multipart/")
+                case
                   # Content-Type: multipart/alternative; boundary=aa00220022222222ffeebb
                   # Pick the boundary string and store it into "isboucdary"
-                  isboundary << Sisimai::RFC2045.boundary(e, 0)
-                elsif e.include?("text/plain")
-                  # Content-Type: "text/plain"
-                  goestonext = false
-                else
-                  # Other types: for example, text/html, image/jpg, and so on
-                  goestonext = true
+                  when e.include?("multipart/") then isboundary << Sisimai::RFC2045.boundary(e, 0)
+                  when e.include?("text/plain") then goestonext = false
+                  else goestonext = true # Other types: for example, text/html, image/jpg, and so on
                 end
                 break
               end
@@ -145,7 +141,8 @@ module Sisimai
             next unless o = Sisimai::RFC1894.field(e)
             v = dscontents[-1]
 
-            if o[3] == "addr"
+            case o[3]
+            when "addr"
               # Final-Recipient: rfc822; kijitora@example.jp
               # X-Actual-Recipient: rfc822; kijitora@example.co.jp
               if o[0] == "final-recipient"
@@ -165,7 +162,7 @@ module Sisimai
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 v["alias"] = o[2]
               end
-            elsif o[3] == "code"
+            when "code"
               # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
               v["spec"]      = o[1]
               v["diagnosis"] = o[2]
@@ -212,7 +209,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 if e.start_with?(" ") == false
-              v["diagnosis"] += " #{Sisimai::String.sweep(e)}"
+              v["diagnosis"] += " " + e
             end
           end
         end
@@ -232,7 +229,7 @@ module Sisimai
 
         if beforemesg != ""
           # Pick some values of $dscontents from the string before StartingOf[:message]
-          beforemesg = Sisimai::String.sweep(beforemesg)
+          beforemesg = beforemesg.split.join(" ")
           alternates["command"]   = Sisimai::SMTP::Command.find(beforemesg)
           alternates["replycode"] = Sisimai::SMTP::Reply.find(beforemesg, dscontents[0]["status"])
           alternates["status"]    = Sisimai::SMTP::Status.find(beforemesg, alternates["replycode"])
@@ -242,7 +239,6 @@ module Sisimai
         dscontents.each do |e|
           # Set default values stored in "permessage" if each value in "dscontents" is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           lowercased = e["diagnosis"].downcase
 
           if recipients == 1
@@ -254,7 +250,7 @@ module Sisimai
             else
               # The value of e["diagnosis"] is not contained in $beforemesg
               # There may be an important error message in $beforemesg
-              e["diagnosis"] = Sisimai::String.sweep(sprintf("%s %s", beforemesg, e["diagnosis"]))
+              e["diagnosis"] = sprintf("%s %s", beforemesg, e["diagnosis"])
             end
           end
           e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"])

data/lib/sisimai/rfc3834.rb

@@ -3,6 +3,8 @@ module Sisimai
   module RFC3834
     class << self
       # http://tools.ietf.org/html/rfc3834
+      require 'sisimai/eb'
+
       MarkingsOf = {:boundary => '__SISIMAI_PSEUDO_BOUNDARY__'}
       LowerLabel = %w[from to subject auto-submitted precedence x-apple-action].freeze
       DoNotParse = {
@@ -116,19 +118,18 @@ module Sisimai
           break if haveloaded >= maxmsgline
         end
         v['diagnosis'] ||= mhead['subject']
-        v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
-        v['reason']    = 'vacation'
+        v['reason']      = Sisimai::Eb::ReAWAY
 
         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'
+          v['reason'] = Sisimai::Eb::ReQUIT
           break
         end
 
-        v['date']      = mhead['date']
-        v['status']    = ''
+        v['date']   = mhead['date']
+        v['status'] = ''
 
         if cv = lower['subject'].match(SubjectSet)
           # Get the Subject header from the original message

data/lib/sisimai/rfc791.rb

@@ -12,8 +12,7 @@ module Sisimai
 
         octet.each do |e|
           # Check each octet is between 0 and 255
-          return false unless e =~ /\A[0-9]{1,3}\z/
-          v = e.to_i
+          return false unless e =~ /\A[0-9]{1,3}\z/; v = e.to_i
           return false if v < 0 || v > 255
         end
         return true
@@ -27,42 +26,8 @@ module Sisimai
         return nil if argv0.to_s.empty?
         return []  if argv0.size < 7
 
-        given = argv0.dup
-        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 if p0.nil?
-          given[p0, 1] = ' '
-        end
-
-        given.split(' ').each do |e|
-          # Find string including an IPv4 address
-          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
-          as = '' # ASCII Code of each character
-          eo = '' # Buffer of each octet of IPv4 Address
-
-          while cu < lx
-            # Check whether each character is a number or "." or not
-            as  = e[cu, 1].ord
-            cu += 1
-
-            if as < 48 || as > 57
-              # The character is not a number(0-9)
-              break if as      != 46  # The character is not "."
-              next  if eo      == ''  # The current buffer is empty
-              break if eo.to_i > 255  # The current buffer is greater than 255
-              eo = ''
-              next
-            end
-            eo += as.chr
-            break if eo.to_i > 255
-          end
-          ipv4a << e if eo.size > 0 && eo.to_i < 256
-        end
-        return ipv4a
+        given = argv0.dup.tr('()[],', ' ').squeeze(' ')
+        return given.split(' ').select { |e| is_ipv4address(e) }
       end
 
     end

data/lib/sisimai/rhost/aol.rb

@@ -5,9 +5,10 @@ module Sisimai
     # only from Sisimai::Fact class.
     module Aol
       class << self
+        require 'sisimai/eb'
         MessagesOf = {
-          "hostunknown" => ["Host or domain name not found"],
-          "notaccept"   => ["type=MX: Malformed or unexpected name server reply"],
+          Sisimai::Eb::ReHOST => ["Host or domain name not found"],
+          Sisimai::Eb::Re00MX => ["type=MX: Malformed or unexpected name server reply"],
         }.freeze
 
         # Detect bounce reason from Aol Mail: https://www.aol.com

data/lib/sisimai/rhost/apple.rb

@@ -5,8 +5,9 @@ module Sisimai
     # This class is called only Sisimai::Fact class.
     module Apple
       class << self
+        require 'sisimai/eb'
         MessagesOf = {
-          'authfailure' => [
+          Sisimai::Eb::ReAUTH => [
             # - 554 5.7.1 Your message was rejected due to example.jp's DMARC policy.
             #   See https://support.apple.com/en-us/HT204137 for
             # - 554 5.7.1 [HME1] This message was blocked for failing both SPF and DKIM authentication
@@ -14,7 +15,7 @@ module Sisimai
             's dmarc policy',
             'blocked for failing both spf and dkim autentication checks',
           ],
-          'blocked' => [
+          Sisimai::Eb::ReBLOC => [
             # - 550 5.7.0 Blocked - see https://support.proofpoint.com/dnsbl-lookup.cgi?ip=192.0.1.2
             # - 550 5.7.1 Your email was rejected due to having a domain present in the Spamhaus
             #   DBL -- see https://www.spamhaus.org/dbl/
@@ -26,39 +27,39 @@ module Sisimai
             'blocked - see https://support.proofpoint.com/dnsbl-lookup',
             'not accepting connections',
           ],
-          'hasmoved' => [
+          Sisimai::Eb::ReMOVE => [
             # - 550 5.1.6 recipient no longer on server: *****@icloud.com
             'recipient no longer on server',
           ],
-          'mailboxfull' => [
+          Sisimai::Eb::ReFULL => [
             # - 552 5.2.2 <****@icloud.com>: user is over quota (in reply to RCPT TO command)
             'user is over quota',
           ],
-          'norelaying' => [
+          Sisimai::Eb::RePASS => [
             # - 554 5.7.1 <*****@icloud.com>: Relay access denied
             'relay access denied',
           ],
-          'notaccept' => ['host/domain does not accept mail'],
-          'policyviolation' => [
+          Sisimai::Eb::Re00MX => ['host/domain does not accept mail'],
+          Sisimai::Eb::ReWONT => [
             # - 550 5.7.1 [CS01] Message rejected due to local policy.
             #   Please visit https://support.apple.com/en-us/HT204137
             'due to local policy',
           ],
-          'ratelimited' => [
+          Sisimai::Eb::ReRATE => [
             # - 421 4.7.1 Messages to ****@icloud.com deferred due to excessive volume.
             #   Try again later - https://support.apple.com/en-us/HT204137
             'due to excessive volume',
           ],
-          'rejected' => [
+          Sisimai::Eb::ReFROM => [
             # - 450 4.1.8 <kijitora@example.jp>: Sender address rejected: Domain not found
             'sender address rejected',
           ],
-          'suspend' => [
+          Sisimai::Eb::ReQUIT => [
             # - 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' => [
+          Sisimai::Eb::ReUSER => [
               # - 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
               'user does not exist',