sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/notes.rb

@@ -7,10 +7,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['------- Failure Reasons '],
-        rfc822:  ['------- Returned Message '],
-      }.freeze
+      ReBackbone = %r|^-------[ ]Returned[ ]Message[ ]--------|.freeze
+      StartingOf = { message: ['------- Failure Reasons '] }.freeze
       MessagesOf = {
         'userunknown' => [
           'User not listed in public Name & Address Book',
@@ -38,9 +36,8 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Undeliverable message')
 
         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
         characters = ''     # (String) Character set name of the bounce mail
@@ -48,96 +45,71 @@ module Sisimai::Lhost
         encodedmsg = ''
         v = nil
 
-        while e = hasdivided.shift do
+        if cv = mhead['content-type'].match(/\A.+;[ ]*charset=(.+)\z/)
+          # Get character set name
+          # Content-Type: text/plain; charset=ISO-2022-JP
+          characters = cv[1].downcase
+        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 == 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
-
-          if characters.empty?
-            # Get character set name
-            if cv = mhead['content-type'].match(/\A.+;[ ]*charset=(.+)\z/)
-              # Content-Type: text/plain; charset=ISO-2022-JP
-              characters = cv[1].downcase
-            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
+
+          # ------- Failure Reasons  --------
+          #
+          # User not listed in public Name & Address Book
+          # kijitora@notes.example.jp
+          #
+          # ------- Returned Message --------
+          v = dscontents[-1]
+          if e =~ /\A[^ ]+[@][^ ]+/
+            # kijitora@notes.example.jp
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
+            v['recipient'] ||= e
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-
-            # ------- Failure Reasons  --------
-            #
-            # User not listed in public Name & Address Book
-            # kijitora@notes.example.jp
-            #
-            # ------- Returned Message --------
-            v = dscontents[-1]
-            if e =~ /\A[^ ]+[@][^ ]+/
-              # kijitora@notes.example.jp
-              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
-            else
-              next if e.empty?
-              next if e.start_with?('-')
-
-              if e =~ /[^\x20-\x7e]/
-                # Error message is not ISO-8859-1
-                if characters.size > 0
-                  # Try to convert string
-                  begin
-                    encodedmsg = e.encode('UTF-8', characters)
-                  rescue
-                    # Failed to convert
-                    encodedmsg = removedmsg
-                  end
-                else
-                  # No character set in Content-Type header
+            next if e.empty?
+            next if e.start_with?('-')
+
+            if e =~ /[^\x20-\x7e]/
+              # Error message is not ISO-8859-1
+              if characters.size > 0
+                # Try to convert string
+                begin
+                  encodedmsg = e.encode('UTF-8', characters)
+                rescue
+                  # Failed to convert
                   encodedmsg = removedmsg
                 end
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << encodedmsg
               else
-                # Error message does not include multi-byte character
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << e
+                # No character set in Content-Type header
+                encodedmsg = removedmsg
               end
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << encodedmsg
+            else
+              # Error message does not include multi-byte character
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << e
             end
           end
         end
 
         unless recipients > 0
           # Fallback: Get the recpient address from RFC822 part
-          rfc822list.each do |e|
-            next unless cv = e.match(/^To:[ ]*(.+)$/m)
-
+          if cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
             v['recipient'] = Sisimai::Address.s3s4(cv[1])
             recipients += 1 unless v['recipient'].empty?
-            break
           end
         end
         return nil unless recipients > 0
@@ -157,8 +129,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/office365.rb

@@ -8,8 +8,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
-        rfc822: ['Content-Type: message/rfc822'],
         error:  ['Diagnostic information for administrators:'],
         eoerr:  ['Original message headers:'],
       }.freeze
@@ -20,6 +20,15 @@ module Sisimai::Lhost
           )
         }x,
       }.freeze
