sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/lhost/sendmail.rb

@@ -1,13 +1,15 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Sendmail parses a bounce email which created by
-  # v8 Sendmail. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Sendmail parses a bounce email which created by v8 Sendmail. Methods in the module
+  # are called from only Sisimai::Message.
   module Sendmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Sendmail.pm
       require 'sisimai/lhost'
+      require 'sisimai/smtp/reply'
+      require 'sisimai/smtp/status'
+      require 'sisimai/smtp/command'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^Content-Type:[ ](?:message/rfc822|text/rfc822-headers)>.freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
       StartingOf = {
         # Error text regular expressions which defined in sendmail/savemail.c
         #   savemail.c:1040|if (printheader && !putline("   ----- Transcript of session follows -----\n",
@@ -26,29 +28,30 @@ 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)
-        return nil unless mhead['subject'] =~ /(?:see transcript for details\z|\AWarning: )/
+      def inquire(mhead, mbody)
         return nil if mhead['x-aol-ip']
+        match   = nil
+        match ||= true if mhead['subject'].end_with?('see transcript for details')
+        match ||= true if mhead['subject'].start_with?('Warning: ')
+        return nil unless match
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
-
         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")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
+        thecommand = ''     # (String) SMTP Command name begin with the string '>>>'
         esmtpreply = []     # (Array) Reply from remote server on SMTP session
         sessionerr = false  # (Boolean) Flag, "true" if it is SMTP session error
         anotherset = {}     # Another error information
         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.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -89,7 +92,7 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -105,13 +108,14 @@ module Sisimai::Lhost
             # Received-From-MTA: DNS; x1x2x3x4.dhcp.example.ne.jp
             # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
             unless e.start_with?(' ')
-              if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
+              if e.start_with?('>>> ')
                 # >>> DATA
-                commandtxt = cv[1]
+                thecommand = Sisimai::SMTP::Command.find(e)
 
-              elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+              elsif e.start_with?('<<< ')
                 # <<< Response
-                esmtpreply << cv[1] unless esmtpreply.index(cv[1])
+                cv = e[4, e.size - 4]
+                esmtpreply << cv unless esmtpreply.index(cv)
               else
                 # Detect SMTP session error or connection error
                 next if sessionerr
@@ -122,21 +126,23 @@ module Sisimai::Lhost
                   next
                 end
 
-                if cv = e.match(/\A[<](.+)[>][.]+ (.+)\z/)
+                if e.start_with?('<') && Sisimai::String.aligned(e, ['@', '>.', ' '])
                   # <kijitora@example.co.jp>... Deferred: Name server: example.co.jp.: host name lookup failure
-                  anotherset['recipient'] = cv[1]
-                  anotherset['diagnosis'] = cv[2]
+                  anotherset['recipient'] = Sisimai::Address.s3s4(e[0, e.index('>')])
+                  anotherset['diagnosis'] = e[e.index(' ') + 1, e.size]
                 else
                   # ----- Transcript of session follows -----
                   # Message could not be delivered for too long
                   # Message will be deleted from queue
-                  next if e =~ /\A[ \t]*[-]+/
-                  if cv = e.match(/\A[45]\d\d[ \t]([45][.]\d[.]\d)[ \t].+/)
+                  cr = Sisimai::SMTP::Reply.find(e)  || ''
+                  cs = Sisimai::SMTP::Status.find(e) || ''
+
+                  if cr.size + cs.size > 7
                     # 550 5.1.2 <kijitora@example.org>... Message
                     #
                     # DBI connect('dbname=...')
                     # 554 5.3.0 unknown mailer error 255
-                    anotherset['status'] = cv[1]
+                    anotherset['status']      = cs
                     anotherset['diagnosis'] ||= ''
                     anotherset['diagnosis'] << ' ' << e
 
@@ -151,8 +157,8 @@ module Sisimai::Lhost
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -161,47 +167,53 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['lhost'] ||= permessage['rhost']
+          e['diagnosis'] ||= ''
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['command'] ||= commandtxt
-          if e['command'].empty?
-            e['command'] = 'EHLO' unless esmtpreply.empty?
-          end
-
           if anotherset['diagnosis']
             # Copy alternative error message
-            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A[ \t]+\z/
-            e['diagnosis'] = anotherset['diagnosis'] unless e['diagnosis']
-            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A\d+\z/
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].start_with?(' ')
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].=~ /\A\d+\z/
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].empty?
           end
