sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/google.rb

@@ -7,19 +7,12 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^[ ]*-----[ ](?:Original[ ]message|Message[ ]header[ ]follows)[ ]-----/.freeze
       StartingOf = {
         message: ['Delivery to the following recipient'],
         error:   ['The error that the other server returned was:'],
       }.freeze
-      MarkingsOf = {
-        start:  %r/Technical details of (?:permanent|temporary) failure:/,
-        rfc822: %r{\A(?:
-             -----[ ]Original[ ]message[ ]-----
-            |[ \t]*-----[ ]Message[ ]header[ ]follows[ ]-----
-            )\z
-        }x,
-      }.freeze
-
+      MarkingsOf = { start: %r/Technical details of (?:permanent|temporary) failure:/ }.freeze
       MessagesOf = {
         'expired' => [
           'DNS Error: Could not contact DNS servers',
@@ -172,74 +165,55 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
 
         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
         statecode0 = 0      # (Integer) The value of (state *) in the error message
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           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
+          # Technical details of permanent failure:=20
+          # Google tried to deliver your message, but it was rejected by the recipient =
+          # domain. We recommend contacting the other email provider for further inform=
+          # ation about the cause of this error. The error that the other server return=
+          # ed was: 554 554 5.7.0 Header error (state 18).
+          #
+          # -- OR --
+          #
+          # Technical details of permanent failure:=20
+          # Google tried to deliver your message, but it was rejected by the server for=
+          # the recipient domain example.jp by mx.example.jp. [192.0.2.49].
+          #
+          # The error that the other server returned was:
+          # 550 5.1.1 <userunknown@example.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[ \t]+([^ ]+[@][^ ]+)\z/)
+            # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
+            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?
 
-            # Technical details of permanent failure:=20
-            # Google tried to deliver your message, but it was rejected by the recipient =
-            # domain. We recommend contacting the other email provider for further inform=
-            # ation about the cause of this error. The error that the other server return=
-            # ed was: 554 554 5.7.0 Header error (state 18).
-            #
-            # -- OR --
-            #
-            # Technical details of permanent failure:=20
-            # Google tried to deliver your message, but it was rejected by the server for=
-            # the recipient domain example.jp by mx.example.jp. [192.0.2.49].
-            #
-            # The error that the other server returned was:
-            # 550 5.1.1 <userunknown@example.jp>... User Unknown
-            #
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]+([^ ]+[@][^ ]+)\z/)
-              # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox 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
-            else
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' '
-            end
+            r = Sisimai::Address.s3s4(cv[1])
+            next unless Sisimai::RFC5322.is_emailaddress(r)
+            v['recipient'] = r
+            recipients += 1
+          else
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' '
           end
         end
         return nil unless recipients > 0
@@ -286,8 +260,7 @@ module Sisimai::Lhost
           e['reason'] = Sisimai::SMTP::Status.name(e['status']).to_s if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/gsuite.rb

@@ -7,9 +7,9 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
       MarkingsOf = {
         message: %r/\A[*][*][ ].+[ ][*][*]\z/,
-        rfc822:  %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
         error:   %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
         html:    %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
       }.freeze
@@ -44,9 +44,8 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         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  # (Integer) Flag for a blank line after error messages
@@ -54,112 +53,94 @@ module Sisimai::Lhost
         emptylines = 0      # (Integer) The number of empty lines
         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 message/delivery-status part
             readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e =~ MarkingsOf[:rfc822]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          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
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
 
