sisimai 4.25.4 → 4.25.5

data/lib/sisimai/lhost/messagingserver.rb

@@ -8,8 +8,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r<^(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)>.freeze
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
-      MarkingsOf = { rfc822: %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)! }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
       def description; return 'Oracle Communications Messaging Server'; end
@@ -35,130 +35,109 @@ 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
         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
-
-          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?
+
+          # --Boundary_(ID_0000000000000000000000)
+          # Content-type: text/plain; charset=us-ascii
+          # Content-language: en-US
+          #
+          # This report relates to a message you sent with the following header fields:
+          #
+          #   Message-id: <CD8C6134-C312-41D5-B083-366F7FA1D752@me.example.com>
+          #   Date: Fri, 21 Nov 2014 23:34:45 +0900
+          #   From: Shironeko <shironeko@me.example.com>
+          #   To: kijitora@example.jp
+          #   Subject: Nyaaaaaaaaaaaaaaaaaaaaaan
+          #
+          # Your message cannot be delivered to the following recipients:
+          #
+          #   Recipient address: kijitora@example.jp
+          #   Reason: Remote SMTP server has rejected address
+          #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
+          #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]+Recipient address:[ \t]*([^ ]+[@][^ ]+)\z/)
+            #   Recipient address: kijitora@example.jp
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            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
-            next if e.empty?
+          elsif cv = e.match(/\A[ \t]+Original address:[ \t]*([^ ]+[@][^ ]+)\z/)
+            #   Original address: kijitora@example.jp
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
 
-            # --Boundary_(ID_0000000000000000000000)
-            # Content-type: text/plain; charset=us-ascii
-            # Content-language: en-US
-            #
-            # This report relates to a message you sent with the following header fields:
-            #
-            #   Message-id: <CD8C6134-C312-41D5-B083-366F7FA1D752@me.example.com>
+          elsif cv = e.match(/\A[ \t]+Date:[ \t]*(.+)\z/)
             #   Date: Fri, 21 Nov 2014 23:34:45 +0900
-            #   From: Shironeko <shironeko@me.example.com>
-            #   To: kijitora@example.jp
-            #   Subject: Nyaaaaaaaaaaaaaaaaaaaaaan
-            #
-            # Your message cannot be delivered to the following recipients:
-            #
-            #   Recipient address: kijitora@example.jp
+            v['date'] = cv[1]
+
+          elsif cv = e.match(/\A[ \t]+Reason:[ \t]*(.+)\z/)
             #   Reason: Remote SMTP server has rejected address
+            v['diagnosis'] = cv[1]
+
+          elsif cv = e.match(/\A[ \t]+Diagnostic code:[ \t]*([^ ]+);(.+)\z/)
             #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-            #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]+Recipient address:[ \t]*([^ ]+[@][^ ]+)\z/)
-              #   Recipient address: 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'] = Sisimai::Address.s3s4(cv[1])
-              recipients += 1
-
-            elsif cv = e.match(/\A[ \t]+Original address:[ \t]*([^ ]+[@][^ ]+)\z/)
-              #   Original address: kijitora@example.jp
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-
-            elsif cv = e.match(/\A[ \t]+Date:[ \t]*(.+)\z/)
-              #   Date: Fri, 21 Nov 2014 23:34:45 +0900
-              v['date'] = cv[1]
-
-            elsif cv = e.match(/\A[ \t]+Reason:[ \t]*(.+)\z/)
-              #   Reason: Remote SMTP server has rejected address
-              v['diagnosis'] = cv[1]
-
-            elsif cv = e.match(/\A[ \t]+Diagnostic code:[ \t]*([^ ]+);(.+)\z/)
-              #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-              v['spec'] = cv[1].upcase
-              v['diagnosis'] = cv[2]
-
-            elsif cv = e.match(/\A[ \t]+Remote system:[ ]*dns;([^ ]+)[ ]*([^ ]+)[ ]*.+\z/)
-              #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
-              #     (6jo.example.jp ESMTP SENDMAIL-VM)
-              remotehost = cv[1]  # remote host
-              sessionlog = cv[2]  # smtp session
-              v['rhost'] = remotehost
-
-              # The value does not include ".", use IP address instead.
-              # (TCP|17.111.174.67|47323|192.0.2.225|25)
-              next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
-              v['lhost'] = cv[1]
-              v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
-            else
-              # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
-              # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
-              # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-              #
-              # Original-recipient: rfc822;kijitora@example.jp
-              # Final-recipient: rfc822;kijitora@example.jp
-              # Action: failed
+            v['spec'] = cv[1].upcase
+            v['diagnosis'] = cv[2]
+
+          elsif cv = e.match(/\A[ \t]+Remote system:[ ]*dns;([^ ]+)[ ]*([^ ]+)[ ]*.+\z/)
+            #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
+            #     (6jo.example.jp ESMTP SENDMAIL-VM)
+            remotehost = cv[1]  # remote host
+            sessionlog = cv[2]  # smtp session
+            v['rhost'] = remotehost
+
+            # The value does not include ".", use IP address instead.
+            # (TCP|17.111.174.67|47323|192.0.2.225|25)
+            next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
+            v['lhost'] = cv[1]
+            v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
+          else
+            # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
+            # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
+            # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
+            #
+            # Original-recipient: rfc822;kijitora@example.jp
+            # Final-recipient: rfc822;kijitora@example.jp
+            # Action: failed
+            # Status: 5.1.1 (Remote SMTP server has rejected address)
+            # Remote-MTA: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
+            #  (6jo.example.jp ESMTP SENDMAIL-VM)
+            # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
+            #
+            if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
               # Status: 5.1.1 (Remote SMTP server has rejected address)
