sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/ezweb.rb

@@ -7,6 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^(?:[-]{50}|Content-Type:[ ]*message/rfc822)>.freeze
       MarkingsOf = {
         message: %r{\A(?:
              The[ ]user[(]s[)][ ]
@@ -15,7 +16,6 @@ module Sisimai::Lhost
             |[<][^ ]+[@][^ ]+[>]\z
             )
         }x,
-        rfc822: %r#\A(?:[-]{50}|Content-Type:[ ]*message/rfc822)#,
       }.freeze
       ReFailures = {
         # notaccept: [ %r/The following recipients did not receive this message:/ ],
@@ -68,9 +68,8 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         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
         rxboundary = %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/
@@ -85,83 +84,65 @@ module Sisimai::Lhost
         rxmessages = []
         ReFailures.each_value { |a| rxmessages << a }
 
-        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 =~ MarkingsOf[:rfc822] || e =~ rxboundary
-              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
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # The user(s) account is disabled.
+          #
+          # <***@ezweb.ne.jp>: 550 user unknown (in reply to RCPT TO command)
+          #
+          #  -- OR --
+          # Each of the following recipients was rejected by a remote
+          # mail server.
+          #
+          #    Recipient: <******@ezweb.ne.jp>
+          #    >>> RCPT TO:<******@ezweb.ne.jp>
+          #    <<< 550 <******@ezweb.ne.jp>: User unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
+                  e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
+                  e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
+
+            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?
-
-            # The user(s) account is disabled.
-            #
-            # <***@ezweb.ne.jp>: 550 user unknown (in reply to RCPT TO command)
-            #
-            #  -- OR --
-            # Each of the following recipients was rejected by a remote
-            # mail server.
-            #
-            #    Recipient: <******@ezweb.ne.jp>
-            #    >>> RCPT TO:<******@ezweb.ne.jp>
-            #    <<< 550 <******@ezweb.ne.jp>: User unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                    e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
-                    e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
-
-              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])
-              v['recipient'] = r
-              recipients += 1
+            r = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = r
+            recipients += 1
 
-            elsif f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              next unless o = Sisimai::RFC1894.field(e)
-              next unless fieldtable.key?(o[0])
-              v[fieldtable[o[0]]] = o[2]
+          elsif f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            next unless fieldtable[o[0]]
+            v[fieldtable[o[0]]] = o[2]
 
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            next if Sisimai::String.is_8bit(e)
+            if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
+              #    >>> RCPT TO:<******@ezweb.ne.jp>
+              v['command'] = cv[1]
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              next if Sisimai::String.is_8bit(e)
-              if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
-                #    >>> RCPT TO:<******@ezweb.ne.jp>
-                v['command'] = cv[1]
+              # Check error message
+              if rxmessages.any? { |a| e =~ a }
+                # Check with regular expressions of each error
+                v['diagnosis'] ||= ''
+                v['diagnosis'] << ' ' << e
               else
-                # Check error message
-                if rxmessages.any? { |a| e =~ a }
-                  # Check with regular expressions of each error
-                  v['diagnosis'] ||= ''
-                  v['diagnosis'] << ' ' << e
-                else
-                  # >>> 550
-                  v['alterrors'] ||= ''
-                  v['alterrors'] << ' ' << e
-                end
+                # >>> 550
+                v['alterrors'] ||= ''
+                v['alterrors'] << ' ' << e
               end
             end
           end
