sisimai 4.25.3-java → 4.25.9-java

data/lib/sisimai/rfc3464.rb

@@ -3,10 +3,10 @@ module Sisimai
   module RFC3464
     # Imported from p5-Sisimail/lib/Sisimai/RFC3464.pm
     class << self
-      require 'sisimai/bite/email'
+      require 'sisimai/lhost'
 
       # http://tools.ietf.org/html/rfc3464
-      Indicators = Sisimai::Bite::Email.INDICATORS
+      Indicators = Sisimai::Lhost.INDICATORS
       MarkingsOf = {
         message: %r{\A(?>
            content-type:[ ]*(?:
@@ -16,12 +16,15 @@ module Sisimai
             )
           |the[ ]original[ ]message[ ]was[ ]received[ ]at[ ]
           |this[ ]report[ ]relates[ ]to[ ]your[ ]message
-          |your[ ]message[ ]was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
+          |your[ ]message[ ](?:
+             could[ ]not[ ]be[ ]delivered
+            |was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
+            )
           )
         }x,
         rfc822:  %r{\A(?>
            content-type:[ ]*(?:message/rfc822|text/rfc822-headers)
-          |return-path:[ ]*[<].+[>]\z
+          |return-path:[ ]*[<].+[>]
           )\z
         }x,
         error:   %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/,
@@ -89,29 +92,16 @@ module Sisimai
         ['"]?[<]?([^\s\n\r@=<>]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
       }xi.freeze
 
-
-      def description; 'Fallback Module for MTAs'; end
-      def smtpagent;   'RFC3464'; end
-      def headerlist;  return []; end
-
       # Detect an error for RFC3464
-      # @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
-      def scan(mhead, mbody)
-        require 'sisimai/mda'
-
-        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.scrub('?').split("\n")
-        havepassed = ['']
-        scannedset = Sisimai::MDA.scan(mhead, mbody)
-        rfc822list = []   # (Array) Each line in message/rfc822 part string
+      # @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)
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        bodyslices = mbody.scrub('?').split("\n")
+        readslices = ['']
+        rfc822text = ''   # (String) message/rfc822 part text
         maybealias = nil  # (String) Original-Recipient Field
         blanklines = 0    # (Integer) The number of blank lines
         readcursor = 0    # (Integer) Points the current cursor position
@@ -124,11 +114,11 @@ module Sisimai
         }
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
+        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.
+          readslices << e # Save the current line for the next loop
           d = e.downcase
-          p = havepassed[-2]
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
@@ -153,7 +143,7 @@ module Sisimai
               break if blanklines > 1
               next
             end
-            rfc822list << e
+            rfc822text << e << "\n"
           else
             # Error message part
             next unless readcursor & Indicators[:deliverystatus] > 0
@@ -190,7 +180,7 @@ module Sisimai
 
                 if !x.empty? && x != y
                   # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Bite.DELIVERYSTATUS
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
                   v = dscontents[-1]
                 end
                 v['recipient'] = y
@@ -291,10 +281,10 @@ module Sisimai
                 # Diagnostic-Code: 554 ...
                 v['diagnosis'] = cv[1]
 
-              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
+              elsif readslices[-2].start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
                 v['diagnosis'] << ' ' << cv[1]
-                e = 'Diagnostic-Code: ' << e
+                readslices[-1] = 'Diagnostic-Code: ' << e
               else
                 if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # 2.2.2 The Reporting-MTA DSN field
@@ -378,10 +368,9 @@ module Sisimai
           break unless match > 0
 
           b = dscontents[-1]
-          hasdivided = mbody.split("\n")
-          while e = hasdivided.shift do
+          bodyslices = mbody.split("\n")
+          while e = bodyslices.shift do
             # Get the recipient's email address and error messages.
-            break if e.start_with?('__END_OF_EMAIL_MESSAGE__')
             d = e.downcase
             break if d =~ MarkingsOf[:rfc822]
             break if d =~ ReStop
@@ -398,11 +387,10 @@ module Sisimai
 
               if !x.empty? && x != y
                 # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Bite.DELIVERYSTATUS
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 b = dscontents[-1]
               end
               b['recipient'] = y
-              b['agent'] = self.smtpagent + '::Fallback'
               recipients += 1
               itisbounce ||= true
 
@@ -418,47 +406,43 @@ module Sisimai
         end
         return nil unless itisbounce
 
-        unless recipients > 0
-          # Try to get a recipient address from email headers
-          rfc822list.each do |e|
-            # Check To: header in the original message
-            next unless cv = e.match(/\ATo:\s*(.+)\z/)
-            r = Sisimai::Address.find(cv[1], true) || []
-            next if r.empty?
-            dscontents << Sisimai::Bite::Email.DELIVERYSTATUS if dscontents.size == recipients
-
+        if recipients == 0 && cv = rfc822text.match(/^To:[ ]*(.+)/)
+          # Try to get a recipient address from "To:" header of the original message
+          if r = Sisimai::Address.find(cv[1], true)
+            # Found a recipient address
+            dscontents << Sisimai::Lhost.DELIVERYSTATUS if dscontents.size == recipients
             b = dscontents[-1]
             b['recipient'] = r[0][:address]