-          unless esmtpreply.empty?
-            # Replace the error message in "diagnosis" with the ESMTP Reply
-            r = esmtpreply.join(' ')
-            e['diagnosis'] = r if r.size > e['diagnosis'].to_s.size
+
+          while true
+            # Replace or append the error message in "diagnosis" with the ESMTP Reply Code when the
+            # following conditions have matched
+            break if esmtpreply.empty?
+            break if recipients != 1
+
+            e['diagnosis'] = sprintf("%s %s", esmtpreply.join(' '), e['diagnosis'])
+            break
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          if anotherset['status']
-            # Check alternative status code
-            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d{1,3}\z/
-              # Override alternative status code
-              e['status'] = anotherset['status']
-            end
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['command'] ||= thecommand || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
+          if e['command'].empty?
+            e['command'] = 'EHLO' unless esmtpreply.empty?
           end
 
-          unless e['recipient'] =~ /\A[^ ]+[@][^ ]+\z/
-            # @example.jp, no local part
-            if cv = e['diagnosis'].match(/[<]([^ ]+[@][^ ]+)[>]/)
-              # Get email address from the value of Diagnostic-Code header
-              e['recipient'] = cv[1]
-            end
+          while true
+            # Check alternative status code and override it
+            break unless anotherset.has_key?('status')
+            break unless anotherset['status'].size > 0
+            break if     Sisimai::SMTP::Status.test(e['status'])
+
+            e['status'] = anotherset['status']
+            break
           end
+
+          # @example.jp, no local part
+          # # Get email address from the value of Diagnostic-Code field
+          next unless e['recipient'].start_with?('@')
+          cv = Sisimai::Address.find(e['diagnosis'], true) || []
+          e['recipient'] = cv[0][:address] if cv.size > 0
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
     end
   end
 end
+

data/lib/sisimai/lhost/surfcontrol.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::SurfControl parses a bounce email which created by
-  # WebSense SurfControl.
+  # Sisimai::Lhost::SurfControl parses a bounce email which created by WebSense SurfControl.
   # Methods in the module are called from only Sisimai::Message.
   module SurfControl
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/SurfControl.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 could not be sent.'] }.freeze
 
       # Parse bounce messages from SurfControl
@@ -16,7 +14,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)
         # X-SEF-ZeroHour-RefID: fgs=000000000
         # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
         # X-Mailer: SurfControl E-mail Filter
@@ -24,19 +22,18 @@ module Sisimai::Lhost
         return nil unless mhead['x-mailer']
         return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         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")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         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.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -58,24 +55,27 @@ module Sisimai::Lhost
           # --- Message non-deliverable.
           v = dscontents[-1]
 
-          if cv = e.match(/\AAddressed To:[ ]*([^ ]+?[@][^ ]+?)\z/)
+          if e.start_with?('Addressed To:') && e.index('@') > 1
             # Addressed 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]
+            v['recipient'] = Sisimai::Address.s3s4(e[e.index(':') + 2, e.size])
             recipients += 1
 
-          elsif e =~ /\A(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[ ,]/
+          elsif %w[Sun Mon Tue Wed Thu Fri Sat].any? { |a| e.start_with?(a) }
             # Thu 29 Apr 2010 23:34:45 +0900
             v['date'] = e
 
-          elsif cv = e.match(/\A[^ ]+[@][^ ]+:[ ]*\[(\d+[.]\d+[.]\d+[.]\d)\],[ ]*(.+)\z/)
+          elsif Sisimai::String.aligned(e, ['@', ':', ' ', '[', '],', '...'])
             # kijitora@example.com: [192.0.2.5], 550 kijitora@example.com... No such user
-            v['rhost'] = cv[1]
-            v['diagnosis'] = cv[2]
+            p1 = e.index('[')
+            p2 = e.index('],', p1 + 1)
+            v['rhost'] = e[p1 + 1, p2 - p1 - 1]
+            v['diagnosis'] = Sisimai::String.sweep(e[p2 + 2, e.size])
+
           else
             # Fallback, parse RFC3464 headers.
             if f = Sisimai::RFC1894.match(e)
@@ -87,8 +87,8 @@ module Sisimai::Lhost
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -96,7 +96,7 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'WebSense SurfControl'; end
     end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -1,16 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::V5sendmail parses a bounce email which created by
-  # Sendmail version 5.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::V5sendmail parses a bounce email which created by Sendmail version 5. Methods in
+  # the module are called from only Sisimai::Message.
   module V5sendmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/V5sendmail.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^[ ]+-----[ ](?:Unsent[ ]message[ ]follows|No[ ]message[ ]was[ ]collected)[ ]-----/.freeze
-      StartingOf = { message: ['----- Transcript of session follows -----'] }
-      MarkingsOf = {
+      Boundaries = ['   ----- Unsent message follows -----', '  ----- No message was collected -----'].freeze
+      StartingOf = {
         # Error text regular expressions which defined in src/savemail.c
         #   savemail.c:485| (void) fflush(stdout);
         #   savemail.c:486| p = queuename(e->e_parent, 'x');
@@ -27,7 +24,8 @@ module Sisimai::Lhost
         #   savemail.c:497|   while (fgets(buf, sizeof buf, xfile) != NULL)
         #   savemail.c:498|       putline(buf, fp, m);
         #   savemail.c:499|   (void) fclose(xfile);
-        error:   %r/\A[.]+ while talking to .+[:]\z/,
+        error:   [' while talking to '],
+        message: ['----- Transcript of session follows -----'],
       }.freeze
 
       # Parse bounce messages from Sendmail version 5
@@ -35,26 +33,27 @@ 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)
         # :from => %r/\AMail Delivery Subsystem/,
-        return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
+        return nil unless mhead['subject'].start_with?('Returned mail: ')
 
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        return nil if emailsteak[1].empty?
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        return nil unless emailparts[1].size > 0
 
+        require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        bodyslices = emailsteak[0].split("\n")
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
+        anotherset = {}     # (Hash) Another error information
         responding = []     # (Array) Responses from remote server
         commandset = []     # (Array) SMTP command which is sent to remote server
-        anotherset = {}     # (Hash) Another error information
         errorindex = -1     # (Integer)
         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.include?(StartingOf[:message][0])
@@ -71,57 +70,64 @@ module Sisimai::Lhost
           # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
           v = dscontents[-1]
 
-          if cv = e.match(/\A\d{3}[ ]+[<]([^ ]+[@][^ ]+)[>][.]{3}[ ]*(.+)\z/)
+          if e.start_with?('5', '4') && Sisimai::String.aligned(e, [' <', '@', '>...'])
             # 550 <kijitora@example.org>... User unknown
             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]
