sisimai 5.1.0-java → 5.2.0-java

data/lib/sisimai/reason.rb

@@ -1,19 +1,29 @@
 module Sisimai
   # Sisimai::Reason detects the bounce reason from the Hash table which is to be constructed to 
-  # Sisimai::Fact object as an argument of get() method. This class is called only Sisimai::Fact class.
+  # Sisimai::Fact object as an argument of find() method. This class is called only Sisimai::Fact.
   module Reason
     class << self
       # All the error reason list Sisimai support
       # @return   [Array] Reason list
       def index
         return %w[
-          AuthFailure BadReputation Blocked ContentError ExceedLimit Expired Filtered HasMoved
-          HostUnknown MailboxFull MailerError MesgTooBig NetworkError NotAccept NotCompliantRFC
-          OnHold Rejected NoRelaying Speeding SpamDetected VirusDetected PolicyViolation 
-          SecurityError Suspend RequirePTR SystemError SystemFull TooManyConn UserUnknown SyntaxError
+          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
         ]
       end
 
+      # @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 true
+      end
+
       # @abstract Returns Sisimai::Reason::* module path table
       # @return   [Hash] Module path table
       # @since    v4.25.6
@@ -29,8 +39,7 @@ module Sisimai
       def retry
         return {
           'undefined' => true, 'onhold' => true, 'systemerror' => true, 'securityerror' => true,
-          'expired' => true, 'suspend' => true, 'networkerror' => true, 'hostunknown' => true,
-          'userunknown' => true
+          'expired' => true, 'networkerror' => true, 'hostunknown' => true, 'userunknown' => true
         }.freeze
       end
       ModulePath = Sisimai::Reason.path
@@ -38,19 +47,19 @@ module Sisimai
       ClassOrder = [
         %w[
           MailboxFull MesgTooBig ExceedLimit Suspend HasMoved NoRelaying AuthFailure UserUnknown
-          Filtered RequirePTR NotCompliantRFC BadReputation Rejected HostUnknown SpamDetected Speeding
-          TooManyConn Blocked
+          Filtered RequirePTR NotCompliantRFC BadReputation ContentError Rejected HostUnknown
+          SpamDetected Speeding TooManyConn Blocked
         ],
         %w[
           MailboxFull AuthFailure BadReputation Speeding SpamDetected VirusDetected PolicyViolation 
           NoRelaying SystemError NetworkError Suspend ContentError SystemFull NotAccept Expired
-          SecurityError MailerError
+          FailedSTARTTLS SecurityError Suppressed MailerError
         ],
         %w[
           MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected HostUnknown
-          SpamDetected Speeding TooManyConn Blocked SpamDetected AuthFailure SecurityError
-          SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull NotAccept
-          MailerError NoRelaying SyntaxError OnHold
+          SpamDetected Speeding TooManyConn Blocked SpamDetected AuthFailure FailedSTARTTLS
+          SecurityError SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
+          NotAccept MailerError NoRelaying Suppressed SyntaxError OnHold
         ]
       ]
 
@@ -58,7 +67,7 @@ module Sisimai
       # @param    [Hash] argvs  Decoded email object
       # @return   [String, nil] Bounce reason or nil if the argument is missing or not Hash
       # @see anotherone
-      def get(argvs)
+      def find(argvs)
         return nil unless argvs
         unless GetRetried[argvs['reason']]
           # Return reason text already decided except reason match with the regular expression of
@@ -111,10 +120,10 @@ module Sisimai
         return reasontext
       end
 
-      # Detect the other bounce reason, fall back method for get()
+      # Detect the other bounce reason, fall back method for find()
       # @param    [Hash] argvs  Decoded email object
       # @return   [String, Nil] Bounce reason or nli if the argument is missing or not Hash
-      # @see get
+      # @see      find()
       def anotherone(argvs)
         return argvs['reason'] unless argvs['reason'].empty?
 
@@ -124,65 +133,60 @@ module Sisimai
         actiontext = argvs['action']                  || ''
         statuscode = argvs['deliverystatus']          || ''
         reasontext = Sisimai::SMTP::Status.name(statuscode) || ''
+        trytomatch = reasontext.empty? ? true : false
+        trytomatch ||= true if GetRetried[reasontext] || codeformat != 'SMTP'
 
