sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/domino.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['Your message'],
-        rfc822:  ['Content-Type: message/delivery-status'],
-      }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/delivery-status|.freeze
+      StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
@@ -40,86 +38,65 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:')
 
         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
         subjecttxt = ''     # (String) The value of Subject:
         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.
           next if e.empty?
 
           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
+
+          # Your message
+          #
+          #   Subject: Test Bounce
+          #
+          # was not delivered to:
+          #
+          #   kijitora@example.net
+          #
+          # because:
+          #
+          #   User some.name (kijitora@example.net) not listed in Domino Directory
+          #
+          v = dscontents[-1]
+
+          if e.start_with?('was not delivered to:')
+            # was not delivered to:
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] ||= e
+            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
-
-            # Your message
-            #
-            #   Subject: Test Bounce
-            #
-            # was not delivered to:
-            #
+          elsif cv = e.match(/\A[ ][ ]([^ ]+[@][^ ]+)\z/)
+            # Continued from the line "was not delivered to:"
             #   kijitora@example.net
-            #
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+
+          elsif e.start_with?('because:')
             # because:
-            #
-            #   User some.name (kijitora@example.net) not listed in Domino Directory
-            #
-            v = dscontents[-1]
-
-            if e.start_with?('was not delivered to:')
-              # was not delivered to:
-              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
-
-            elsif cv = e.match(/\A[ ][ ]([^ ]+[@][^ ]+)\z/)
-              # Continued from the line "was not delivered to:"
-              #   kijitora@example.net
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-
-            elsif e.start_with?('because:')
-              # because:
+            v['diagnosis'] = e
+          else
+            if v['diagnosis'].to_s == 'because:'
+              # Error message, continued from the line "because:"
               v['diagnosis'] = e
-            else
-              if v['diagnosis'].to_s == 'because:'
-                # Error message, continued from the line "because:"
-                v['diagnosis'] = e
-
-              elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
-                #   Subject: Nyaa
-                subjecttxt = cv[1]
-              end
+
+            elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
+              #   Subject: Nyaa
+              subjecttxt = cv[1]
             end
           end
         end
@@ -140,14 +117,11 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        unless rfc822list.any? { |a| a.start_with?('Subject:') }
-          # Set the value of subjecttxt as a Subject if there is no original
-          # message in the bounce mail.
-          rfc822list << ('Subject: ' << subjecttxt)
-        end
+        # Set the value of subjecttxt as a Subject if there is no original
+        # message in the bounce mail.
+        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/einsundeins.rb

@@ -7,10 +7,10 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
       StartingOf = {
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
-        rfc822:  ['--- The header of the original message is following'],
       }.freeze
       MessagesOf = { 'mesgtoobig' => ['Mail size limit exceeded'] }.freeze
 
@@ -34,77 +34,80 @@ module Sisimai::Lhost
         return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
+
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          # The following address failed:
+          #
+          # general@example.eu
+          #
+          # For the following reason:
+          #
+          # Mail size limit exceeded. For explanation visit
+          # http://postmaster.1and1.com/en/error-messages?ip=%1s
+          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/)
+            # general@example.eu
+            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]
+            recipients += 1
 
-            # The following address failed:
-            #
-            # general@example.eu
-            #
+          elsif e.start_with?(StartingOf[:error][0])
             # For the following reason:
-            #
-            # Mail size limit exceeded. For explanation visit
-            # http://postmaster.1and1.com/en/error-messages?ip=%1s
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
-              # general@example.eu
-              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.start_with?(StartingOf[:error][0])
-              # For the following reason:
-              v['diagnosis'] = e
-            else
+            v['diagnosis'] = e
+          else
+            if v['diagnosis']
               # Get error message and append error message strings