-              # Remote-MTA: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
-              #  (6jo.example.jp ESMTP SENDMAIL-VM)
-              # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-              #
-              if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
-                # Status: 5.1.1 (Remote SMTP server has rejected address)
-                v['status'] = cv[1]
-                v['diagnosis'] ||= cv[2]
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-                v['date'] ||= cv[1]
-
-              elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
-                localhost = cv[1]
-                v['lhost'] ||= localhost
-                v['lhost']   = localhost unless v['lhost'] =~ /[^.]+[.][^ ]+/
-              end
+              v['status'] = cv[1]
+              v['diagnosis'] ||= cv[2]
+
+            elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
+              # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
+              v['date'] ||= cv[1]
+
+            elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
+              localhost = cv[1]
+              v['lhost'] ||= localhost
+              v['lhost']   = localhost unless v['lhost'] =~ /[^.]+[.][^ ]+/
             end
           end
         end
@@ -177,8 +156,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/mfilter.rb

@@ -8,10 +8,10 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r/^-------original[ ](?:message|mail[ ]info)/.freeze
       StartingOf = {
         error:   ['-------server message'],
         command: ['-------SMTP command'],
-        rfc822:  ['-------original message', '-------original mail info'],
       }.freeze
       MarkingsOf = { message: %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/ }.freeze
 
@@ -36,89 +36,70 @@ module Sisimai::Lhost
         return nil unless mhead['subject'] == 'failure notice'
 
         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
         markingset = { 'diagnosis' => false, 'command' => false }
         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 =~ MarkingsOf[:message]
           end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
-              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
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            # このメールは「m-FILTER」が自動的に生成して送信しています。
-            # メールサーバーとの通信中、下記の理由により
-            # このメールは送信できませんでした。
-            #
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # このメールは「m-FILTER」が自動的に生成して送信しています。
+          # メールサーバーとの通信中、下記の理由により
+          # このメールは送信できませんでした。
+          #
+          # 以下のメールアドレスへの送信に失敗しました。
+          # kijitora@example.jp
+          #
+          #
+          # -------server message
+          # 550 5.1.1 unknown user <kijitora@example.jp>
+          #
+          # -------SMTP command
+          # DATA
+          #
+          # -------original message
+          v = dscontents[-1]
+
+          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
             # 以下のメールアドレスへの送信に失敗しました。
             # kijitora@example.jp
-            #
-            #
-            # -------server message
-            # 550 5.1.1 unknown user <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'] = cv[1]
+            recipients += 1
+
+          elsif e =~ /\A[A-Z]{4}/
             # -------SMTP command
             # DATA
-            #
-            # -------original message
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
-              # 以下のメールアドレスへの送信に失敗しました。
-              # 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'] = cv[1]
-              recipients += 1
+            next if v['command']
+            v['command'] = e if markingset['command']
+          else
+            # Get error message and SMTP command
+            if e == StartingOf[:error][0]
+              # -------server message
+              markingset['diagnosis'] = true
 
-            elsif e =~ /\A[A-Z]{4}/
+            elsif e == StartingOf[:command][0]
               # -------SMTP command
-              # DATA
-              next if v['command']
-              v['command'] = e if markingset['command']
+              markingset['command'] = true
             else
-              # Get error message and SMTP command
-              if e == StartingOf[:error][0]
-                # -------server message
-                markingset['diagnosis'] = true
-
-              elsif e == StartingOf[:command][0]
-                # -------SMTP command
-                markingset['command'] = true
-              else
-                # 550 5.1.1 unknown user <kijitora@example.jp>
-                next if e.start_with?('-')
-                next if v['diagnosis']
-                v['diagnosis'] = e
-              end
+              # 550 5.1.1 unknown user <kijitora@example.jp>
+              next if e.start_with?('-')
+              next if v['diagnosis']
+              v['diagnosis'] = e
             end
           end
         end
@@ -142,8 +123,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/mxlogic.rb

@@ -9,11 +9,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['This message was created automatically by mail delivery software.'],
-        rfc822:  ['Included is a copy of the message header:'],
-      }.freeze
-
+      ReBackbone = %r|^Included is a copy of the message header:|.freeze
+      StartingOf = { message: ['This message was created automatically by mail delivery software.'] }.freeze
       ReCommands = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
@@ -106,73 +103,52 @@ 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
         localhost0 = ''     # (String) Local MTA
         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 == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == 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
+          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(es) failed:
+          #
+          #  kijitora@example.jp
+          #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
+          #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[ \t]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
+            # A message that you have sent could not be delivered to one or more
+            # recipients.  This is a permanent error.  The following address failed:
+            #
+            #  <kijitora@example.co.jp>: 550 5.1.1 ...
+            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]
+            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
+          elsif dscontents.size == recipients
+            # Error message
             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(es) failed:
-            #
-            #  kijitora@example.jp
-            #    SMTP error from remote mail server after RCPT TO:<kijitora@example.jp>:
-            #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[ \t]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
-              # A message that you have sent could not be delivered to one or more
-              # recipients.  This is a permanent error.  The following address failed:
-              #
-              #  <kijitora@example.co.jp>: 550 5.1.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
-
-            elsif dscontents.size == recipients
-              # Error message
-              next if e.empty?
-              v['diagnosis'] << e + ' '
-            end
+            v['diagnosis'] << e + ' '
           end
         end
         return nil unless recipients > 0
@@ -235,8 +211,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