-        catch :TRY_TO_MATCH do
-          while true
-            trytomatch   = reasontext.empty? ? true : false
-            trytomatch ||= true if GetRetried[reasontext]
-            trytomatch ||= true if codeformat != 'SMTP'
-            throw :TRY_TO_MATCH unless trytomatch
-
-            # Could not decide the reason by the value of Status:
-            ClassOrder[1].each do |e|
-              # Trying to match with other patterns in Sisimai::Reason::* classes
-              p = 'Sisimai::Reason::' << e
-              r = nil
-              begin
-                require ModulePath[p]
-                r = Module.const_get(p)
-              rescue
-                warn ' ***warning: Failed to load ' << p
-                next
-              end
-
-              next unless r.match(issuedcode)
-              reasontext = e.downcase
-              break
-            end
-            throw :TRY_TO_MATCH unless reasontext.empty?
-
-            # Check the value of Status:
-            code2digit = statuscode[0, 3] || ''
-            if code2digit == '5.6' || code2digit == '4.6'
-              #  X.6.0   Other or undefined media error
-              reasontext = 'contenterror'
-
-            elsif code2digit == '5.7' || code2digit == '4.7'
-              #  X.7.0   Other or undefined security status
-              reasontext = 'securityerror'
-
-            elsif codeformat.start_with?('X-UNIX')
-              # Diagnostic-Code: X-UNIX; ...
-              reasontext = 'mailererror'
-
-            else
-              # 50X Syntax Error?
-              require 'sisimai/reason/syntaxerror'
-              reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
-            end
-            throw :TRY_TO_MATCH unless reasontext.empty?
-
-            # Check the value of Action: field, first
-            if actiontext.start_with?('delayed', 'expired')
-              # Action: delayed, expired
-              reasontext = 'expired'
-            else
-              # Rejected at connection or after EHLO|HELO
-              thecommand = argvs['smtpcommand'] || ''
-              reasontext = 'blocked' if %w[HELO EHLO].index(thecommand)
+        while trytomatch
+          # Could not decide the reason by the value of Status:
+          ClassOrder[1].each do |e|
+            # Trying to match with other patterns in Sisimai::Reason::* classes
+            p = 'Sisimai::Reason::' << e
+            r = nil
+            begin
+              require ModulePath[p]
+              r = Module.const_get(p)
+            rescue
+              warn ' ***warning: Failed to load ' << p
+              next
             end
-            throw :TRY_TO_MATCH
+
+            next unless r.match(issuedcode)
+            reasontext = e.downcase
+            break
+          end
+          break unless reasontext.empty?
+
+          # Check the value of Status:
+          code2digit = statuscode[0, 3] || ''
+          if code2digit == '5.6' || code2digit == '4.6'
+            #  X.6.0   Other or undefined media error
+            reasontext = 'contenterror'
+
+          elsif code2digit == '5.7' || code2digit == '4.7'
+            #  X.7.0   Other or undefined security status
+            reasontext = 'securityerror'
+
+          elsif codeformat.start_with?('X-UNIX')
+            # Diagnostic-Code: X-UNIX; ...
+            reasontext = 'mailererror'
+
+          else
+            # 50X Syntax Error?
+            require 'sisimai/reason/syntaxerror'
+            reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
           end
+          break unless reasontext.empty?
+
+          # Check the value of Action: field, first
+          if actiontext.start_with?('delayed', 'expired')
+            # Action: delayed, expired
+            reasontext = 'expired'
+          else
+            # Rejected at connection or after EHLO|HELO
+            thecommand = argvs['command'] || ''
+            reasontext = 'blocked' if %w[HELO EHLO].index(thecommand)
+          end
+          break
         end
         return reasontext
       end
@@ -222,7 +226,7 @@ module Sisimai
         else
           # Detect the bounce reason from "Status:" code
           require 'sisimai/smtp/status'
-          cv = Sisimai::SMTP::Status.find(argv1)      || ''
+          cv = Sisimai::SMTP::Status.find(argv1)
           reasontext = Sisimai::SMTP::Status.name(cv) || 'undefined'
         end
         return reasontext

data/lib/sisimai/rfc1123.rb