-              v['diagnosis'] << ' ' << e if v['diagnosis']
+              v['diagnosis'] << ' ' << e
+            else
+              # OR the following format:
+              #   neko@example.fr:
+              #   SMTP error from remote server for TEXT command, host: ...
+              v['alterrors'] ||= ''
+              v['alterrors'] << ' ' << e
             end
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.gsub(/\A#{StartingOf[:error][0]}/, ''))
+          e['agent']       = self.smtpagent
+          e['diagnosis'] ||= ''
+          e['diagnosis']   = e['alterrors'] if e['diagnosis'].empty?
+
+          if cv = e['diagnosis'].match(/host:[ ]+(.+?)[ ]+.+[ ]+reason:.+/)
+            # SMTP error from remote server for TEXT command,
+            #   host: smtp-in.orange.fr (193.252.22.65)
+            #   reason: 550 5.2.0 Mail rejete. Mail rejected. ofr_506 [506]
+            e['rhost']   = cv[1]
+            e['command'] = 'DATA' if e['diagnosis'] =~ /for TEXT command/
+            e['spec']    = 'SMTP' if e['diagnosis'] =~ /SMTP error/
+            e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
+          else
+            # For the following reason:
+            e['diagnosis'].gsub(/\A#{StartingOf[:error][0]}/, '')
+          end
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
@@ -114,8 +117,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/exchange2003.rb

@@ -8,10 +8,10 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
         message: ['Your message'],
         error:   ['did not reach the following recipient(s):'],
-        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
       ErrorCodes = {
         'onhold' => [
@@ -92,9 +92,8 @@ 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
         statuspart = false  # (Boolean) Flag, true = have got delivery status part.
@@ -106,108 +105,88 @@ module Sisimai::Lhost
         }
         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
-          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
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if statuspart
+
+          if connvalues == connheader.keys.size
+            # did not reach the following recipient(s):
+            #
+            # kijitora@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
+            #     The recipient name is not recognized
+            #     The MTS-ID of the original message is: c=jp;a= ;p=neko
+            # ;l=EXCHANGE000000000000000000
+            #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
+            # mikeneko@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
+            #     The recipient name is not recognized
+            #     The MTS-ID of the original message is: c=jp;a= ;p=neko
+            # ;l=EXCHANGE000000000000000000
+            #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
+            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
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if statuspart
-
-            if connvalues == connheader.keys.size
-              # did not reach the following recipient(s):
-              #
+            if cv = e.match(/\A[ \t]*([^ ]+[@][^ ]+) on[ \t]*.*\z/) ||
+                    e.match(/\A[ \t]*.+(?:SMTP|smtp)=([^ ]+[@][^ ]+) on[ \t]*.*\z/)
               # kijitora@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
-              #     The recipient name is not recognized
-              #     The MTS-ID of the original message is: c=jp;a= ;p=neko
-              # ;l=EXCHANGE000000000000000000
-              #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-              # mikeneko@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
-              #     The recipient name is not recognized
-              #     The MTS-ID of the original message is: c=jp;a= ;p=neko
-              # ;l=EXCHANGE000000000000000000
-              #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-              v = dscontents[-1]
-
-              if cv = e.match(/\A[ \t]*([^ ]+[@][^ ]+) on[ \t]*.*\z/) ||
-                      e.match(/\A[ \t]*.+(?:SMTP|smtp)=([^ ]+[@][^ ]+) on[ \t]*.*\z/)
-                # kijitora@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
-                #   kijitora@example.com on 4/29/99 9:19:59 AM
-                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['msexch'] = false
-                recipients += 1
+              #   kijitora@example.com on 4/29/99 9:19:59 AM
+              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['msexch'] = false
+              recipients += 1
 
-              elsif cv = e.match(/\A[ \t]+(MSEXCH:.+)\z/)
-                #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << cv[1]
+            elsif cv = e.match(/\A[ \t]+(MSEXCH:.+)\z/)
+              #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << cv[1]
+            else
+              next if v['msexch']
+              if v['diagnosis'].to_s.start_with?('MSEXCH:')
+                # Continued from MEEXCH in the previous line
+                v['msexch'] = true
+                v['diagnosis'] << ' ' << e
+                statuspart = true
               else
-                next if v['msexch']
-                if v['diagnosis'].to_s.start_with?('MSEXCH:')
-                  # Continued from MEEXCH in the previous line
-                  v['msexch'] = true
-                  v['diagnosis'] << ' ' << e
-                  statuspart = true
-                else
-                  # Error message in the body part
-                  v['alterrors'] ||= ''
-                  v['alterrors'] << ' ' << e
-                end
+                # Error message in the body part
+                v['alterrors'] ||= ''
+                v['alterrors'] << ' ' << e
               end
-            else
-              # Your message
-              #
+            end
+          else
+            # Your message
+            #
+            #  To:      shironeko@example.jp
+            #  Subject: ...
+            #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
+            #
+            if cv = e.match(/\A[ \t]+To:[ \t]+(.+)\z/)
               #  To:      shironeko@example.jp
-              #  Subject: ...
-              #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
-              #
-              if cv = e.match(/\A[ \t]+To:[ \t]+(.+)\z/)
-                #  To:      shironeko@example.jp
-                next unless connheader['to'].empty?
-                connheader['to'] = cv[1]
-                connvalues += 1
+              next unless connheader['to'].empty?
+              connheader['to'] = cv[1]
+              connvalues += 1
 
-              elsif cv = e.match(/\A[ \t]+Subject:[ \t]+(.+)\z/)
-                #  Subject: ...
-                next unless connheader['subject'].empty?
-                connheader['subject'] = cv[1]
-                connvalues += 1
+            elsif cv = e.match(/\A[ \t]+Subject:[ \t]+(.+)\z/)
+              #  Subject: ...
+              next unless connheader['subject'].empty?
+              connheader['subject'] = cv[1]
+              connvalues += 1
 
-              elsif cv = e.match(%r|\A[ \t]+Sent:[ \t]+([A-Z][a-z]{2},.+[-+]\d{4})\z|) ||
-                         e.match(%r|\A[ \t]+Sent:[ \t]+(\d+[/]\d+[/]\d+[ \t]+\d+:\d+:\d+[ \t].+)|)
-                #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
-                #  Sent:    4/29/99 9:19:59 AM
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
-              end
+            elsif cv = e.match(%r|\A[ \t]+Sent:[ \t]+([A-Z][a-z]{2},.+[-+]\d{4})\z|) ||
+                       e.match(%r|\A[ \t]+Sent:[ \t]+(\d+[/]\d+[/]\d+[ \t]+\d+:\d+:\d+[ \t].+)|)
+              #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
+              #  Sent:    4/29/99 9:19:59 AM
+              next unless connheader['date'].empty?
+              connheader['date'] = cv[1]
+              connvalues += 1
             end
           end
         end
@@ -244,15 +223,14 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        if rfc822list.empty?
+        if emailsteak[1].empty?
           # When original message does not included in the bounce message
-          rfc822list << ('From: ' << connheader['to'])
-          rfc822list << ('Date: ' << connheader['date'])
-          rfc822list << ('Subject: ' << connheader['subject'])
+          emailsteak[1] << ('From: ' << connheader['to'] << "\n")
+          emailsteak[1] << ('Date: ' << connheader['date'] << "\n")
+          emailsteak[1] << ('Subject: ' << connheader['subject'] << "\n")
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end