sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/barracuda.rb

@@ -0,0 +1,94 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Barracuda parses a bounce email which created by Barracuda.
+  # Methods in the module are called from only Sisimai::Message.
+  module Barracuda
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Barracuda.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      StartingOf = { message: ['Your message to:'] }.freeze
+
+      # Parse bounce messages from Barracuda
+      # @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
+      # @since v4.25.6
+      def make(mhead, mbody)
+        # Subject: **Message you sent blocked by our bulk email filter**
+        return nil unless mhead['subject'].to_s.end_with?('our bulk email filter**')
+
+        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")
+        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.
+          if readcursor == 0
+            # Beginning of the bounce message or message/delivery-status part
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
+
+            if o[-1] == 'addr'
+              # Final-Recipient: rfc822; kijitora@example.jp
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              if o[0] == 'final-recipient'
+                # Final-Recipient: rfc822; 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'] = o[2]
+                recipients += 1
+              else
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
+              end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
+            else
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          # Set default values if each value is empty.
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Barracuda: https://www.barracuda.com'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/bigfoot.rb

@@ -7,24 +7,14 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Content-Type: message/partial'] }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/partial|.freeze
       MarkingsOf = { message: %r/\A[ \t]+[-]+[ \t]*Transcript of session follows/ }.freeze
 
-      def description; return 'Bigfoot: http://www.bigfoot.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Bigfoot
-      # @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)
         # :subject  => %r/\AReturned mail: /,
         match  = 0
@@ -37,105 +27,82 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        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")
+        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 '>>>'
         esmtpreply = ''     # (String) Reply from remote server on SMTP session
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        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
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            if f = Sisimai::RFC1894.match(e)
-              # "e" matched with any field defined in RFC3464
-              next unless o = Sisimai::RFC1894.field(e)
-              v = dscontents[-1]
-
-              if o[-1] == 'addr'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
+
+            if o[-1] == 'addr'
+              # Final-Recipient: rfc822; kijitora@example.jp
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              if o[0] == 'final-recipient'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                if o[0] == 'final-recipient'
-                  # Final-Recipient: rfc822; 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'] = o[2]
-                  recipients += 1
-                else
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  v['alias'] = o[2]
+                if v['recipient']
+                  # There are multiple recipient addresses in the message body.
+                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                  v = dscontents[-1]
                 end
-              elsif o[-1] == 'code'
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = o[1]
-                v['diagnosis'] = o[2]
+                v['recipient'] = o[2]
+                recipients += 1
               else
-                # Other DSN fields defined in RFC3464
-                next unless fieldtable.key?(o[0])
-                v[fieldtable[o[0]]] = o[2]
-
-                next unless f == 1
-                permessage[fieldtable[o[0]]] = o[2]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
               end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
             else
-              # The line does not begin with a DSN field defined in RFC3464
-              unless e.start_with?(' ')
-                #    ----- Transcript of session follows -----
-                # >>> RCPT TO:<destinaion@example.net>
-                # <<< 553 Invalid recipient destinaion@example.net (Mode: normal)
-                if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
-                  # >>> DATA
-                  commandtxt = cv[1]
-                elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
-                  # <<< Response
-                  esmtpreply = cv[1]
-                end
-              else
-                # Continued line of the value of Diagnostic-Code field
-                next unless p.start_with?('Diagnostic-Code:')
-                next unless cv = e.match(/\A[ \t]+(.+)\z/)
-                v['diagnosis'] << ' ' << cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' << e
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
+            end
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            unless e.start_with?(' ')
+              #    ----- Transcript of session follows -----
+              # >>> RCPT TO:<destinaion@example.net>
+              # <<< 553 Invalid recipient destinaion@example.net (Mode: normal)
+              if cv = e.match(/\A[>]{3}[ ]+([A-Z]{4})[ ]?/)
+                # >>> DATA
+                commandtxt = cv[1]
+              elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+                # <<< Response
+                esmtpreply = cv[1]
               end
+            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]
+              readslices[-1] = 'Diagnostic-Code: ' << e
             end
-          end # End of message/delivery-status
+          end
         end
         return nil unless recipients > 0
 
@@ -143,8 +110,6 @@ module Sisimai::Lhost
           # Set default values if each value is empty.
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['command']   = commandtxt
           if e['command'].empty?
@@ -152,10 +117,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Bigfoot: http://www.bigfoot.com'; end
     end
   end
 end

data/lib/sisimai/lhost/biglobe.rb

@@ -7,113 +7,81 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = {
         message: ['   ----- The following addresses had delivery problems -----'],
         error:   ['   ----- Non-delivered information -----'],
-        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
       MessagesOf = {
         'filtered'    => ['Mail Delivery Failed... User unknown'],
         'mailboxfull' => ["The number of messages in recipient's mailbox exceeded the local limit."],
       }.freeze
 
-      def description; return 'BIGLOBE: https://www.biglobe.ne.jp'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Biglobe
-      # @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['from'] =~ /postmaster[@](?:biglobe|inacatv|tmtv|ttv)[.]ne[.]jp/
         return nil unless mhead['subject'].start_with?('Returned mail:')
 
         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 == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == 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 e.empty?
+          # This is a MIME-encapsulated message.
+          #
+          # ----_Biglobe000000/00000.biglobe.ne.jp
+          # Content-Type: text/plain; charset="iso-2022-jp"
+          #
+          #    ----- The following addresses had delivery problems -----
+          # ********@***.biglobe.ne.jp
+          #
+          #    ----- Non-delivered information -----
+          # The number of messages in recipient's mailbox exceeded the local limit.
+          #
+          # ----_Biglobe000000/00000.biglobe.ne.jp
+          # Content-Type: message/rfc822
+          #
+          v = dscontents[-1]
 
-            # This is a MIME-encapsulated message.
-            #
-            # ----_Biglobe000000/00000.biglobe.ne.jp
-            # Content-Type: text/plain; charset="iso-2022-jp"
-            #
+          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
             #    ----- The following addresses had delivery problems -----
             # ********@***.biglobe.ne.jp
-            #
-            #    ----- Non-delivered information -----
-            # The number of messages in recipient's mailbox exceeded the local limit.
-            #
-            # ----_Biglobe000000/00000.biglobe.ne.jp
-            # Content-Type: message/rfc822
-            #
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
-              #    ----- The following addresses had delivery problems -----
-              # ********@***.biglobe.ne.jp
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-
-              r = Sisimai::Address.s3s4(cv[1])
-              next unless Sisimai::RFC5322.is_emailaddress(r)
-              v['recipient'] = r
-              recipients += 1
-            else
-              next if e =~ /\A[^\w]/
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' '
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+
+            r = Sisimai::Address.s3s4(cv[1])
+            next unless Sisimai::RFC5322.is_emailaddress(r)
+            v['recipient'] = r
+            recipients += 1
+          else
+            next if e =~ /\A[^\w]/
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' '
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           MessagesOf.each_key do |r|
@@ -124,10 +92,9 @@ module Sisimai::Lhost
           end
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'BIGLOBE: https://www.biglobe.ne.jp'; end
     end
   end
 end