sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/v5sendmail.rb

@@ -8,6 +8,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^[ ]+-----[ ](?:Unsent[ ]message[ ]follows|No[ ]message[ ]was[ ]collected)[ ]-----/.freeze
       StartingOf = { message: ['----- Transcript of session follows -----'] }
       MarkingsOf = {
         # Error text regular expressions which defined in src/savemail.c
@@ -27,11 +28,6 @@ module Sisimai::Lhost
         #   savemail.c:498|       putline(buf, fp, m);
         #   savemail.c:499|   (void) fclose(xfile);
         error:   %r/\A[.]+ while talking to .+[:]\z/,
-        rfc822:  %r{\A[ \t]+-----[ ](?:
-           Unsent[ ]message[ ]follows
-          |No[ ]message[ ]was[ ]collected
-          )[ ]-----
-        }x,
       }.freeze
 
       def description; return 'Sendmail version 5'; end
@@ -53,10 +49,11 @@ module Sisimai::Lhost
         # :from => %r/\AMail Delivery Subsystem/,
         return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
 
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        return nil if emailsteak[1].empty?
+
         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
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         responding = []     # (Array) Responses from remote server
@@ -65,96 +62,70 @@ module Sisimai::Lhost
         errorindex = -1     # (Integer)
         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.include?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.include?(StartingOf[:message][0])
+            next
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          #    ----- Transcript of session follows -----
+          # While talking to smtp.example.com:
+          # >>> RCPT To:<kijitora@example.org>
+          # <<< 550 <kijitora@example.org>, User Unknown
+          # 550 <kijitora@example.org>... User unknown
+          # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
+          v = dscontents[-1]
+
+          if cv = e.match(/\A\d{3}[ ]+[<]([^ ]+[@][^ ]+)[>][.]{3}[ ]*(.+)\z/)
+            # 550 <kijitora@example.org>... User unknown
+            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]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
+            # Concatenate the response of the server and error message
+            v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
+            recipients += 1
+
+          elsif cv = e.match(/\A[>]{3}[ ]*([A-Z]{4})[ ]*/)
+            # >>> RCPT To:<kijitora@example.org>
+            commandset[recipients] = cv[1]
+
+          elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+            # <<< Response
+            # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
+            # <<< 550 Requested User Mailbox not found. No such user here.
+            responding[recipients] = cv[1]
+          else
+            # Detect SMTP session error or connection error
+            next if v['sessionerr']
+
+            if e =~ MarkingsOf[:error]
+              # ----- Transcript of session follows -----
+              # ... while talking to mta.example.org.:
+              v['sessionerr'] = true
               next
             end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
 
-            #    ----- Transcript of session follows -----
-            # While talking to smtp.example.com:
-            # >>> RCPT To:<kijitora@example.org>
-            # <<< 550 <kijitora@example.org>, User Unknown
-            # 550 <kijitora@example.org>... User unknown
-            # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
-            v = dscontents[-1]
-
-            if cv = e.match(/\A\d{3}[ ]+[<]([^ ]+[@][^ ]+)[>][.]{3}[ ]*(.+)\z/)
-              # 550 <kijitora@example.org>... 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]
-
-              # Concatenate the response of the server and error message
-              v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
-              recipients += 1
-
-            elsif cv = e.match(/\A[>]{3}[ ]*([A-Z]{4})[ ]*/)
-              # >>> RCPT To:<kijitora@example.org>
-              commandset[recipients] = cv[1]
-
-            elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
-              # <<< Response
-              # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
-              # <<< 550 Requested User Mailbox not found. No such user here.
-              responding[recipients] = cv[1]
-            else
-              # Detect SMTP session error or connection error
-              next if v['sessionerr']
-
-              if e =~ MarkingsOf[:error]
-                # ----- Transcript of session follows -----
-                # ... while talking to mta.example.org.:
-                v['sessionerr'] = true
-                next
-              end
-
-              if cv = e.match(/\A\d{3}[ ]+.+[.]{3}[ \t]*(.+)\z/)
-                # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
-                anotherset['diagnosis'] = cv[1]
-              end
+            if cv = e.match(/\A\d{3}[ ]+.+[.]{3}[ \t]*(.+)\z/)
+              # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
+              anotherset['diagnosis'] = cv[1]
             end
           end
         end
-        return nil if (readcursor & Indicators[:'message-rfc822']) == 0
-
-        if recipients == 0
-          # Get the recipient address from the original message
-          rfc822list.each do |e|
-            # The value of To: header in the original message
-            next unless cv = e.match(/^To: (.+)$/m)
-            dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
-            recipients = 1
-            break
-          end
+
+        if recipients == 0 && cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
+          # Get the recipient address from "To:" header at the original message
+          dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
+          recipients = 1
         end
         return nil unless recipients > 0
 
@@ -183,8 +154,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/verizon.rb

@@ -36,9 +36,7 @@ module Sisimai::Lhost
         return nil if 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
+        rebackbone = /^__BOUNDARY_STRING_HERE__/
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         senderaddr = ''     # (String) Sender address in the message body
@@ -51,157 +49,111 @@ module Sisimai::Lhost
 
         if match == 1
           # vtext.com
