sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/data.rb

@@ -8,6 +8,7 @@ module Sisimai
     require 'sisimai/rhost'
     require 'sisimai/time'
     require 'sisimai/datetime'
+    require 'sisimai/smtp/error'
 
     @@rwaccessors = [
       :catch,           # [?] Results generated by hook method
@@ -18,6 +19,7 @@ module Sisimai
       :listid,          # [String] List-Id header of each ML
       :reason,          # [String] Bounce reason
       :action,          # [String] The value of Action: header
+      :origin,          # [String] Email path as a data source
       :subject,         # [String] UTF-8 Subject text
       :timestamp,       # [Sisimai::Time] Date: header in the original message
       :addresser,       # [Sisimai::Address] From address
@@ -35,12 +37,10 @@ module Sisimai
       :deliverystatus,  # [String] Delivery Status(DSN)
       :timezoneoffset,  # [Integer] Time zone offset(seconds)
     ]
-    @@rwaccessors.each { |e| attr_accessor e }
+    attr_accessor(*@@rwaccessors)
 
-    EndOfEmail = Sisimai::String.EOM
     RetryIndex = Sisimai::Reason.retry
     RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
-    AddrHeader = { addresser: RFC822Head[:addresser], recipient: RFC822Head[:recipient] }.freeze
 
     # Constructor of Sisimai::Data
     # @param    [Hash] argvs    Data
@@ -77,6 +77,7 @@ module Sisimai
       @smtpcommand    = argvs['smtpcommand']    || ''
       @feedbacktype   = argvs['feedbacktype']   || ''
       @action         = argvs['action']         || ''
+      @origin         = argvs['origin']         || ''
       @replycode      = argvs['replycode']      || ''
       @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode']).to_s if @replycode.empty?
       @softbounce     = argvs['softbounce']     || ''
@@ -94,35 +95,11 @@ module Sisimai
 
       messageobj = data
       rfc822data = messageobj.rfc822
-      fieldorder = { :recipient => [], :addresser => [] }
       objectlist = []
-      givenorder = argvs[:order] || {}
       delivered1 = argvs[:delivered] || false
 
       return nil unless messageobj.ds
       return nil unless messageobj.rfc822
-      require 'sisimai/smtp'
-
-      # Decide the order of email headers: user specified or system default.
-      if givenorder.is_a?(Hash) && !givenorder.empty?
-        # If the order of headers for searching is specified, use the order
-        # for detecting an email address.
-        fieldorder.each_key do |e|
-          # The order should be "Array Reference".
-          next unless givenorder[e]
-          next unless givenorder[e].is_a? Array
-          next if givenorder[e].empty?
-          fieldorder[e] += givenorder[e]
-        end
-      end
-
-      fieldorder.each_key do |e|
-        # If the order is empty, use default order.
-        next unless fieldorder[e].empty?
-
-        # Load default order of each accessor.
-        fieldorder[e] = AddrHeader[e]
-      end
 
       eachobject = messageobj.ds.dup
       while e = eachobject.shift do
@@ -151,9 +128,8 @@ module Sisimai
 
         # EMAIL_ADDRESS:
         # Detect email address from message/rfc822 part
-        fieldorder[:addresser].each do |f|
+        RFC822Head[:addresser].each do |f|
           # Check each header in message/rfc822 part
-          next unless rfc822data.key?(f)
           next unless rfc822data[f]
           next if rfc822data[f].empty?
 
@@ -258,8 +234,6 @@ module Sisimai
 
         # CHECK_DELIVERY_STATUS_VALUE:
         # Cleanup the value of "Diagnostic-Code:" header