-            b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
             recipients += 1
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/mda'
+        mdabounced = Sisimai::MDA.make(mhead, mbody)
         dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-          if e.key?('alterrors') && !e['alterrors'].empty?
+          if e['alterrors']
             # Copy alternative error message
-            e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
-              # Override the value of diagnostic code message
-              e['diagnosis'] = e['alterrors'] unless e['alterrors'].empty?
+            unless e['alterrors'].empty?
+              e['diagnosis'] ||= e['alterrors']
+              if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
+                # Override the value of diagnostic code message
+                e['diagnosis'] = e['alterrors']
+              end
+              e.delete('alterrors')
             end
-            e.delete('alterrors')
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
-          if scannedset
-            # Make bounce data by the values returned from Sisimai::MDA->scan()
-            e['agent']     = scannedset['mda'] || self.smtpagent
-            e['reason']    = scannedset['reason'] || 'undefined'
-            e['diagnosis'] = scannedset['message'] unless scannedset['message'].empty?
+          if mdabounced
+            # Make bounce data by the values returned from Sisimai::MDA.make()
+            e['agent']     = mdabounced['mda'] || 'RFC3464'
+            e['reason']    = mdabounced['reason'] || 'undefined'
+            e['diagnosis'] = mdabounced['message'] unless mdabounced['message'].empty?
             e['command']   = ''
-          else
-            # Set the value of smtpagent
-            e['agent'] = self.smtpagent
           end
 
           e['status'] ||= Sisimai::SMTP::Status.find(e['diagnosis']) || ''
@@ -466,13 +450,11 @@ module Sisimai
             e['command'] = cv[1]
           end
           e['date'] ||= mhead['date']
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => rfc822text }
       end
-
+      def description; 'Fallback Module for MTAs'; end
     end
   end
 end

data/lib/sisimai/rfc3834.rb

@@ -10,6 +10,7 @@ module Sisimai
         'auto-submitted' => %r/\Aauto-(?:generated|replied|notified)/,
         # https://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
         'x-auto-response-suppress' => %r/(?:oof|autoreply)/,
+        'x-apple-action' => %r/\Avacation\z/,
         'precedence' => %r/\Aauto_reply\z/,
         'subject' => %r/\A(?>
              auto:
@@ -37,29 +38,19 @@ module Sisimai
         [ ]*(.+)\z
       }xi.freeze
 
-      def description; 'Detector for auto replied message'; end
-      def smtpagent;   'RFC3834'; end
-      def headerlist;  return %w[auto-submitted precedence x-auto-response-suppress]; end
-
       # Detect auto reply message as RFC3834
-      # @param         [Hash] mhead       Message header 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
-      def scan(mhead, mbody)
+      # @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)
         leave = 0
         match = 0
 
         # DETECT_EXCLUSION_MESSAGE
         Excludings.each_key do |e|
           # Exclude message from root@
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           next unless mhead[e].downcase =~ Excludings[e]
           leave = 1
@@ -70,7 +61,7 @@ module Sisimai
         # DETECT_AUTO_REPLY_MESSAGE
         AutoReply1.each_key do |e|
           # RFC3834 Auto-Submitted and other headers
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           next unless mhead[e].downcase =~ AutoReply1[e]
           match += 1
@@ -78,9 +69,9 @@ module Sisimai
         end
         return nil if match < 1
 
-        require 'sisimai/bite/email'
-        dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.scrub('?').split("\n")
+        require 'sisimai/lhost'
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        bodyslices = mbody.scrub('?').split("\n")
         rfc822part = '' # (String) message/rfc822-headers part
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
         maxmsgline = 5  # (Integer) Max message length(lines)
@@ -92,7 +83,7 @@ module Sisimai
         # RECIPIENT_ADDRESS
         %w[from return-path].each do |e|
           # Try to get the address of the recipient
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           v['recipient'] = mhead[e]
           break
@@ -113,7 +104,7 @@ module Sisimai
         end
 
         # BODY_PARSER: Get vacation message
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
           # Read the first 5 lines except a blank line
           countuntil += 1 if e =~ MarkingsOf[:boundary]
 
@@ -135,19 +126,16 @@ module Sisimai
         v['diagnosis'] ||= mhead['subject']
         v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
         v['reason']    = 'vacation'
-        v['agent']     = self.smtpagent
         v['date']      = mhead['date']
         v['status']    = ''
 
-        v.each_key { |a| v[a] ||= '' }
-
         if cv = mhead['subject'].match(SubjectSet)
           # Get the Subject header from the original message
           rfc822part = 'Subject: ' << cv[1] + "\n"
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end
-
+      def description; 'Detector for auto replied message'; end
     end
   end
 end

data/lib/sisimai/rfc5322.rb

