sisimai 4.25.4-java → 4.25.10-java

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' => [
@@ -29,11 +29,11 @@ module Sisimai::Lhost
         'networkerror' => [
           '00120270', # Too Many Hops
         ],
-        'contenterr' => [
+        'contenterror' => [
           '00050311', # Conversion to Internet format failed
           '000502CC', # Conversion to Internet format failed
         ],
-        'securityerr' => [
+        'securityerror' => [
           '000B0981', # 502 Server does not support AUTH
         ],
         'filtered' => [
@@ -41,25 +41,18 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'Microsoft Exchange Server 2003'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-ms-embedded-report x-mimeole]; end
-
       # Parse bounce messages from Microsoft Exchange Server 2003
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         match = 0
         tryto = []
 
+        # X-MS-TNEF-Correlator: <00000000000000000000000000000000000000@example.com>
+        # X-Mailer: Internet Mail Service (5.5.1960.3)
+        # X-MS-Embedded-Report:
         match += 1 if mhead['x-ms-embedded-report']
         catch :EXCHANGE_OR_NOT do
           while true
@@ -92,9 +85,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,115 +98,94 @@ 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
+            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
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0])
-              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 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
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
           e.delete('msexch')
           if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
@@ -241,20 +212,18 @@ module Sisimai::Lhost
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
-          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
-
+      def description; return 'Microsoft Exchange Server 2003'; end
     end
   end
 end

data/lib/sisimai/lhost/exchange2007.rb

@@ -8,11 +8,27 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Original message headers:'] }.freeze
+      ReBackbone = %r{^(?:
+         Original[ ]message[ ]headers:                # en-US
+        |En-t.tes[ ]de[ ]message[ ]d'origine[ ]:      # fr-FR/En-têtes de message d'origine
+        |Intestazioni[ ]originali[ ]del[ ]messaggio:  # it-CH
+        )
+      }x.freeze
       MarkingsOf = {
-        message: %r/\ADiagnostic[ ]information[ ]for[ ]administrators:/,
+        message: %r{\A(?:
+           Diagnostic[ ]information[ ]for[ ]administrators:               # en-US
+          |Informations[ ]de[ ]diagnostic[ ]pour[ ]les[ ]administrateurs  # fr-FR
+          |Informazioni[ ]di[ ]diagnostica[ ]per[ ]gli[ ]amministratori   # it-CH
+          )
+        }x,
         error:   %r/ ((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
-        rhost:   %r/\AGenerating server:[ ]?(.*)/,
+        rhost:   %r{\A(?:
+           Generating[ ]server            # en-US
+          |Serveur[ ]de[ ]g[^ ]+ration[ ] # fr-FR/Serveur de génération
+          |Server[ ]di[ ]generazione      # it-CH
+          ):[ ]?(.*)
+        }x,
+        subject: %r/\A(?:Undeliverable|Non_remis_|Non[ ]recapitabile):/,
       }.freeze
       NDRSubject = {
         'SMTPSEND.DNS.NonExistentDomain' => 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
@@ -29,30 +45,24 @@ module Sisimai::Lhost
         'QUEUE.Expired'                  => 'expired',       # 550 4.4.7 QUEUE.Expired
       }.freeze
 
-      def description; return 'Microsoft Exchange Server 2007'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[content-language]; end
-
       # Parse bounce messages from Microsoft Exchange Server 2007
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Undeliverable:')
+        # Content-Language: en-US, fr-FR
+        return nil unless mhead['subject'] =~ MarkingsOf[:subject]
         return nil unless mhead['content-language']
         return nil unless mhead['content-language'] =~ /\A[a-z]{2}(?:[-][A-Z]{2})?\z/
 
+        # These headers exist only a bounce mail from Office365
+        return nil if mhead['x-ms-exchange-crosstenant-originalarrivaltime']
+        return nil if mhead['x-ms-exchange-crosstenant-fromentityheader']
+
         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
         connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
@@ -61,80 +71,61 @@ 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 =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
 
-          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 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
+          if connvalues == connheader.keys.size
+            # Diagnostic information for administrators:
+            #
+            # Generating server: mta2.neko.example.jp
+            #
+            # kijitora@example.jp
+            # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
+            #
+            # Original message headers:
+            v = dscontents[-1]
 
-            if connvalues == connheader.keys.size
-              # Diagnostic information for administrators:
-              #
-              # Generating server: mta2.neko.example.jp
-              #
+            if cv = e.match(/\A([^ @]+[@][^ @]+)\z/)
               # kijitora@example.jp
-              # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
-              #
-              # Original message headers:
-              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]
-                v['diagnosis'] = ''
-                recipients += 1
-
-              elsif cv = e.match(/\A[#]([45]\d{2})[ ]([45][.]\d[.]\d+)[ ].+\z/)
-                # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
-                # #550 5.2.3 RESOLVER.RST.RecipSizeLimit; message too large for this recipien=
-                # t ##
-                v['replycode'] = cv[1]
-                v['status']    = cv[2]
-                v['diagnosis'] = e
-              else
-                # Continued line of error messages
-                next if v['diagnosis'].to_s.empty?
-                next unless v['diagnosis'].end_with?('=')
-                v['diagnosis']  = v['diagnosis'].chomp('=')
-                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'] = ''
+              recipients += 1
+
+            elsif cv = e.match(/([45]\d{2})[ ]([45][.]\d[.]\d+)[ ].+\z/)
+              # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
+              # #550 5.2.3 RESOLVER.RST.RecipSizeLimit; message too large for this recipient ##
+              # Remote Server returned '550 5.1.1 RESOLVER.ADR.RecipNotFound; not found'
+              # 3/09/2016 8:05:56 PM - Remote Server at mydomain.com (10.1.1.3) returned '550 4.4.7 QUEUE.Expired; message expired'
+              v['replycode'] = cv[1]
+              v['status']    = cv[2]
+              v['diagnosis'] = e
             else
-              # Diagnostic information for administrators:
-              #
-              # Generating server: mta22.neko.example.org
-              next unless cv = e.match(MarkingsOf[:rhost])
-              next unless connheader['rhost'].empty?
-              connheader['rhost'] = cv[1]
-              connvalues += 1
+              # Continued line of error messages
+              next if v['diagnosis'].to_s.empty?
+              next unless v['diagnosis'].end_with?('=')
+              v['diagnosis']  = v['diagnosis'].chomp('=')
+              v['diagnosis'] << e
             end
+          else
+            # Diagnostic information for administrators:
+            #
+            # Generating server: mta22.neko.example.org
+            next unless cv = e.match(MarkingsOf[:rhost])
+            next unless connheader['rhost'].empty?
+            connheader['rhost'] = cv[1]
+            connvalues += 1
           end
         end
         return nil unless recipients > 0
@@ -151,13 +142,11 @@ module Sisimai::Lhost
             end
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Microsoft Exchange Server 2007'; end
     end
   end
 end