-        p['diagnosticcode'].sub!(/[ \t.]+#{EndOfEmail}/, '')
-
         unless p['diagnosticcode'].empty?
           # Count the number of D.S.N. and SMTP Reply Code
           vs = Sisimai::SMTP::Status.find(p['diagnosticcode'])
@@ -297,6 +271,7 @@ module Sisimai
 
         # Check the value of SMTP command
         p['smtpcommand'] = '' unless %w[EHLO HELO MAIL RCPT DATA QUIT].include?(p['smtpcommand'])
+        p['origin'] = argvs[:origin]  # Set the path to the original email
 
         if p['action'].empty?
           # Check the value of "action"
@@ -312,12 +287,15 @@ module Sisimai
         o = Sisimai::Data.new(p)
         next unless o.recipient
 
-        if o.reason.empty? || RetryIndex.key?(o.reason)
+        if o.reason.empty? || RetryIndex[o.reason]
           # Decide the reason of email bounce
-          r = ''
-          r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost) # Remote host dependent error
-          r = Sisimai::Reason.get(o) if r.empty?
-          r = 'undefined' if r.empty?
+          r = ''; r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost)
+          if r.empty?
+            # Failed to detect a bounce reason by the value of "rhost"
+            r = Sisimai::Rhost.get(o, o.destination) if Sisimai::Rhost.match(o.destination)
+            r = Sisimai::Reason.get(o) if r.empty?
+            r = 'undefined' if r.empty?
+          end
           o.reason = r
         end
 
@@ -348,9 +326,8 @@ module Sisimai
             textasargv = (o.replycode + ' ' + p['diagnosticcode']).lstrip
             getchecked = Sisimai::SMTP::Error.is_permanent(textasargv)
             tmpfailure = getchecked.nil? ? false : (getchecked ? false : true)
-            pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
 
-            if pseudocode
+            if pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
               # Set the value of "deliverystatus" and "softbounce"
               o.deliverystatus = pseudocode
 

data/lib/sisimai/datetime.rb

@@ -43,7 +43,7 @@ module Sisimai
         abbr: %w[Sun Mon Tue Wed Thu Fri Sat],
       }.freeze
 
-      TimeZoneAbbr = {
+      TimeZones = {
         # http://en.wikipedia.org/wiki/List_of_time_zone_abbreviations
         #'ACDT' => '+1030', # Australian Central Daylight Time  UTC+10:30
         #'ACST' => '+0930', # Australian Central Standard Time  UTC+09:30
@@ -399,7 +399,7 @@ module Sisimai
       #   abbr2tz('JST')  #=> '+0900'
       def abbr2tz(argv1)
         return nil unless argv1.is_a?(::String)
-        return TimeZoneAbbr[argv1]
+        return TimeZones[argv1]
       end
 
       # Convert to second
@@ -428,7 +428,7 @@ module Sisimai
           return ztime
 
         elsif argv1 =~ /\A[A-Za-z]+\z/
-          return tz2second(TimeZoneAbbr[argv1])
+          return tz2second(TimeZones[argv1])
         else
           return nil
         end

data/lib/sisimai/lhost.rb

@@ -38,63 +38,41 @@ module Sisimai
         }
       end
 
-      def smtpagent(v = '')
-        return v.to_s.sub(/\ASisimai::Lhost::/, 'Email::')
-      end
-      def description; return ''; end
-      def headerlist;  return []; end
-      def removedat;   return 'v4.25.5'; end # This method will be removed at the future release of Sisimai
-
       # @abstract MTA list
       # @return   [Array] MTA list with order
       def index
         return %w[
-          Sendmail Postfix Qmail Exim Courier OpenSMTPD Office365 Outlook
-          Exchange2007 Exchange2003 Yahoo GSuite Aol SendGrid AmazonSES MailRu
-          Yandex MessagingServer Domino Notes ReceivingSES AmazonWorkMail Verizon
-          GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
-          Amavis ApacheJames McAfee MXLogic MailFoundry IMailServer
-          MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-          X1 X2 X3 X4 X5 V5sendmail FML Google]
+          Activehunter Amavis AmazonSES AmazonWorkMail Aol ApacheJames Barracuda Bigfoot
+          Biglobe Courier Domino EZweb EinsUndEins Exchange2003 Exchange2007 Exim FML
+          Facebook GMX GSuite GoogleGroups Gmail IMailServer InterScanMSS KDDI MXLogic
+          MailFoundry MailMarshalSMTP MailRu McAfee MessageLabs MessagingServer Notes
+          Office365 OpenSMTPD Outlook Postfix PowerMTA ReceivingSES SendGrid Sendmail
+          SurfControl V5sendmail Verizon X1 X2 X3 X4 X5 X6 Yahoo Yandex Zoho MFILTER
+          Qmail
+        ]
       end
 