@@ -0,0 +1,152 @@
+module Sisimai
+  # Sisimai::RFC1123 is a class related to the Internet host
+  module RFC1123
+    class << self
+      require 'sisimai/string'
+      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 ...
+          # - <kijitora@example.org>: host r2.example.org[198.51.100.18] refused to talk to me:
+          ["host ", " said: "],
+          ["host ", " talk to me: "],
+          ["while talking to ", ":"], # (Sendmail) ... while talking to mx.bouncehammer.jp.:
+          ["host ", " ["],            # (Exim) host mx.example.jp [192.0.2.20]: 550 5.7.0 
+          [" by ", ". ["],            # (Gmail) ...for the recipient domain example.jp by mx.example.jp. [192.0.2.1].
+
+          # (MailFoundry)
+          # - Delivery failed for the following reason: Server mx22.example.org[192.0.2.222] failed with: 550...
+          # - Delivery failed for the following reason: mail.example.org[192.0.2.222] responded with failure: 552..
+          ["delivery failed for the following reason: ", " with"],
+          ["remote system: ", "("],   # (MessagingServer) Remote system: dns;mx.example.net (mx. -- 
+          ["smtp server <", ">"],     # (X6) SMTP Server <smtpd.libsisimai.org> rejected recipient ...
+          ["-mta: ", ">"],            # (MailMarshal) Reporting-MTA:      <rr1.example.com>
+          [" : ", "["],               # (SendGrid) cat:000000:<cat@example.jp> : 192.0.2.1 : mx.example.jp:[192.0.2.2]...
+      ].freeze
+      StartAfter = [
+          "generating server: ",      # (Exchange2007) en-US/Generating server: mta4.example.org
+          "serveur de g",             # (Exchange2007) fr-FR/Serveur de g辿n辿ration
+          "server di generazione",    # (Exchange2007) it-CH
+          "genererande server",       # (Exchange2007) sv-SE
+      ].freeze
+      ExistUntil = [
+          " did not like our ",       # (Dragonfly) mail-inbound.libsisimai.net [192.0.2.25] did not like our DATA: ...
+      ].freeze
+
+      # Returns "true" when the given string is a valid internet host
+      # @param    [String] argv0 Hostname
+      # @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
+        return false if argv0.size > 255
+        return false if argv0.include?(".") == false
+        return false if argv0.include?("..")
+        return false if argv0.include?("--")
+        return false if argv0.start_with?(".")
+        return false if argv0.start_with?("-")
+        return false if 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'
+        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
+        end
+        return hostnameok
+      end
+
+      # find() returns a valid internet hostname found from the argument
+      # @param    string argv1  String including hostnames
+      # @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
+
+        sourcetext = argv1.downcase
+        sourcelist = []
+        foundtoken = []
+        thelongest = 0
+        hostnameis = ""
+
+        # Replace some string for splitting by " "
+        # - mx.example.net[192.0.2.1] => mx.example.net [192.0.2.1]
+        # - mx.example.jp:[192.0.2.1] => mx.example.jp :[192.0.2.1]
+        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)
+
+        catch :MAKELIST do
+          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)
+
+            p1 = sourcetext.index(e[0])
+            p2 = sourcetext.index(e[1])
+            cw = e[0].size
+            next if p1 + cw >= p2
+
+            sourcelist = sourcetext[p1 + cw, p2 - cw - p1].split(" ")
+            throw :MAKELIST
+          end
+
+          # Check other patterns which are not sandwiched
+          StartAfter.each do |e|
+            # StartAfter have some strings, not an array
+            p1 = sourcetext.index(e); next if p1.nil?
+            cw = e.size
+            sourcelist = sourcetext[p1 + cw, sourcetext.size].split(" ")
+            throw :MAKELIST
+          end
+          ExistUntil.each do |e|
+            # ExistUntil have some strings, not an array
+            p1 = sourcetext.index(e); next unless p1
+            sourcelist = sourcetext[0, p1].split(" ")
+            throw :MAKELIST
+          end
+
+          sourcelist = sourcetext.split(" ") if sourcelist.size == 0
+          throw :MAKELIST
+        end
+
+        sourcelist.each do |e|
+          # Pick some strings which is 4 or more length, is including "." character
+          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)
+          foundtoken << e
+        end
+        return ""            if foundtoken.size == 0
+        return foundtoken[0] if foundtoken.size == 1
+
+        foundtoken.each do |e|
+          # Returns the longest hostname
+          cw = e.size; next if thelongest >= cw
+          hostnameis = e
+          thelongest = cw
+        end
+        return hostnameis
+      end
+    end
+  end
+end
+

data/lib/sisimai/rfc1894.rb

@@ -2,7 +2,8 @@ module Sisimai
   # Sisimai::RFC1894 DSN field defined in RFC3464 (obsoletes RFC1894)
   module RFC1894
     class << self
