sisimai 4.25.4 → 4.25.9

data/lib/sisimai/lhost/mailfoundry.rb

@@ -7,114 +7,77 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
         message: ['This is a MIME encoded message'],
-        rfc822:  ['Content-Type: message/rfc822'],
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
-      def description; return 'MailFoundry'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MailFoundry
-      # @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'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
 
         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
+          # Unable to deliver message to: <kijitora@example.org>
+          # Delivery failed for the following reason:
+          # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
+          #
+          # This has been a permanent failure.  No further delivery attempts will be made.
+          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(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)
+            # Unable to deliver message to: <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]
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # Unable to deliver message to: <kijitora@example.org>
-            # Delivery failed for the following reason:
-            # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
-            #
-            # This has been a permanent failure.  No further delivery attempts will be made.
-            v = dscontents[-1]
-
-            if cv = e.match(/\AUnable to deliver message to: [<]([^ ]+[@][^ ]+)[>]\z/)
-              # Unable to deliver message to: <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]
-              recipients += 1
+            # Error message
+            if e == StartingOf[:error][0]
+              # Delivery failed for the following reason:
+              v['diagnosis'] = e
             else
-              # Error message
-              if e == StartingOf[:error][0]
-                # Delivery failed for the following reason:
-                v['diagnosis'] = e
-              else
-                # Detect error message
-                next if e.empty?
-                next if v['diagnosis'].nil? || v['diagnosis'].empty?
-                next if e.start_with?('-')
+              # Detect error message
+              next if e.empty?
+              next if v['diagnosis'].nil? || v['diagnosis'].empty?
+              next if e.start_with?('-')
 
-                # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
-                v['diagnosis'] << ' ' << e
-              end
+              # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
+              v['diagnosis'] << ' ' << e
             end
           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 'MailFoundry'; end
     end
   end
 end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -8,34 +8,24 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^[ \t]*[+]+[ \t]*/.freeze
       StartingOf = {
         message: ['Your message:'],
         error:   ['Could not be delivered because of'],
         rcpts:   ['The following recipients were affected:'],
       }.freeze
 
-      def description; return 'Trustwave Secure Email Gateway'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return ['X-Mailer']; end
-
       # Parse bounce messages from MailMarshalSMTP
-      # @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?('Undeliverable Mail: "')
 
         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
         endoferror = false  # (Boolean) Flag for the end of error message
@@ -50,115 +40,87 @@ module Sisimai::Lhost
                        regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
                      end
 
-        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
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e =~ regularexp
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            break if e =~ regularexp
-
-            # Your message:
-            #    From:    originalsender@example.com
-            #    Subject: IIdentifica蟾ｽ驕俳
-            #
-            # Could not be delivered because of
-            #
-            # 550 5.1.1 User unknown
-            #
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+
+          # Your message:
+          #    From:    originalsender@example.com
+          #    Subject: IIdentifica蟾ｽ驕俳
+          #
+          # Could not be delivered because of
+          #
+          # 550 5.1.1 User unknown
+          #
+          # The following recipients were affected:
+          #    dummyuser@blabla.xxxxxxxxxxxx.com
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ ]{4}([^ ]+[@][^ ]+)\z/)
             # The following recipients were affected:
             #    dummyuser@blabla.xxxxxxxxxxxx.com
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ ]{4}([^ ]+[@][^ ]+)\z/)
-              # The following recipients were affected:
-              #    dummyuser@blabla.xxxxxxxxxxxx.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
+            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
+            # Get error message lines
+            if e == StartingOf[:error][0]
+              # Could not be delivered because of
+              #
+              # 550 5.1.1 User unknown
+              v['diagnosis'] = e
+
+            elsif !v['diagnosis'].to_s.empty? && endoferror == false
+              # Append error messages
+              endoferror = true if e.start_with?(StartingOf[:rcpts][0])
+              next if endoferror
+              v['diagnosis'] << ' ' << e
             else
-              # Get error message lines
-              if e == StartingOf[:error][0]
-                # Could not be delivered because of
-                #
-                # 550 5.1.1 User unknown
-                v['diagnosis'] = e
-
-              elsif !v['diagnosis'].to_s.empty? && endoferror == false
-                # Append error messages
-                endoferror = true if e.start_with?(StartingOf[:rcpts][0])
-                next if endoferror
-                v['diagnosis'] << ' ' << e
-              else
-                # Additional Information
-                # ======================
+              # Additional Information
+              # ======================
+              # Original Sender:    <originalsender@example.com>
+              # Sender-MTA:         <10.11.12.13>
+              # Remote-MTA:         <10.0.0.1>
+              # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
+              # MessageName:        <B549996730000.000000000001.0003.mml>
+              # Last-Attempt-Date:  <16:21:07 seg, 22 Dezembro 2014>
+              if cv = e.match(/\AOriginal Sender:[ \t]+[<](.+)[>]\z/)
                 # Original Sender:    <originalsender@example.com>