-      # @abstract MTA list which have one or more extra headers
-      # @return   [Array] MTA list (have extra headers)
-      def heads
-        return %w[
-          Exim Office365 Outlook Exchange2007 Exchange2003 GSuite SendGrid
-          AmazonSES ReceivingSES AmazonWorkMail Aol GMX MailRu MessageLabs Yahoo
-          Yandex Zoho EinsUndEins MXLogic McAfee MFILTER EZweb Activehunter IMailServer
-          SurfControl FML Google
-        ]
+      # @abstract Returns Sisimai::Lhost::* module path table
+      # @return [Hash] Module path table
+      # @since  v4.25.6
+      def path
+        index = Sisimai::Lhost.index
+        table = {
+          'Sisimai::ARF'     => 'sisimai/arf',
+          'Sisimai::RFC3464' => 'sisimai/rfc3464',
+          'Sisimai::RFC3834' => 'sisimai/rfc3834',
+        }
+        index.each { |e| table['Sisimai::Lhost::' << e] = 'sisimai/lhost/' << e.downcase }
+        return table
       end
 
       # @abstract Parse bounce messages
-      # @param         [Hash] mhead       Message header of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make; return nil; end
-
-      # @abstract Print warnings about an obsoleted method. This method will be
-      #           removed at the future release of Sisimai
-      # @until    v4.25.5
-      def warn(whois = '', useit = nil)
-        label = ' ***warning:'
-        methodname = caller[0][/`.*'/][1..-2]
-        messageset = sprintf("%s %s.%s is marked as obsoleted", label, whois, methodname)
-
-        useit ||= methodname
-        messageset << sprintf(" and will be removed at %s.", removedat)
-        messageset << sprintf(" Use %s.%s instead.\n", self.name, useit) if useit != 'gone'
-        Kernel.warn messageset
-      end
+      def description; return ''; end
     end
   end
 end

data/lib/sisimai/lhost/activehunter.rb

@@ -8,109 +8,70 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['  ----- The following addresses had permanent fatal errors -----'],
-        rfc822:  ['Content-type: message/rfc822'],
-      }.freeze
-
-      def description; return 'TransWARE Active!hunter'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-ahmailid]; end
+      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['  ----- The following addresses had permanent fatal errors -----'] }.freeze
 
       # Parse bounce messages from TransWARE Active!hunter
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         # :from    => %r/\A"MAILER-DAEMON"/,
         # :subject => %r/FAILURE NOTICE :/,
         return nil unless mhead['x-ahmailid']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          #  ----- The following addresses had permanent fatal errors -----
+          #
+          # >>> kijitora@example.org <kijitora@example.org>
+          #
+          #  ----- Transcript of session follows -----
+          # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
+          v = dscontents[-1]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          if cv = e.match(/\A[>]{3}[ \t]+.+[<]([^ ]+?[@][^ ]+?)[>]\z/)
+            # >>> kijitora@example.org <kijitora@example.org>
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
+            v['recipient'] = cv[1]
+            v['diagnosis'] = ''
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            #  ----- The following addresses had permanent fatal errors -----
-            #
-            # >>> kijitora@example.org <kijitora@example.org>
-            #
             #  ----- Transcript of session follows -----
             # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[>]{3}[ \t]+.+[<]([^ ]+?[@][^ ]+?)[>]\z/)
-              # >>> kijitora@example.org <kijitora@example.org>
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              v['diagnosis'] = ''
-              recipients += 1
-            else
-              #  ----- Transcript of session follows -----
-              # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-              next unless e =~ /\A[0-9A-Za-z]+/
-              next unless v['diagnosis'].empty?
-              v['diagnosis'] = e
-            end
+            next unless e =~ /\A[0-9A-Za-z]+/
+            next unless v['diagnosis'].empty?
+            v['diagnosis'] = e
           end
         end
         return nil unless recipients > 0
 
         require 'sisimai/string'
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
-          e.each_key { |a| e[a] ||= '' }
-        end
-
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'TransWARE Active!hunter'; end
     end
   end
 end

data/lib/sisimai/lhost/amavis.rb

@@ -7,25 +7,74 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['The message '],
-        rfc822:  ['Content-Type: text/rfc822-headers'],
+      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      StartingOf = { message: ['The message '] }.freeze
+      MessagesOf = {
+        # amavisd-new-2.11.1/amavisd:1840|%smtp_reason_by_ccat = (
+        # amavisd-new-2.11.1/amavisd:1840|  # currently only used for blocked messages only, status 5xx
+        # amavisd-new-2.11.1/amavisd:1840|  # a multiline message will produce a valid multiline SMTP response
+        # amavisd-new-2.11.1/amavisd:1840|  CC_VIRUS,       'id=%n - INFECTED: %V',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BANNED,      'id=%n - BANNED: %F',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED.',1', 'id=%n - UNCHECKED: encrypted',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED.',2', 'id=%n - UNCHECKED: over limits',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_UNCHECKED,      'id=%n - UNCHECKED',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAM,        'id=%n - spam',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAMMY.',1', 'id=%n - spammy (tag3)',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_SPAMMY,      'id=%n - spammy',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',1',   'id=%n - BAD HEADER: MIME error',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',2',   'id=%n - BAD HEADER: nonencoded 8-bit character',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',3',   'id=%n - BAD HEADER: contains invalid control character',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',4',   'id=%n - BAD HEADER: line made up entirely of whitespace',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',5',   'id=%n - BAD HEADER: line longer than RFC 5322 limit',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',6',   'id=%n - BAD HEADER: syntax error',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',7',   'id=%n - BAD HEADER: missing required header field',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH.',8',   'id=%n - BAD HEADER: duplicate header field',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_BADH,        'id=%n - BAD HEADER',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_OVERSIZED,   'id=%n - Message size exceeds recipient\'s size limit',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA.',1',    'id=%n - Temporary MTA failure on relaying',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA.',2',    'id=%n - Rejected by next-hop MTA on relaying',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_MTA,         'id=%n - Unable to relay message back to MTA',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_CLEAN,       'id=%n - CLEAN',
+        # amavisd-new-2.11.1/amavisd:1840|  CC_CATCHALL,    'id=%n - OTHER',  # should not happen
+        # ...
+        # amavisd-new-2.11.1/amavisd:15289|my $status = setting_by_given_contents_category(
+        # amavisd-new-2.11.1/amavisd:15289|  $blocking_ccat,
+        # amavisd-new-2.11.1/amavisd:15289|  { CC_VIRUS,       "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BANNED,      "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_UNCHECKED,   "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_SPAM,        "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_SPAMMY,      "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BADH.",2",   "554 5.6.3",  # nonencoded 8-bit character
+        # amavisd-new-2.11.1/amavisd:15289|    CC_BADH,        "554 5.6.0",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_OVERSIZED,   "552 5.3.4",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_MTA,         "550 5.3.5",
+        # amavisd-new-2.11.1/amavisd:15289|    CC_CATCHALL,    "554 5.7.0",
+        # amavisd-new-2.11.1/amavisd:15289|  });
+        # ...
+        # amavisd-new-2.11.1/amavisd:15332|my $response = sprintf("%s %s%s%s", $status,
+        # amavisd-new-2.11.1/amavisd:15333|  ($final_destiny == D_PASS     ? "Ok" :
+        # amavisd-new-2.11.1/amavisd:15334|   $final_destiny == D_DISCARD  ? "Ok, discarded" :
+        # amavisd-new-2.11.1/amavisd:15335|   $final_destiny == D_REJECT   ? "Reject" :
+        # amavisd-new-2.11.1/amavisd:15336|   $final_destiny == D_BOUNCE   ? "Bounce" :
+        # amavisd-new-2.11.1/amavisd:15337|   $final_destiny == D_TEMPFAIL ? "Temporary failure" :
+        # amavisd-new-2.11.1/amavisd:15338|                                  "Not ok ($final_destiny)" ),
+        'spamdetected'  => [' - spam'],
+        'virusdetected' => [' - infected'],
+        'contenterror'  => [' - bad header:'],
+        'exceedlimit'   => [' - message size exceeds recipient'],
+        'systemerror'   => [
+            ' - temporary mta failure on relaying',
+            ' - rejected by next-hop mta on relaying',
+            ' - unable to relay message back to mta',
+        ],
       }.freeze
 
-      def description; return 'amavisd-new: https://www.amavis.org/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
       # Parse bounce messages from amavisd-new
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
+      # @since v4.25.0
       def make(mhead, mbody)
         # From: "Content-filter at neko1.example.jp" <postmaster@neko1.example.jp>
         # Subject: Undeliverable mail, MTA-BLOCKED
@@ -36,97 +85,81 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-            next unless f = Sisimai::RFC1894.match(e)
-
-            # "e" matched with any field defined in RFC3464
-            next unless o = Sisimai::RFC1894.field(e)
-            v = dscontents[-1]
-
-            if o[-1] == 'addr'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+          next unless f = Sisimai::RFC1894.match(e)
+
+          # "e" matched with any field defined in RFC3464
+          next unless o = Sisimai::RFC1894.field(e)
+          v = dscontents[-1]
+
+          if o[-1] == 'addr'
+            # Final-Recipient: rfc822; kijitora@example.jp
+            # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+            if o[0] == 'final-recipient'
               # Final-Recipient: rfc822; kijitora@example.jp
-              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-              if o[0] == 'final-recipient'
-                # Final-Recipient: rfc822; kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                  v = dscontents[-1]
-                end
-                v['recipient'] = o[2]
-                recipients += 1
-              else
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                v['alias'] = o[2]
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
               end
-            elsif o[-1] == 'code'
-              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-              v['spec'] = o[1]
-              v['diagnosis'] = o[2]
+              v['recipient'] = o[2]
+              recipients += 1
             else
-              # Other DSN fields defined in RFC3464
-              next unless fieldtable.key?(o[0])
-              v[fieldtable[o[0]]] = o[2]
-
-              next unless f == 1
-              permessage[fieldtable[o[0]]] = o[2]
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              v['alias'] = o[2]
             end
-          end # End of message/delivery-status
+          elsif o[-1] == 'code'
+            # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+            v['spec'] = o[1]
+            v['diagnosis'] = o[2]
+          else
+            # Other DSN fields defined in RFC3464
+            next unless fieldtable[o[0]]
+            v[fieldtable[o[0]]] = o[2]
+
+            next unless f == 1
+            permessage[fieldtable[o[0]]] = o[2]
+          end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
-          e['agent'] = self.smtpagent
+          q = e['diagnosis'].downcase
+          catch :DETECT_REASON do
+            MessagesOf.each_key do |p|
+              # Try to detect an error reason
+              MessagesOf[p].each do |r|
+                # Try to find an error message including lower-cased string
+                # defined in MessagesOf constant
+                next unless q.include?(r)
+                e['reason'] = p
+                throw :DETECT_REASON
+              end
+            end
+          end
         end
-
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'amavisd-new: https://www.amavis.org/'; end
     end
   end
 end