sisimai 4.25.4 → 4.25.9

data/lib/sisimai/lhost/x1.rb

@@ -1,113 +1,77 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown
-  # MTA #1. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1.
+  # Methods in the module are called from only Sisimai::Message.
   module X1
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X1.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      MarkingsOf = {
-        message: %r/\AThe original message was received at (.+)\z/,
-        rfc822:  %r/\AReceived: from \d+[.]\d+[.]\d+[.]\d/,
-      }.freeze
-
-      def description; return 'Unknown MTA #1'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
+      ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
+      MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
 
       # Parse bounce messages from Unknown MTA #1
-      # @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)
         return nil unless mhead['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
 
         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
         datestring = ''     # (String) Date string
         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 =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            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 =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
+          # from shironeko@example.jp
+          #
+          # ---The following addresses had delivery errors---
+          #
+          # kijitora@example.co.jp [User unknown]
+          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([^ ]+?[@][^ ]+?)[ ]+\[(.+)\]\z/)
+            # kijitora@example.co.jp [User unknown]
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            v['recipient'] = cv[1]
+            v['diagnosis'] = cv[2]
+            recipients += 1
 
+          elsif cv = e.match(MarkingsOf[:message])
             # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
-            # from shironeko@example.jp
-            #
-            # ---The following addresses had delivery errors---
-            #
-            # kijitora@example.co.jp [User unknown]
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+?[@][^ ]+?)[ ]+\[(.+)\]\z/)
-              # kijitora@example.co.jp [User unknown]
-              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'] = cv[2]
-              recipients += 1
-
-            elsif cv = e.match(MarkingsOf[:message])
-              # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
-              datestring = cv[1]
-            end
+            datestring = cv[1]
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['date']      = datestring || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #1'; end
     end
   end
 end

data/lib/sisimai/lhost/x2.rb

@@ -1,109 +1,70 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown
-  # MTA #2. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2.
+  # Methods in the module are called from only Sisimai::Message.
   module X2
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X2.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['Unable to deliver message to the following address'],
-        rfc822:  ['--- Original message follows'],
-      }.freeze
-
-      def description; return 'Unknown MTA #2'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
+      ReBackbone = %r|^--- Original message follows[.]|.freeze
+      StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
 
       # Parse bounce messages from Unknown MTA #2
-      # @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)
         return nil unless mhead['from'].include?('MAILER-DAEMON@')
         return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
 
         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.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(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.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # Message from example.com.
+          # Unable to deliver message to the following address(es).
+          #
+          # <kijitora@example.com>:
+          # This user doesn't have a example.com account (kijitora@example.com) [0]
+          v = dscontents[-1]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 2
-              next
+          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:\z/)
+            # <kijitora@example.com>:
+            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]
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # Message from example.com.
-            # Unable to deliver message to the following address(es).
-            #
-            # <kijitora@example.com>:
             # This user doesn't have a example.com account (kijitora@example.com) [0]
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:\z/)
-              # <kijitora@example.com>:
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-            else
-              # This user doesn't have a example.com account (kijitora@example.com) [0]
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << ' ' << e
-            end
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << ' ' << e
           end
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          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 'Unknown MTA #2'; end
     end
   end
 end

data/lib/sisimai/lhost/x3.rb

@@ -1,127 +1,91 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown
-  # MTA #3. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X3 parses a bounce email which created by Unknown MTA #3.
+  # Methods in the module are called from only Sisimai::Message.
   module X3
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X3.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['      This is an automatically generated Delivery Status Notification.'],
-        rfc822:  ['Content-Type: message/rfc822'],
-      }.freeze
-
-      def description; return 'Unknown MTA #3'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['      This is an automatically generated Delivery Status Notification.'] }.freeze
 
       # Parse bounce messages from Unknown MTA #3
-      # @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)
         return nil unless mhead['subject'].start_with?('Delivery status notification')
         return nil unless mhead['from'].start_with?('Mail Delivery System')
 
         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.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(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.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # ============================================================================
+          #      This is an automatically generated Delivery Status Notification.
+          #
+          # Delivery to the following recipients failed permanently:
+          #
+          #   * kijitora@example.com
+          #
+          #
+          # ============================================================================
+          #                             Technical details:
+          #
+          # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
+          #
+          #
+          # ============================================================================
+          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[ \t]+[*][ ]([^ ]+[@][^ ]+)\z/)
+            #   * kijitora@example.com
+            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]
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            # Detect error message
+            if cv = e.match(/\ASMTP:([^ ]+)[ ](.+)\z/)
+              # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
+              v['command'] = cv[1].upcase
+              v['diagnosis'] = cv[2]
 
-            # ============================================================================
-            #      This is an automatically generated Delivery Status Notification.
-            #
-            # Delivery to the following recipients failed permanently:
-            #
-            #   * kijitora@example.com
-            #
-            #
-            # ============================================================================
-            #                             Technical details:
-            #
-            # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
-            #
-            #
-            # ============================================================================
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]+[*][ ]([^ ]+[@][^ ]+)\z/)
-              #   * kijitora@example.com
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-            else
-              # Detect error message
-              if cv = e.match(/\ASMTP:([^ ]+)[ ](.+)\z/)
-                # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
-                v['command'] = cv[1].upcase
-                v['diagnosis'] = cv[2]
-
-              elsif cv = e.match(/\ARouting: (.+)/)
-                # Routing: Could not find a gateway for kijitora@example.co.jp
-                v['diagnosis'] = cv[1]
-              end
+            elsif cv = e.match(/\ARouting: (.+)/)
+              # Routing: Could not find a gateway for kijitora@example.co.jp
+              v['diagnosis'] = cv[1]
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #3'; end
     end
   end
 end