@@ -212,8 +193,7 @@ module Sisimai::Lhost
           e['reason'] = 'userunknown'
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/facebook.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by Facebook.'],
-        rfc822:  ['Content-Disposition: inline'],
-      }.freeze
+      ReBackbone = %r|^Content-Disposition:[ ]inline|.freeze
+      StartingOf = { message: ['This message was created automatically by Facebook.'] }.freeze
       ReFailures = {
         # http://postmaster.facebook.com/response_codes
         # NOT TESTD EXCEPT RCP-P2
@@ -95,90 +93,67 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        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")
+        readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         fbresponse = ''     # (String) Response code from Facebook
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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.
+          readslices << e # Save the current line for the next loop
 
           if readcursor == 0
             # Beginning of the bounce message or message/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(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            if f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              o = Sisimai::RFC1894.field(e) || next
-              v = dscontents[-1]
-
-              if o[-1] == 'addr'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            o = Sisimai::RFC1894.field(e) || next
+            v = dscontents[-1]
+
+            if o[-1] == 'addr'
+              # Final-Recipient: rfc822; kijitora@example.jp
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              if o[0] == 'final-recipient'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                if o[0] == 'final-recipient'
-                  # Final-Recipient: rfc822; 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'] = o[2]
-                  recipients += 1
-                else
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  v['alias'] = o[2]
+                if v['recipient']
+                  # There are multiple recipient addresses in the message body.
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                  v = dscontents[-1]
                 end
-              elsif o[-1] == 'code'
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = o[1]
-                v['diagnosis'] = o[2]
+                v['recipient'] = o[2]
+                recipients += 1
               else
-                # Other DSN fields defined in RFC3464
-                next unless fieldtable.key?(o[0])
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
               end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
             else
-              # Continued line of the value of Diagnostic-Code field
-              next unless p.start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
-              havepassed[-1] = 'Diagnostic-Code: ' << e
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
             end
-          end # End of message/delivery-status
+          else
+            # Continued line of the value of Diagnostic-Code field
+            next unless readslices[-2].start_with?('Diagnostic-Code:')
+            next unless cv = e.match(/\A[ \t]+(.+)\z/)
+            v['diagnosis'] << ' ' << cv[1]
+            readslices[-1] = 'Diagnostic-Code: ' << e
+          end
         end
         return nil unless recipients > 0
 
@@ -224,8 +199,7 @@ module Sisimai::Lhost
           e['reason'] = 'systemerror'
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/fml.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Original mail as follows:'] }.freeze
+      ReBackbone = %r|^Original[ ]mail[ ]as[ ]follows:|.freeze
       ErrorTitle = {
         'rejected' => %r{(?>
            (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
@@ -66,61 +66,37 @@ module Sisimai::Lhost
         return nil unless mhead['message-id'] =~ /\A[<]\d+[.]FML.+[@].+[>]\z/
 
         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
 
-        readcursor |= Indicators[:deliverystatus]
-        while e = hasdivided.shift do
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == 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 (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "Original mail as follows:" line
-            #
-            #    From owner-2ndml@example.com  Mon Nov 20 18:10:11 2017
-            #    Return-Path: <owner-2ndml@example.com>
-            #    ...
-            #
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e.lstrip
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+          # Duplicated Message-ID in <2ndml@example.com>.
+          # Original mail as follows:
+          v = dscontents[-1]
 
+          if cv = e.match(/[<]([^ ]+?[@][^ ]+?)[>][.]\z/)
             # Duplicated Message-ID in <2ndml@example.com>.
-            # Original mail as follows:
-            v = dscontents[-1]
-
-            if cv = e.match(/[<]([^ ]+?[@][^ ]+?)[>][.]\z/)
-              # Duplicated Message-ID in <2ndml@example.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]
-              v['diagnosis'] = e
-              recipients += 1
-            else
-              # If you know the general guide of this list, please send mail with
-              # the mail body
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e
+            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'] = e
+            recipients += 1
+          else
+            # If you know the general guide of this list, please send mail with
+            # the mail body
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e
           end
         end
         return nil unless recipients > 0
@@ -148,8 +124,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/gmx.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software'],
-        rfc822:  ['--- The header of the original message is following'],
-      }.freeze
+      ReBackbone = %r|^---[ ]The[ ]header[ ]of[ ]the[ ]original[ ]message[ ]is[ ]following[.][ ]---|.freeze
+      StartingOf = { message: ['This message was created automatically by mail delivery software'] }.freeze
       MessagesOf = { 'expired' => ['delivery retry timeout exceeded'] }.freeze
 
       def description; return 'GMX: https://www.gmx.net'; end
@@ -39,91 +37,70 @@ module Sisimai::Lhost
         return nil unless mhead['x-gmx-antispam']
 
         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
-          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
-
-          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
+          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
+          # failed:
+          #
+          # "shironeko@example.jp":
+          # SMTP error from remote server after RCPT command:
+          # host: mx.example.jp
+          # 5.1.1 <shironeko@example.jp>... User Unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
+            # "shironeko@example.jp":
+            # ---- OR ----
+            # <kijitora@6jo.example.co.jp>
+            #
+            # Reason:
+            # delivery retry timeout exceeded
+            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
 
-            # 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
-            # failed:
-            #
-            # "shironeko@example.jp":
+          elsif cv = e.match(/\ASMTP error .+ ([A-Z]{4}) command:\z/)
             # SMTP error from remote server after RCPT command:
-            # host: mx.example.jp
-            # 5.1.1 <shironeko@example.jp>... User Unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
-              # "shironeko@example.jp":
-              # ---- OR ----
-              # <kijitora@6jo.example.co.jp>
-              #
-              # Reason:
-              # delivery retry timeout exceeded
-              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 cv = e.match(/\ASMTP error .+ ([A-Z]{4}) command:\z/)
-              # SMTP error from remote server after RCPT command:
-              v['command'] = cv[1]
+            v['command'] = cv[1]
 
-            elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
-              # host: mx.example.jp
-              v['rhost'] = cv[1]
+          elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
+            # host: mx.example.jp
+            v['rhost'] = cv[1]
+          else
+            # Get error message
+            if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
+              v['diagnosis'] ||= e
             else
-              # Get error message
-              if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
-                v['diagnosis'] ||= e
-              else
-                next if e.empty?
-                if e.start_with?('Reason:')
-                  # Reason:
-                  # delivery retry timeout exceeded
-                  v['diagnosis'] = e
-
-                elsif v['diagnosis'] == 'Reason:'
-                  v['diagnosis'] = e
-                end
+              next if e.empty?
+              if e.start_with?('Reason:')
+                # Reason:
+                # delivery retry timeout exceeded
+                v['diagnosis'] = e
+
+              elsif v['diagnosis'] == 'Reason:'
+                v['diagnosis'] = e
               end
             end
           end
@@ -142,8 +119,7 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end