+      Headers365 = %w[
+        x-ms-exchange-message-is-ndr
+        x-microsoft-antispam-prvs
+        x-exchange-antispam-report-test
+        x-exchange-antispam-report-cfa-test
+        x-ms-exchange-crosstenant-originalarrivaltime
+        x-ms-exchange-crosstenant-fromentityheader
+        x-ms-exchange-transport-crosstenantheadersstamped
+      ]
       StatusList = {
         # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
         %r/\A4[.]4[.]7\z/        => 'expired',
@@ -56,7 +65,6 @@ module Sisimai::Lhost
 
       def description; return 'Microsoft Office 365: https://office.microsoft.com/'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
       def headerlist
         # X-MS-Exchange-Message-Is-Ndr:
         # X-Microsoft-Antispam-PRVS: <....@...outlook.com>
@@ -92,13 +100,11 @@ module Sisimai::Lhost
         tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
         match += 1 if mhead['subject'].include?('Undeliverable:')
-        match += 1 if mhead['x-ms-exchange-message-is-ndr']
-        match += 1 if mhead['x-microsoft-antispam-prvs']
-        match += 1 if mhead['x-exchange-antispam-report-test']
-        match += 1 if mhead['x-exchange-antispam-report-cfa-test']
-        match += 1 if mhead['x-ms-exchange-crosstenant-originalarrivaltime']
-        match += 1 if mhead['x-ms-exchange-crosstenant-fromentityheader']
-        match += 1 if mhead['x-ms-exchange-transport-crosstenantheadersstamped']
+        Headers365.each do |e|
+          next if mhead[e].nil?
+          next if mhead[e].empty?
+          match += 1
+        end
         match += 1 if mhead['received'].any? { |a| a =~ tryto }
         if mhead['message-id']
           # Message-ID: <00000000-0000-0000-0000-000000000000@*.*.prod.outlook.com>
@@ -111,9 +117,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
         connheader = {}
@@ -121,85 +126,64 @@ module Sisimai::Lhost
         htmlbegins = false  # (Boolean) Flag for HTML part
         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
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              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
-            # 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?
+          # kijitora@example.com<mailto:kijitora@example.com>
+          # The email address wasn't found at the destination domain. It might
+          # be misspelled or it might not exist any longer. Try retyping the
+          # address and resending the message.
+          v = dscontents[-1]
 
+          if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
             # kijitora@example.com<mailto:kijitora@example.com>
-            # The email address wasn't found at the destination domain. It might
-            # be misspelled or it might not exist any longer. Try retyping the
-            # address and resending the message.
-            v = dscontents[-1]
-
-            if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
-              # kijitora@example.com<mailto: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
+            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(/\AGenerating server: (.+)\z/)
-              # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
-              connheader['lhost'] = cv[1].downcase
+          elsif cv = e.match(/\AGenerating server: (.+)\z/)
+            # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
+            connheader['lhost'] = cv[1].downcase
+          else
+            if endoferror
+              # After "Original message headers:"
+              next unless f = Sisimai::RFC1894.match(e)
+              next unless o = Sisimai::RFC1894.field(e)
+              next unless fieldtable[o[0]]
+              next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
             else
-              if endoferror
-                # After "Original message headers:"
-                next unless f = Sisimai::RFC1894.match(e)
-                next unless o = Sisimai::RFC1894.field(e)
-                next unless fieldtable.key?(o[0])
-                next if o[0] =~ /\A(?:diagnostic-code|final-recipient)\z/
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+              if e == StartingOf[:error][0]
+                # Diagnostic information for administrators:
+                v['diagnosis'] = e
               else
-                if e == StartingOf[:error][0]
-                  # Diagnostic information for administrators:
-                  v['diagnosis'] = e
-                else
-                  # kijitora@example.com
-                  # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
-                  # t not found by SMTP address lookup'
-                  next unless v['diagnosis']
-                  if e == StartingOf[:eoerr][0]
-                    # Original message headers:
-                    endoferror = true
-                    next
-                  end
-                  v['diagnosis'] << ' ' << e
+                # kijitora@example.com
+                # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
+                # t not found by SMTP address lookup'
+                next unless v['diagnosis']
+                if e == StartingOf[:eoerr][0]
+                  # Original message headers:
+                  endoferror = true
+                  next
                 end
+                v['diagnosis'] << ' ' << e
               end
             end
-
           end
         end
         return nil unless recipients > 0
@@ -233,8 +217,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/opensmtpd.rb

@@ -7,6 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^[ ]+Below is a copy of the original message:|.freeze
       StartingOf = {
         # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
         # opensmtpd-5.4.2p1/smtpd/
@@ -34,7 +35,6 @@ module Sisimai::Lhost
         #   bounce.c/338:    "    Your message was relayed to these recipients.\n\n";
         #   bounce.c/339:
         message: ['    This is the MAILER-DAEMON, please DO NOT REPLY to this '],
-        rfc822:  ['    Below is a copy of the original message:'],
       }.freeze
       MessagesOf = {
         # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
@@ -86,66 +86,45 @@ module Sisimai::Lhost
         return nil unless mhead['received'].any? { |a| a.include?(' (OpenSMTPD) with ') }
 
         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
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          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?
+          #    Hi!
+          #
+          #    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.
+          #
+          #    An error has occurred while attempting to deliver a message for
+          #    the following list of recipients:
+          #
+          # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
+          #
+          #    Below is a copy of the original message:
+          v = dscontents[-1]
 
-            #    Hi!
-            #
-            #    This is the MAILER-DAEMON, please DO NOT REPLY to this e-mail.
-            #
-            #    An error has occurred while attempting to deliver a message for
-            #    the following list of recipients:
-            #
+          if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\z/)
             # kijitora@example.jp: 550 5.2.2 <kijitora@example>... Mailbox Full
-            #
-            #    Below is a copy of the original message:
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+?[@][^ ]+?):?[ ](.+)\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
-              v['recipient'] = cv[1]
-              v['diagnosis'] = cv[2]
-              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]
+            v['diagnosis'] = cv[2]
+            recipients += 1
           end
         end
         return nil unless recipients > 0
@@ -163,8 +142,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