sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/interscanmss.rb

@@ -7,12 +7,7 @@ module Sisimai::Lhost
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
       require 'sisimai/lhost'
 
-      Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: [''],
-        rfc822:  ['Content-type: message/rfc822'],
-      }.freeze
-
+      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
       def description; return 'Trend Micro InterScan Messaging Security Suite'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
       def headerlist;  return []; end
@@ -41,77 +36,49 @@ module Sisimai::Lhost
         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
-        readcursor = 0      # (Integer) Points the current cursor position
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          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
+        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.
+          next if e.empty?
 
-          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?
+          # Sent <<< RCPT TO:<kijitora@example.co.jp>
+          # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+          v = dscontents[-1]
 
+          if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
+                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                    e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
-              # Sent <<< RCPT TO:<kijitora@example.co.jp>
-              # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-              if v['recipient'] && cv[1] != v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients = dscontents.size
+            if v['recipient'] && cv[1] != v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v['recipient'] = cv[1]
+            recipients = dscontents.size
+          end
+
+          if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
+            # Sent <<< RCPT TO:<kijitora@example.co.jp>
+            v['command'] = cv[1]
 
-            if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
-              # Sent <<< RCPT TO:<kijitora@example.co.jp>
+          elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
+            # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            v['diagnosis'] = cv[1]
+          else
+            # Error message in non-English
+            if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
+              # >>> RCPT TO ...
               v['command'] = cv[1]
 
-            elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
-              # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
+              # <<< 550 5.1.1 User unknown
               v['diagnosis'] = cv[1]
-            else
-              # Error message in non-English
-              if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
-                # >>> RCPT TO ...
-                v['command'] = cv[1]
-
-              elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
-                # <<< 550 5.1.1 User unknown
-                v['diagnosis'] = cv[1]
-              end
             end
           end
         end
@@ -123,8 +90,7 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/kddi.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Content-Type: message/rfc822'] }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       MarkingsOf = {
         message: %r/\AYour[ ]mail[ ](?:
              sent[ ]on:?[ ][A-Z][a-z]{2}[,]
@@ -46,66 +46,45 @@ module Sisimai::Lhost
         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
         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 == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          v = dscontents[-1]
+          if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            #     Could not be delivered to: <******@**.***.**>
+            #     As their mailbox is full.
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            r = Sisimai::Address.s3s4(cv[1])
+            next unless Sisimai::RFC5322.is_emailaddress(r)
+            v['recipient'] = r
+            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
+          elsif cv = e.match(/Your mail sent on: (.+)\z/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            v['date'] = cv[1]
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            v = dscontents[-1]
-            if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
-              # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-              #     Could not be delivered to: <******@**.***.**>
-              #     As their mailbox is full.
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              r = Sisimai::Address.s3s4(cv[1])
-              next unless Sisimai::RFC5322.is_emailaddress(r)
-              v['recipient'] = r
-              recipients += 1
-
-            elsif cv = e.match(/Your mail sent on: (.+)\z/)
-              # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-              v['date'] = cv[1]
-            else
-              #     As their mailbox is full.
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
-            end
+            #     As their mailbox is full.
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
           end
         end
         return nil unless recipients > 0
@@ -136,8 +115,7 @@ module Sisimai::Lhost
 
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -7,9 +7,9 @@ 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
 
@@ -33,73 +33,52 @@ module Sisimai::Lhost
         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
@@ -111,8 +90,7 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -8,6 +8,7 @@ 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'],
@@ -33,9 +34,8 @@ module Sisimai::Lhost
         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,99 +50,77 @@ 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>
+                # 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>
-                # Remote-MTA:         <10.0.0.1>
+                v['lhost'] = cv[1]
+
+              elsif cv = e.match(/\AReporting-MTA:[ \t]+[<](.+)[>]\z/)
                 # 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])
-
-                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(/\A\s+(From|Subject):\s*(.+)\z/)
-                  #    From:    originalsender@example.com
-                  #    Subject: ...
-                  rfc822list << sprintf("%s: %s", cv[1], cv[2])
-                end
+                v['rhost'] = cv[1]
+
+              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
@@ -155,8 +133,7 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end