@@ -41,7 +41,7 @@ module Sisimai
 
       build_flatten_rfc822header_list = lambda do
         # Convert HEADER: structured hash table to flatten hash table for being
-        # called from Sisimai::Bite::Email::*
+        # called from Sisimai::Lhost::*
         fv = {}
         HeaderTable.each_value do |e|
           e.each { |ee| fv[ee] = true }
@@ -57,7 +57,7 @@ module Sisimai
       # @return   [Array,Hash]    RFC822 Header list
       def HEADERFIELDS(group = '')
         return HeaderIndex if group.empty?
-        return HeaderTable[group] if HeaderTable.key?(group)
+        return HeaderTable[group] if HeaderTable[group]
         return HeaderTable
       end
 
@@ -66,7 +66,6 @@ module Sisimai
       def LONGFIELDS
         return { 'to' => 1, 'from' => 1, 'subject' => 1, 'message-id' => 1 }
       end
-      LongHeaders = Sisimai::RFC5322.LONGFIELDS
 
       # Check that the argument is an email address or not
       # @param    [String] email  Email address string
@@ -177,37 +176,26 @@ module Sisimai
         return hosts
       end
 
-      # Weed out rfc822/message header fields excepct necessary fields
-      # @param    [Array] argv1  each line divided message/rc822 part
-      # @return   [String]       Selected fields
-      def weedout(argv1)
-        return nil unless argv1.is_a?(Array)
-
-        rfc822next = { from: false, to: false, subject: false }
-        rfc822part = '' # (String) message/rfc822-headers part
-        previousfn = '' # (String) Previous field name
-
-        while e = argv1.shift do
-          # After "message/rfc822"
-          if e.start_with?(' ', "\t")
-            # Continued line from the previous line
-            next if rfc822next[previousfn]
-            rfc822part << e + "\n" if LongHeaders.key?(previousfn)
-          else
-            # Get required headers only
-            (lhs, rhs) = e.split(/:[ ]*/, 2)
-            next unless lhs
-            lhs.downcase!
-
-            previousfn = ''
-            next unless HeaderIndex.key?(lhs)
-
-            previousfn  = lhs
-            rfc822part << e + "\n"
-          end
+      # Split given entire message body into error message lines and the original
+      # message part only include email headers
+      # @param    [String] mbody  Entire message body
+      # @param    [Regexp] regex  Regular expression of the message/rfc822 or the
+      #                           beginning of the original message part
+      # @return   [Array]         [Error message lines, The original message]
+      # @since    v4.25.5
+      def fillet(mbody = '', regex)
+        return nil if mbody.empty?
+        return nil unless regex
+
+        v = mbody.split(regex, 2)
+        v[1] ||= ''
+
+        unless v[1].empty?
+          v[1].sub(/\A[\r\n\s]+/, '')
+          v[1].sub(/\n\n.+\z/m, '')
+          v[1] << "\n" unless v[1].end_with?("\n")
         end
-
-        return rfc822part
+        return v
       end
 
     end

data/lib/sisimai/rhost.rb

@@ -7,26 +7,23 @@ module Sisimai
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
-        'aspmx.l.google.com'          => 'GoogleApps',
-        'gmail-smtp-in.l.google.com'  => 'GoogleApps',
         '.prod.outlook.com'           => 'ExchangeOnline',
         '.protection.outlook.com'     => 'ExchangeOnline',
-        'smtp.secureserver.net'       => 'GoDaddy',
-        'mailstore1.secureserver.net' => 'GoDaddy',
         'laposte.net'                 => 'FrancePTT',
         'orange.fr'                   => 'FrancePTT',
         'wanadoo.fr'                  => 'FrancePTT',
+        'smtp.secureserver.net'       => 'GoDaddy',
+        'mailstore1.secureserver.net' => 'GoDaddy',
+        'aspmx.l.google.com'          => 'GoogleApps',
+        'gmail-smtp-in.l.google.com'  => 'GoogleApps',
+        '.email.ua'                   => 'IUA',
         'lsean.ezweb.ne.jp'           => 'KDDI',
         'msmx.au.com'                 => 'KDDI',
+        'charter.net'                 => 'Spectrum',
+        'cox.net'                     => 'Cox',
         '.qq.com'                     => 'TencentQQ',
       }.freeze
 
-      # Retrun the list of remote hosts Sisimai support
-      # @return   [Array] Remote host list
-      def list
-        return RhostClass.keys
-      end
-
       # The value of "rhost" is listed in RhostClass or not
       # @param    [String] argvs  Remote host name
       # @return   [True,False]    True: matched
@@ -48,9 +45,10 @@ module Sisimai
 
       # Detect the bounce reason from certain remote hosts
       # @param    [Sisimai::Data] argvs   Parsed email object
+      # @param    [String]        proxy   The alternative of the "rhost"
       # @return   [String]                The value of bounce reason
-      def get(argvs)
-        remotehost = argvs.rhost.downcase
+      def get(argvs, proxy = nil)
+        remotehost = proxy || argvs.rhost.downcase
         rhostclass = ''
         modulename = ''