sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/mfilter.rb

@@ -8,126 +8,96 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^-------original[ ](?:message|mail[ ]info)/.freeze
       StartingOf = {
         error:   ['-------server message'],
         command: ['-------SMTP command'],
-        rfc822:  ['-------original message', '-------original mail info'],
       }.freeze
       MarkingsOf = { message: %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/ }.freeze
 
-      def description; return 'Digital Arts m-FILTER'; end
-      def smtpagent;   return 'Email::mFILTER'; end
-      def headerlist;  return %w[x-mailer]; end
-
       # Parse bounce messages from Digital Arts m-FILTER
-      # @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/\AMailer Daemon [<]MAILER-DAEMON[@]/,
+        # X-Mailer: m-FILTER
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
         return nil unless mhead['subject'] == 'failure notice'
 
         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
         markingset = { 'diagnosis' => false, 'command' => false }
         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
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          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
-            next if e.empty?
-
-            # このメールは「m-FILTER」が自動的に生成して送信しています。
-            # メールサーバーとの通信中、下記の理由により
-            # このメールは送信できませんでした。
-            #
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # このメールは「m-FILTER」が自動的に生成して送信しています。
+          # メールサーバーとの通信中、下記の理由により
+          # このメールは送信できませんでした。
+          #
+          # 以下のメールアドレスへの送信に失敗しました。
+          # kijitora@example.jp
+          #
+          #
+          # -------server message
+          # 550 5.1.1 unknown user <kijitora@example.jp>
+          #
+          # -------SMTP command
+          # DATA
+          #
+          # -------original message
+          v = dscontents[-1]
+
+          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
             # 以下のメールアドレスへの送信に失敗しました。
             # kijitora@example.jp
-            #
-            #
-            # -------server message
-            # 550 5.1.1 unknown user <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 e =~ /\A[A-Z]{4}/
             # -------SMTP command
             # DATA
-            #
-            # -------original message
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)\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
+            next if v['command']
+            v['command'] = e if markingset['command']
+          else
+            # Get error message and SMTP command
+            if e == StartingOf[:error][0]
+              # -------server message
+              markingset['diagnosis'] = true
 
-            elsif e =~ /\A[A-Z]{4}/
+            elsif e == StartingOf[:command][0]
               # -------SMTP command
-              # DATA
-              next if v['command']
-              v['command'] = e if markingset['command']
+              markingset['command'] = true
             else
-              # Get error message and SMTP command
-              if e == StartingOf[:error][0]
-                # -------server message
-                markingset['diagnosis'] = true
-
-              elsif e == StartingOf[:command][0]
-                # -------SMTP command
-                markingset['command'] = true
-              else
-                # 550 5.1.1 unknown user <kijitora@example.jp>
-                next if e.start_with?('-')
-                next if v['diagnosis']
-                v['diagnosis'] = e
-              end
+              # 550 5.1.1 unknown user <kijitora@example.jp>
+              next if e.start_with?('-')
+              next if v['diagnosis']
+              v['diagnosis'] = e
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e.each_key { |a| e[a] ||= '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
+          e['agent'] = 'mFILTER'
 
           # Get localhost and remote host name from Received header.
           next if mhead['received'].empty?
@@ -141,11 +111,9 @@ module Sisimai::Lhost
             e['rhost'] = ee
           end
         end
-
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Digital Arts m-FILTER'; end
     end
   end
 end

data/lib/sisimai/lhost/mxlogic.rb

@@ -9,11 +9,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software.'],
-        rfc822:  ['Included is a copy of the message header:'],
-      }.freeze
-
+      ReBackbone = %r|^Included is a copy of the message header:|.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})/,
@@ -72,26 +69,15 @@ module Sisimai::Lhost
         'was frozen on arrival by ',
       ].freeze
 
-      def description; return 'McAfee SaaS'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      # X-MX-Bounce: mta/src/queue/bounce
-      # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
-      # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
-      def headerlist;  return %w[x-mxl-notehash x-mxl-hash x-mx-bounce]; end
-
       # Parse bounce messages from MXLogic
-      # @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)
-        # :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
+        # X-MX-Bounce: mta/src/queue/bounce
+        # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
+        # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
         match  = 0
         match += 1 if mhead['x-mx-bounce']
         match += 1 if mhead['x-mxl-hash']
@@ -99,80 +85,59 @@ module Sisimai::Lhost
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
         match += 1 if mhead['subject'] =~ %r{(?:
              Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-            |Warning:[ ]message[ ].+[ ]delayed[ ]+
+            |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
             |Delivery[ ]Status[ ]Notification
             )
         }x
         return nil unless match > 0
 
         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 == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == 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?