-          markingsof = {
-            message: %r/\AError:[ \t]/,
-            rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/,
-          }
+          markingsof = { message: %r/\AError:[ \t]/ }
           messagesof = {
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-          markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
+          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
+          bodyslices = emailsteak[0].split("\n")
 
-          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
-
-            if (readcursor & Indicators[:'message-rfc822']) == 0
-              # Beginning of the original message part
-              if e =~ markingsof[:rfc822]
-                readcursor |= Indicators[:'message-rfc822']
-                next
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
+
+            # Message details:
+            #   Subject: Test message
+            #   Sent date: Wed Jun 12 02:21:53 GMT 2013
+            #   MAIL FROM: *******@hg.example.com
+            #   RCPT TO: *****@vtext.com
+            v = dscontents[-1]
+            if cv = e.match(/\A[ \t]+RCPT TO: (.*)\z/)
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
               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?
+              v['recipient'] = cv[1]
+              recipients += 1
+              next
 
-              # Message details:
-              #   Subject: Test message
-              #   Sent date: Wed Jun 12 02:21:53 GMT 2013
+            elsif cv = e.match(/\A[ \t]+MAIL FROM:[ \t](.+)\z/)
               #   MAIL FROM: *******@hg.example.com
-              #   RCPT TO: *****@vtext.com
-              v = dscontents[-1]
-              if cv = e.match(/\A[ \t]+RCPT TO: (.*)\z/)
-                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
-
-              elsif cv = e.match(/\A[ \t]+MAIL FROM:[ \t](.+)\z/)
-                #   MAIL FROM: *******@hg.example.com
-                senderaddr = cv[1] if senderaddr.empty?
-
-              elsif cv = e.match(/\A[ \t]+Subject:[ \t](.+)\z/)
-                #   Subject:
-                subjecttxt = cv[1] if subjecttxt.empty?
-              else
-                # 550 - Requested action not taken: no such user here
-                v['diagnosis'] = e if e =~ /\A(\d{3})[ \t][-][ \t](.*)\z/
-              end
+              senderaddr = cv[1] if senderaddr.empty?
+
+            elsif cv = e.match(/\A[ \t]+Subject:[ \t](.+)\z/)
+              #   Subject:
+              subjecttxt = cv[1] if subjecttxt.empty?
+            else
+              # 550 - Requested action not taken: no such user here
+              v['diagnosis'] = e if e =~ /\A(\d{3})[ \t][-][ \t](.*)\z/
             end
           end
-
         else
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
-          markingsof = { rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/ }
           messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
-          markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z') unless boundary00.empty?
+          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
+          bodyslices = emailsteak[0].split("\n")
 
-          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 =~ markingsof[:rfc822]
-                readcursor |= Indicators[:'message-rfc822']
-                next
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
+
+            # Original Message:
+            # From: kijitora <kijitora@example.jp>
+            # To: 0000000000@vzwpix.com
+            # Subject: test for bounce
+            # Date:  Wed, 20 Jun 2013 10:29:52 +0000
+            v = dscontents[-1]
+            if cv = e.match(/\ATo:[ \t]+(.*)\z/)
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
               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?
+              v['recipient'] = Sisimai::Address.s3s4(cv[1])
+              recipients += 1
+              next
 
-              # Original Message:
+            elsif cv = e.match(/\AFrom:[ \t](.+)\z/)
               # From: kijitora <kijitora@example.jp>
-              # To: 0000000000@vzwpix.com
-              # Subject: test for bounce
-              # Date:  Wed, 20 Jun 2013 10:29:52 +0000
-              v = dscontents[-1]
-              if cv = e.match(/\ATo:[ \t]+(.*)\z/)
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                  v = dscontents[-1]
-                end
-                v['recipient'] = Sisimai::Address.s3s4(cv[1])
-                recipients += 1
-                next
-
-              elsif cv = e.match(/\AFrom:[ \t](.+)\z/)
-                # From: kijitora <kijitora@example.jp>
-                senderaddr = Sisimai::Address.s3s4(cv[1]) if senderaddr.empty?
-
-              elsif cv = e.match(/\ASubject:[ \t](.+)\z/)
-                #   Subject:
-                subjecttxt = cv[1] if subjecttxt.empty?
-              else
-                # Message could not be delivered to mobile.
-                # Error: No valid recipients for this MM
-                v['diagnosis'] = e if e =~ /\AError:[ \t]+(.+)\z/
-              end
+              senderaddr = Sisimai::Address.s3s4(cv[1]) if senderaddr.empty?
+
+            elsif cv = e.match(/\ASubject:[ \t](.+)\z/)
+              #   Subject:
+              subjecttxt = cv[1] if subjecttxt.empty?
+            else
+              # Message could not be delivered to mobile.
+              # Error: No valid recipients for this MM
+              v['diagnosis'] = e if e =~ /\AError:[ \t]+(.+)\z/
             end
           end
         end
         return nil unless recipients > 0
 
-        if rfc822list.none? { |a| a.start_with?('From: ') }
-          # Set the value of "MAIL FROM:" or "From:"
-          rfc822list << ('From: ' << senderaddr)
-
-        elsif rfc822list.none? { |a| a.start_with?('Subject: ') }
-          # Set the value of "Subject:"
-          rfc822list << ('Subject: ' << subjecttxt)
-        end
+        # Set the value of "MAIL FROM:" and "From:"
+        emailsteak[1] << ('From: ' << senderaddr << "\n") unless emailsteak[1] =~ /^From: /
+        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
         dscontents.each do |e|
           e['agent']     = self.smtpagent
@@ -215,8 +167,7 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/x1.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       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
+      ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
+      MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
 
       def description; return 'Unknown MTA #1'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
@@ -32,67 +30,46 @@ module Sisimai::Lhost
         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
@@ -104,8 +81,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