-      FieldNames = {
+      require 'sisimai/string'
+      FieldNames = [
         # https://tools.ietf.org/html/rfc3464#section-2.2
         #   Some fields of a DSN apply to all of the delivery attempts described by that DSN. At
         #   most, these fields may appear once in any DSN. These fields are used to correlate the
@@ -15,10 +16,12 @@ module Sisimai
         #   The following fields are not used in Sisimai:
         #     - Original-Envelope-Id
         #     - DSN-Gateway
-        'arrival-date'          => ':',
-        'received-from-mta'     => ';',
-        'reporting-mta'         => ';',
-        'x-original-message-id' => '@',
+        {
+          'arrival-date'          => ':',
+          'received-from-mta'     => ';',
+          'reporting-mta'         => ';',
+          'x-original-message-id' => '@',
+        },
 
         # https://tools.ietf.org/html/rfc3464#section-2.3
         #   A DSN contains information about attempts to deliver a message to one or more recipi-
@@ -32,28 +35,31 @@ module Sisimai
         #   The following fields are not used in Sisimai:
         #     - Will-Retry-Until
         #     - Final-Log-ID
-        'action'                => 'e',
-        'diagnostic-code'       => ';',
-        'final-recipient'       => ';',
-        'last-attempt-date'     => ':',
-        'original-recipient'    => ';',
-        'remote-mta'            => ';',
-        'status'                => '.',
-        'x-actual-recipient'    => ';',
-      }.freeze
+        {
+          'action'                => 'e',
+          'diagnostic-code'       => ';',
+          'final-recipient'       => ';',
+          'last-attempt-date'     => ':',
+          'original-recipient'    => ';',
+          'remote-mta'            => ';',
+          'status'                => '.',
+          'x-actual-recipient'    => ';',
+        }
+      ].freeze
 
       CapturesOn = {
-        'addr' => %r/\A((?:Original|Final|X-Actual)-Recipient):[ ](.+?);[ ]*(.+)/,
-        'code' => %r/\A(Diagnostic-Code):[ ](.+?);[ ]*(.*)/,
-        'date' => %r/\A((?:Arrival|Last-Attempt)-Date):[ ](.+)/,
-        'host' => %r/\A((?:Received-From|Remote|Reporting)-MTA):[ ](.+?);[ ]*(.+)/,
-        'list' => %r/\A(Action):[ ](delayed|deliverable|delivered|expanded|expired|failed|failure|relayed)/i,
-        'stat' => %r/\A(Status):[ ]([245][.]\d+[.]\d+)/,
-        'text' => %r/\A(X-Original-Message-ID):[ ](.+)/,
-       #'text' => %r/\A(Final-Log-ID|Original-Envelope-Id):[ ]*(.+)/,
+        "addr" => ["Final-Recipient", "Original-Recipient", "X-Actual-Recipient"],
+        "code" => ["Diagnostic-Code"],
+        "date" => ["Arrival-Date", "Last-Attempt-Date"],
+        "host" => ["Received-From-MTA", "Remote-MTA", "Reporting-MTA"],
+        "list" => ["Action"],
+        "stat" => ["Status"],
+       #"text" => ["X-Original-Message-ID", "Final-Log-ID", "Original-Envelope-ID"],
       }.freeze
 
-      Correction = { action: { 'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed' }}
+      SubtypeSet = { "addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS" }.freeze
+      ActionList = ["failed", "delayed", "delivered", "relayed", "expanded"].freeze
+      Correction = { 'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed' }
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -72,7 +78,7 @@ module Sisimai
       def FIELDINDEX
         return %w[
             Action Arrival-Date Diagnostic-Code Final-Recipient Last-Attempt-Date Original-Recipient
-            Received-From-MTA Remote-MTA Reporting-MTA Status X-Actual-Recipienet X-Original-Message-ID
+            Received-From-MTA Remote-MTA Reporting-MTA Status X-Actual-Recipient X-Original-Message-ID
         ]
       end
 
@@ -89,7 +95,7 @@ module Sisimai
           'original-recipient' => 'alias',
           'received-from-mta'  => 'lhost',
           'remote-mta'         => 'rhost',
-          'reporting-mta'      => 'rhost',
+          'reporting-mta'      => 'lhost',
           'status'             => 'status',
           'x-actual-recipient' => 'alias',
         }
@@ -97,18 +103,34 @@ module Sisimai
 
       # Check the argument matches with a field defined in RFC3464
       # @param    [String] argv0 A line including field and value defined in RFC3464
-      # @return   [Boolean]      false: did not matched, true: matched
+      # @return   [Integer]      0: did not matched
+      #                          1: Matched with per-message field
+      #                          2: Matched with per-recipient field
       # @since v4.25.0
       def match(argv0 = '')
-        label = Sisimai::RFC1894.label(argv0)
+        return 0 unless argv0
+        return 0 unless argv0.size > 0
+        label = Sisimai::RFC1894.label(argv0); return 0 unless label
+        match = 0
 