+
+          # 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]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
+            # A message that you have sent could not be delivered to one or more
+            # recipients.  This is a permanent error.  The following address failed:
+            #
+            #  <kijitora@example.co.jp>: 550 5.1.1 ...
+            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]
+            v['diagnosis'] = cv[2]
+            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?
-
-            # 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]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
-              # A message that you have sent could not be delivered to one or more
-              # recipients.  This is a permanent error.  The following address failed:
-              #
-              #  <kijitora@example.co.jp>: 550 5.1.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]
-              v['diagnosis'] = cv[2]
-              recipients += 1
-
-            elsif dscontents.size == recipients
-              # Error message
-              next if e.empty?
-              v['diagnosis'] << e + ' '
-            end
+            v['diagnosis'] << e + ' '
           end
         end
         return nil unless recipients > 0
@@ -184,7 +149,6 @@ module Sisimai::Lhost
         end
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
           e['lhost'] = localhost0
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/[-]{2}.*\z/, ''))
 
@@ -232,13 +196,11 @@ module Sisimai::Lhost
               end
             end
           end
-          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 'McAfee SaaS'; end
     end
   end
 end

data/lib/sisimai/lhost/notes.rb

@@ -1,5 +1,5 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::::Email::Notes parses a bounce email which created by Lotus
+  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus
   # Notes Server. Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['------- Failure Reasons '],
-        rfc822:  ['------- Returned Message '],
-      }.freeze
+      ReBackbone = %r|^-------[ ]Returned[ ]Message[ ]--------|.freeze
+      StartingOf = { message: ['------- Failure Reasons '] }.freeze
       MessagesOf = {
         'userunknown' => [
           'User not listed in public Name & Address Book',
@@ -19,28 +17,17 @@ module Sisimai::Lhost
         networkerror: ['Message has exceeded maximum hop count'],
       }.freeze
 
-      def description; return 'Lotus Notes'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Lotus Notes
-      # @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 message')
 
         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
         characters = ''     # (String) Character set name of the bounce mail
@@ -48,102 +35,76 @@ module Sisimai::Lhost
         encodedmsg = ''
         v = nil
 
-        while e = hasdivided.shift do
+        if cv = mhead['content-type'].match(/\A.+;[ ]*charset=(.+)\z/)
+          # Get character set name
+          # Content-Type: text/plain; charset=ISO-2022-JP
+          characters = cv[1].downcase
+        end
+
+        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
-          end
-
-          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
-
-          if characters.empty?
-            # Get character set name
-            if cv = mhead['content-type'].match(/\A.+;[ ]*charset=(.+)\z/)
-              # Content-Type: text/plain; charset=ISO-2022-JP
-              characters = cv[1].downcase
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+
+          # ------- Failure Reasons  --------
+          #
+          # User not listed in public Name & Address Book
+          # kijitora@notes.example.jp
+          #
+          # ------- Returned Message --------
+          v = dscontents[-1]
+          if e =~ /\A[^ ]+[@][^ ]+/
+            # kijitora@notes.example.jp
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
+            v['recipient'] ||= e
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-
-            # ------- Failure Reasons  --------
-            #
-            # User not listed in public Name & Address Book
-            # kijitora@notes.example.jp
-            #
-            # ------- Returned Message --------
-            v = dscontents[-1]
-            if e =~ /\A[^ ]+[@][^ ]+/
-              # kijitora@notes.example.jp
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] ||= e
-              recipients += 1
-            else
-              next if e.empty?
-              next if e.start_with?('-')
-
-              if e =~ /[^\x20-\x7e]/
-                # Error message is not ISO-8859-1
-                if characters.size > 0
-                  # Try to convert string
-                  begin
-                    encodedmsg = e.encode('UTF-8', characters)
-                  rescue
-                    # Failed to convert
-                    encodedmsg = removedmsg
-                  end
-                else
-                  # No character set in Content-Type header
+            next if e.empty?
+            next if e.start_with?('-')
+
+            if e =~ /[^\x20-\x7e]/
+              # Error message is not ISO-8859-1
+              if characters.size > 0
+                # Try to convert string
+                begin
+                  encodedmsg = e.encode('UTF-8', characters)
+                rescue
+                  # Failed to convert
                   encodedmsg = removedmsg
                 end
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << encodedmsg
               else
-                # Error message does not include multi-byte character
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << e
+                # No character set in Content-Type header
+                encodedmsg = removedmsg
               end
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << encodedmsg
+            else
+              # Error message does not include multi-byte character
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << e
             end
           end
         end
 
         unless recipients > 0
           # Fallback: Get the recpient address from RFC822 part
-          rfc822list.each do |e|
-            next unless cv = e.match(/^To:[ ]*(.+)$/m)
-
+          if cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
             v['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients += 1 unless v['recipient'].empty?
-            break
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
@@ -154,13 +115,11 @@ module Sisimai::Lhost
             e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
             break
           end
-          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 'Lotus Notes'; end
     end
   end
 end