sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/exchange2003.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Exchange2003 parses a bounce email which created by
-  # Microsoft Exchange Server 2003.
+  # Sisimai::Lhost::Exchange2003 parses a bounce email which created by Microsoft Exchange Server 2003.
   # Methods in the module are called from only Sisimai::Message.
   module Exchange2003
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Exchange2003.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {
         message: ['Your message'],
         error:   ['did not reach the following recipient(s):'],
@@ -46,7 +44,7 @@ module Sisimai::Lhost
       # @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)
+      def inquire(mhead, mbody)
         match = 0
         tryto = []
 
@@ -85,8 +83,8 @@ module Sisimai::Lhost
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[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.
@@ -99,8 +97,8 @@ module Sisimai::Lhost
         v = nil
 
         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.
+          # 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])
@@ -124,8 +122,7 @@ module Sisimai::Lhost
             #     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/)
+            if Sisimai::String.aligned(e, ['@', ' on '])
               # 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']
@@ -133,14 +130,16 @@ module Sisimai::Lhost
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-              v['recipient'] = cv[1]
+              p1 = e.downcase.index('smtp='); p1 = p1.nil? ? 0 : p1 + 5
+              p2 = e.index(' on ') + 1
+              v['recipient'] = Sisimai::Address.s3s4(e[p1, p2])
               v['msexch'] = false
               recipients += 1
 
-            elsif cv = e.match(/\A[ \t]+(MSEXCH:.+)\z/)
+            elsif e.start_with?(' ') && e.include?('MSEXCH:')
               #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
               v['diagnosis'] ||= ''
-              v['diagnosis'] << cv[1]
+              v['diagnosis'] << e[e.index('MSEXCH:'), e.size]
             else
               next if v['msexch']
               if v['diagnosis'].to_s.start_with?('MSEXCH:')
@@ -161,24 +160,23 @@ module Sisimai::Lhost
             #  Subject: ...
             #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
             #
-            if cv = e.match(/\A[ \t]+To:[ \t]+(.+)\z/)
+            if e.start_with?('  To: ') || e.start_with?('      To: ')
               #  To:      shironeko@example.jp
               next unless connheader['to'].empty?
-              connheader['to'] = cv[1]
+              connheader['to'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
-            elsif cv = e.match(/\A[ \t]+Subject:[ \t]+(.+)\z/)
+            elsif e.start_with?('      Subject: ') || e.start_with?('  Subject: ')
               #  Subject: ...
               next unless connheader['subject'].empty?
-              connheader['subject'] = cv[1]
+              connheader['subject'] = e[e.rindex(' ') + 1, e.size]
               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].+)|)
+            elsif e.start_with?('  Sent: ') || e.start_with?('      Sent: ')
               #  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]
+              connheader['date'] = e[e.index(':') + 2, e.size]
               connvalues += 1
             end
           end
@@ -187,10 +185,13 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e.delete('msexch')
-          if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
+          e['diagnosis'] ||= ''
+          if e['diagnosis'].start_with?('MSEXCH:')
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-            capturedcode = cv[1]
-            errormessage = cv[2]
+            p1 = e['diagnosis'].index('(') || -1
+            p2 = e['diagnosis'].index(')') || -1
+            capturedcode = e['diagnosis'][p1 + 1, 8]
+            errormessage = e['diagnosis'][p2 + 1, e['diagnosis'].size]
 
             ErrorCodes.each_key do |r|
               # Find captured code from the error code table
@@ -214,14 +215,14 @@ module Sisimai::Lhost
           end
         end
 
-        if emailsteak[1].empty?
+        if emailparts[1].empty?
           # When original message does not included in the bounce message
-          emailsteak[1] << ('From: ' << connheader['to'] << "\n")
-          emailsteak[1] << ('Date: ' << connheader['date'] << "\n")
-          emailsteak[1] << ('Subject: ' << connheader['subject'] << "\n")
+          emailparts[1] << ('From: ' << connheader['to'] << "\n")
+          emailparts[1] << ('Date: ' << connheader['date'] << "\n")
+          emailparts[1] << ('Subject: ' << connheader['subject'] << "\n")
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Microsoft Exchange Server 2003'; end
     end

data/lib/sisimai/lhost/exchange2007.rb