-        return false unless label
-        return false unless FieldNames.has_key?(label)
-        return false unless argv0.include?(FieldNames[label])
-        return true
+        FieldNames[0].each_key do |e|
+          # Per-Message fields
+          next unless label == e
+          next unless argv0.include?(FieldNames[0][label])
+          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])
+          match = 2; break
+        end
+        return match
       end
 
-      # Returns a field name as a lqbel from the given string
+      # Returns a field name as a label from the given string
       # @param    [String] argv0 A line including field and value defined in RFC3464
       # @return   [String]       Field name as a label
       # @since v4.25.15
@@ -125,43 +147,61 @@ 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])
 
         return nil if group.empty?
         return nil unless CapturesOn[group]
 
-        table = ['', '', '', '']
-        match = false
-        while cv = argv0.match(CapturesOn[group])
-          # Try to match with each pattern of Per-Message field, Per-Recipient field
-          #   - 0: Field-Name
-          #   - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
-          #   - 2: Value
-          #   - 3: Field Group(addr, code, date, host, stat, text)
-          match = true
-          table[0] = cv[1].downcase
-          table[3] = group
-
-          if group == 'addr' || group == 'code' || group == '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
-            table[1] = cv[2].upcase
-            table[2] = group == 'host' ? cv[3].downcase : cv[3]
-            table[2] = '' if table[2] =~ /\A\s+\z/  # Remote-MTA: dns;
+        # Try to match with each pattern of Per-Message field, Per-Recipient field
+        #   - 0: Field-Name
+        #   - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
+        #   - 2: Value
+        #   - 3: Field Group(addr, code, date, host, stat, text)
+        #   - 4: Comment
+        table = [label, "", "", group, ""]
+
+        if group == 'addr' || group == 'code' || group == '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
           else
-            # - Action: failed
-            # - Status: 5.2.2
-            table[1] = ''
-            table[2] = group == 'date' ? cv[2] : cv[2].downcase
-
-            # Correct invalid value in Action field:
-            break unless group == 'list'
-            break unless Correction[:action][table[2]]
-            table[2] = Correction[:action][table[2]]
+            # There is no sub type like "Diagnostic-Code: 550 5.1.1 <kijitora@example.jp>..."
+            table[2] = Sisimai::String.sweep(parts[1])
+            table[1] = SubtypeSet[group] || ""
           end
-          break
+          table[2] = table[2].downcase if group == "host"
+          table[2] = "" if table[2] =~ /\A\s+\z/
+
+        elsif group == "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"
+          v = parts[1].downcase
+          table[2] = v if ActionList.any? { |a| v == a }
+          table[2] = Correction[v] if table[2].empty?
+
+        else
+          # Other groups such as Status:, Arrival-Date:, or X-Original-Message-ID:.
+          # There is no ";" character in the field.
+          # - Status: 5.2.2
+          # - Arrival-Date: Mon, 21 May 2018 16:09:59 +0900
+          table[2] = group == "date" ? parts[1] : parts[1].downcase
         end
-        return nil unless match
+
+        if Sisimai::String.aligned(table[2], [" (", ")"])
+          # Extract text enclosed in parentheses as comments
+          # Reporting-MTA: dns; mr21p30im-asmtp004.me.example.com (tcp-daemon)
+          p1 = table[2].index(" (")
+          p2 = table[2].index(")")
+          table[4] = table[2][p1 + 2, p2 - p1 - 2]
+          table[2] = table[2][0, p1]
+        end
+
         return table
       end
 

data/lib/sisimai/rfc2045.rb

@@ -277,6 +277,7 @@ module Sisimai
         iso2022set = %r/charset=["']?(iso-2022-[-a-z0-9]+)['"]?\b/
         multiparts = levelout(argv0, argv1)
         flattenout = ''
+        delimiters = ["/delivery-status", "/rfc822", "/feedback-report", "/partial"]
 
         while e = multiparts.shift do
           # Pick only the following parts Sisimai::Lhost will use, and decode each part
@@ -352,7 +353,7 @@ module Sisimai
             bodystring << bodyinside
           end
 
-          if mediatypev.include?('/delivery-status') || mediatypev.include?('/feedback-report') || mediatypev.include?('/rfc822')
+          if delimiters.any? { |a| mediatypev.include?(a) }
             # Add Content-Type: header of each part (will be used as a delimiter at Sisimai::Lhost)
             # into the body inside when the value of Content-Type: field is message/delivery-status,
             # message/rfc822, or text/rfc822-headers