-                # Sender-MTA:         <10.11.12.13>
-                # Remote-MTA:         <10.0.0.1>
-                # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
-                # MessageName:        <B549996730000.000000000001.0003.mml>
-                # Last-Attempt-Date:  <16:21:07 seg, 22 Dezembro 2014>
-                if cv = e.match(/\AOriginal Sender:[ \t]+[<](.+)[>]\z/)
-                  # Original Sender:    <originalsender@example.com>
-                  # Use this line instead of "From" header of the original
-                  # message.
-                  rfc822list << ('From: ' << cv[1])
+                # Use this line instead of "From" header of the original
+                # message.
+                emailsteak[1] << ('From: ' << cv[1] << "\n")
 
-                elsif cv = e.match(/\ASender-MTA:[ \t]+[<](.+)[>]\z/)
-                  # Sender-MTA:         <10.11.12.13>
-                  v['lhost'] = cv[1]
+              elsif cv = e.match(/\ASender-MTA:[ \t]+[<](.+)[>]\z/)
+                # Sender-MTA:         <10.11.12.13>
+                v['lhost'] = cv[1]
 
-                elsif cv = e.match(/\AReporting-MTA:[ \t]+[<](.+)[>]\z/)
-                  # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
-                  v['rhost'] = cv[1]
+              elsif cv = e.match(/\AReporting-MTA:[ \t]+[<](.+)[>]\z/)
+                # Reporting-MTA:      <relay.xxxxxxxxxxxx.com>
+                v['rhost'] = cv[1]
 
-                elsif cv = e.match(/\A\s+(From|Subject):\s*(.+)\z/)
-                  #    From:    originalsender@example.com
-                  #    Subject: ...
-                  rfc822list << sprintf("%s: %s", cv[1], cv[2])
-                end
+              elsif cv = e.match(/\A\s+(From|Subject):\s*(.+)\z/)
+                #    From:    originalsender@example.com
+                #    Subject: ...
+                emailsteak[1] << sprintf("%s: %s\n", cv[1], cv[2])
               end
             end
           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 'Trustwave Secure Email Gateway'; end
     end
   end
 end

data/lib/sisimai/lhost/mailru.rb

@@ -8,11 +8,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software.'],
-        rfc822:  ['------ This is a copy of the message, including all the headers. ------'],
-      }.freeze
-
+      ReBackbone = %r|^------ This is a copy of the message, including all the headers[.] ------|.freeze
+      StartingOf = { message: ['This message was created automatically by mail delivery software.'] }.freeze
       ReCommands = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
@@ -48,21 +45,11 @@ module Sisimai::Lhost
         'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
-      def description; return '@mail.ru: https://mail.ru'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from @mail.ru
-      # @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'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
         return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
@@ -77,86 +64,65 @@ module Sisimai::Lhost
         }x
 
         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
         localhost0 = ''     # (String) Local MTA
         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
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Это письмо создано автоматически
+          # сервером Mail.Ru, # отвечать на него не
+          # нужно.
+          #
+          # К сожалению, Ваше письмо не может
+          # быть# доставлено одному или нескольким
+          # получателям:
+          #
+          # **********************
+          #
+          # This message was created automatically by mail delivery software.
+          #
+          # A message that you sent could not be delivered to one or more of its
+          # recipients. This is a permanent error. The following address(es) failed:
+          #
+          #  kijitora@example.jp
+          #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
+          #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)\z/)
+            #   kijitora@example.jp
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] = cv[1]
+            recipients += 1
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
+          elsif dscontents.size == recipients
+            # Error message
             next if e.empty?
-
-            # Это письмо создано автоматически
-            # сервером Mail.Ru, # отвечать на него не
-            # нужно.
-            #
-            # К сожалению, Ваше письмо не может
-            # быть# доставлено одному или нескольким
-            # получателям:
-            #
-            # **********************
-            #
-            # This message was created automatically by mail delivery software.
-            #
-            # A message that you sent could not be delivered to one or more of its
-            # recipients. This is a permanent error. The following address(es) failed:
-            #
-            #  kijitora@example.jp
-            #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
-            #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)\z/)
-              #   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'] = cv[1]
-              recipients += 1
-
-            elsif dscontents.size == recipients
-              # Error message
-              next if e.empty?
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' '
-            else
-              # Error message when email address above does not include '@'
-              # and domain part.
-              next unless e.start_with?('    ', "\t")
-              v['alterrors'] ||= ''
-              v['alterrors'] << e + ' '
-            end
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' '
+          else
+            # Error message when email address above does not include '@'
+            # and domain part.
+            next unless e.start_with?('    ', "\t")
+            v['alterrors'] ||= ''
+            v['alterrors'] << e + ' '
           end
         end
 
@@ -240,13 +206,11 @@ module Sisimai::Lhost
             end
           end
           e['command'] ||= ''
-          e['agent']     = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '@mail.ru: https://mail.ru'; end
     end
   end
 end