@@ -1,34 +1,28 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Exchange2007 parses a bounce email which created by
-  # Microsoft Exchange Server 2007.
+  # Sisimai::Lhost::Exchange2007 parses a bounce email which created by Microsoft Exchange Server 2007.
   # Methods in the module are called from only Sisimai::Message.
   module Exchange2007
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Exchange2007.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      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
+      Boundaries = [
+        'Original message headers:',                # en-US
+        "tes de message d'origine :",               # fr-FR/En-têtes de message d'origine
+        'Intestazioni originali del messaggio:',    # it-CH
+      ].freeze
       MarkingsOf = {
-        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{\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):/,
+        message: [
+          'Diagnostic information for administrators:',           # en-US
+          'Informations de diagnostic pour les administrateurs',  # fr-FR
+          'Informazioni di diagnostica per gli amministratori',   # it-CH
+        ],
+        error:   [' RESOLVER.', ' QUEUE.'],
+        rhost:   [
+          'Generating server',        # en-US
+          'Serveur de g',             # fr-FR/Serveur de g�Hn�Hration
+          'Server di generazione',    # it-CH
+        ]
       }.freeze
       NDRSubject = {
         'SMTPSEND.DNS.NonExistentDomain' => 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
@@ -50,19 +44,26 @@ module Sisimai::Lhost
       # @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)
+      def inquire(mhead, mbody)
         # Content-Language: en-US, fr-FR
-        return nil unless mhead['subject'] =~ MarkingsOf[:subject]
+        match   = nil
+        match ||= 1 if mhead['subject'].start_with?('Undeliverable')
+        match ||= 1 if mhead['subject'].start_with?('Non_remis_')
+        match ||= 1 if mhead['subject'].start_with?('Non recapitabile')
+        return nil unless match
         return nil unless mhead['content-language']
-        return nil unless mhead['content-language'] =~ /\A[a-z]{2}(?:[-][A-Z]{2})?\z/
+
+        match += 1 if mhead['content-language'].size == 2 # JP
+        match += 1 if mhead['content-language'].size == 5 # ja-JP
+        return nil unless match > 1
 
         # 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]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[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
@@ -72,11 +73,11 @@ module Sisimai::Lhost
         v = nil
 
         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.
+          # 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]
+            readcursor |= Indicators[:deliverystatus] if MarkingsOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -92,59 +93,70 @@ module Sisimai::Lhost
             # Original message headers:
             v = dscontents[-1]
 
-            if cv = e.match(/\A([^ @]+[@][^ @]+)\z/)
+            if e.include?('@') && e.include?(' ') == false
               # 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['recipient'] = Sisimai::Address.s3s4(e)
               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
               # 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
+              cr = Sisimai::SMTP::Reply.find(e)
+              cs = Sisimai::SMTP::Status.find(e)
+              if cr || cs
+                # #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'] = cr || ''
+                v['status']    = cs || ''
+                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
+              end
             end
           else
             # Diagnostic information for administrators:
             #
             # Generating server: mta22.neko.example.org
-            next unless cv = e.match(MarkingsOf[:rhost])
+            next unless MarkingsOf[:rhost].any? { |a| e.start_with?(a) }
             next unless connheader['rhost'].empty?
-            connheader['rhost'] = cv[1]
+            connheader['rhost'] = e[e.index(':') + 1, e.size]
             connvalues += 1
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          if cv = e['diagnosis'].match(MarkingsOf[:error])
-            # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
-            f = cv[1]
-            NDRSubject.each_key do |r|
-              # Try to match with error subject strings
-              next unless f == r
-              e['reason'] = NDRSubject[r]
-              break
-            end
-          end
+          p = -1
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          MarkingsOf[:error].each do |q|
+            # Find an error message, get an error code.
+            p = e['diagnosis'].index(q) || -1
+            break if p > -1
+          end
+          next unless p > 0
+
+          # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
+          f = e['diagnosis'][p + 1, e['diagnosis'].index(';') - p -1]
+          NDRSubject.each_key do |r|
+            # Try to match with error subject strings
+            next unless f == r
+            e['reason'] = NDRSubject[r]
+            break
+          end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Microsoft Exchange Server 2007'; end
     end