-            if f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              next unless o = Sisimai::RFC1894.field(e)
-              v = dscontents[-1]
-
-              if o[-1] == 'addr'
+            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
-              # The line does not begin with a DSN field defined in RFC3464
-              # Append error messages continued from the previous line
-              if endoferror == false && v && ! v['diagnosis'].to_s.empty?
-                endoferror ||= true if e.empty?
-
-                next if endoferror
-                next unless e.start_with?(' ')
-                v['diagnosis'] << e
-
-              elsif e =~ MarkingsOf[:error]
-                # Detect SMTP session error or connection error
-                # The response from the remote server was:
-                anotherset['diagnosis'] << 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
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            # Append error messages continued from the previous line
+            if endoferror == false && v && ! v['diagnosis'].to_s.empty?
+              endoferror ||= true if e.empty?
+
+              next if endoferror
+              next unless e.start_with?(' ')
+              v['diagnosis'] << e
+
+            elsif e =~ MarkingsOf[:error]
+              # Detect SMTP session error or connection error
+              # The response from the remote server was:
+              anotherset['diagnosis'] << e
+            else
+              # ** Address not found **
+              #
+              # Your message wasn't delivered to * because the address couldn't be found.
+              # Check for typos or unnecessary spaces and try again.
+              #
+              # The response from the remote server was:
+              # 550 #5.1.0 Address rejected.
+              next if e =~ MarkingsOf[:html]
+
+              if anotherset['diagnosis']
+                # Continued error messages from the previous line like
+                # "550 #5.1.0 Address rejected."
+                next if e =~ /\AContent-Type:/
+                next if emptylines > 5
+                if e.empty?
+                  # Count and next()
+                  emptylines += 1
+                  next
+                end
+                anotherset['diagnosis'] << ' ' << e
               else
                 # ** Address not found **
                 #
                 # Your message wasn't delivered to * because the address couldn't be found.
                 # Check for typos or unnecessary spaces and try again.
-                #
-                # The response from the remote server was:
-                # 550 #5.1.0 Address rejected.
-                next if e =~ MarkingsOf[:html]
-
-                if anotherset['diagnosis']
-                  # Continued error messages from the previous line like
-                  # "550 #5.1.0 Address rejected."
-                  next if e =~ /\AContent-Type:/
-                  next if emptylines > 5
-                  if e.empty?
-                    # Count and next()
-                    emptylines += 1
-                    next
-                  end
-                  anotherset['diagnosis'] << ' ' << e
-                else
-                  # ** Address not found **
-                  #
-                  # Your message wasn't delivered to * because the address couldn't be found.
-                  # Check for typos or unnecessary spaces and try again.
-                  next if e.empty?
-                  next unless e =~ MarkingsOf[:message]
-                  anotherset['diagnosis'] = e
-                end
+                next if e.empty?
+                next unless e =~ MarkingsOf[:message]
+                anotherset['diagnosis'] = e
               end
             end
-          end # End of message/delivery-status
+          end
         end
         return nil unless recipients > 0
 
@@ -218,8 +199,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/imailserver.rb

@@ -7,12 +7,8 @@ module Sisimai::Lhost
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/IMailServer.pm
       require 'sisimai/lhost'
 
-      Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: [''],  # Blank line
-        rfc822:  ['Original message follows.'],
-        error:   ['Body of message generated response:'],
-      }.freeze
+      ReBackbone = %r|^Original[ ]message[ ]follows[.]|.freeze
+      StartingOf = { error: ['Body of message generated response:'] }.freeze
 
       ReSMTP = {
         'conn' => %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
@@ -52,72 +48,44 @@ 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 == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          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.
 
-          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
-            break if readcursor & Indicators[:'message-rfc822'] > 0
+          # Unknown user: kijitora@example.com
+          #
+          # Original message follows.
+          v = dscontents[-1]
 
+          if cv = e.match(/\A([^ ]+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
             # Unknown user: kijitora@example.com
-            #
-            # Original message follows.
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
-              # Unknown user: kijitora@example.com
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['diagnosis'] = cv[1] + ' ' + cv[2]
-              v['recipient'] = cv[3]
-              recipients += 1
-
-            elsif cv = e.match(/\Aundeliverable[ ]+to[ ]+(.+)\z/)
-              # undeliverable to kijitora@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]
-              recipients += 1
-            else
-              # Other error message text
-              v['alterrors'] << ' ' << e if v['alterrors']
-              v['alterrors'] = e if e.include?(StartingOf[:error][0])
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v['diagnosis'] = cv[1] + ' ' + cv[2]
+            v['recipient'] = cv[3]
+            recipients += 1
+
+          elsif cv = e.match(/\Aundeliverable[ ]+to[ ]+(.+)\z/)
+            # undeliverable to kijitora@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]
+            recipients += 1
+          else
+            # Other error message text
+            v['alterrors'] << ' ' << e if v['alterrors']
+            v['alterrors'] = e if e.include?(StartingOf[:error][0])
           end
         end
         return nil unless recipients > 0
@@ -153,8 +121,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