+            p1 = e.index('<', 0)
+            p2 = e.index('>...')
+            v['recipient'] = e[p1 + 1, p2 - p1 - 1]
+            v['diagnosis'] = e[p2 + 5, e.size]
 
             # Concatenate the response of the server and error message
             v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
             recipients += 1
 
-          elsif cv = e.match(/\A[>]{3}[ ]*([A-Z]{4})[ ]*/)
+          elsif e.start_with?('>>> ')
             # >>> RCPT To:<kijitora@example.org>
-            commandset[recipients] = cv[1]
+            cv = Sisimai::SMTP::Command.find(e); commandset[recipients] = cv if cv
 
-          elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+          elsif e.start_with?('<<< ')
             # <<< Response
             # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
             # <<< 550 Requested User Mailbox not found. No such user here.
-            responding[recipients] = cv[1]
+            responding[recipients] = e[4, e.size]
+
           else
             # Detect SMTP session error or connection error
             next if v['sessionerr']
 
-            if e =~ MarkingsOf[:error]
+            if e.include?(StartingOf[:error][0])
               # ----- Transcript of session follows -----
               # ... while talking to mta.example.org.:
               v['sessionerr'] = true
               next
             end
 
-            if cv = e.match(/\A\d{3}[ ]+.+[.]{3}[ \t]*(.+)\z/)
+            if e.start_with?('4', '5') && e.include?('... ')
               # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
-              anotherset['diagnosis'] = cv[1]
+              anotherset['replycode'] = e[0, 3]
+              anotherset['diagnosis'] = e[e.index('... ') + 4, e.size]
             end
           end
         end
 
-        if recipients == 0 && cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
+        p1 = emailparts[1].index("\nTo: ")     || -1
+        p2 = emailparts[1].index("\n", p1 + 6) || -1
+        if recipients == 0 && p1 > 0
           # Get the recipient address from "To:" header at the original message
-          dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
+          dscontents[0]['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
           recipients = 1
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           errorindex += 1
-          e['command'] = commandset[errorindex] || ''
+          e.delete('sessionerr')
+
           e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
                                # Copy alternative error message
                                anotherset['diagnosis']
@@ -130,18 +136,18 @@ module Sisimai::Lhost
                                responding[errorindex]
                              end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          unless e['recipient'] =~ /\A[^ ]+[@][^ ]+\z/
-            # @example.jp, no local part
-            if cv = e['diagnosis'].match(/[<]([^ ]+[@][^ ]+)[>]/)
-              # Get email address from the value of Diagnostic-Code header
-              e['recipient'] = cv[1]
-            end
-          end
-          e.delete('sessionerr')
+          e['replycode'] = Sisimai::SMTP::Reply.find(e['diagnosis']) || anotherset['replycode']
+          e['command']   = commandset[errorindex] || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
+
+          # @example.jp, no local part
+          # Get email address from the value of Diagnostic-Code header
+          next if e['recipient'].include?('@')
+          p1 = e['diagnosis'].index('<'); next unless p1
+          p2 = e['diagnosis'].index('>'); next unless p2
+          e['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Sendmail version 5'; end
     end