sisimai 4.25.5-java → 4.25.11-java

data/lib/sisimai/lhost/aol.rb

@@ -14,35 +14,22 @@ module Sisimai::Lhost
         'notaccept'   => ['type=MX: Malformed or unexpected name server reply'],
       }.freeze
 
-      def description; return 'Aol Mail: https://www.aol.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-AOL-IP: 192.0.2.135
-      # X-AOL-VSS-INFO: 5600.1067/98281
-      # X-AOL-VSS-CODE: clean
-      # x-aol-sid: 3039ac1afc14546fb98a0945
-      # X-AOL-SCOLL-EIL: 1
-      # x-aol-global-disposition: G
-      # x-aol-sid: 3039ac1afd4d546fb97d75c6
-      # X-BounceIO-Id: 9D38DE46-21BC-4309-83E1-5F0D788EFF1F.1_0
-      # X-Outbound-Mail-Relay-Queue-ID: 07391702BF4DC
-      # X-Outbound-Mail-Relay-Sender: rfc822; shironeko@aol.example.jp
-      def headerlist;  return %w[x-aol-ip]; end
-
       # Parse bounce messages from Aol Mail
-      # @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)
-        # :from    => %r/\APostmaster [<]Postmaster[@]AOL[.]com[>]\z/,
-        # :subject => %r/\AUndeliverable: /,
+        # X-AOL-IP: 192.0.2.135
+        # X-AOL-VSS-INFO: 5600.1067/98281
+        # X-AOL-VSS-CODE: clean
+        # x-aol-sid: 3039ac1afc14546fb98a0945
+        # X-AOL-SCOLL-EIL: 1
+        # x-aol-global-disposition: G
+        # x-aol-sid: 3039ac1afd4d546fb97d75c6
+        # X-BounceIO-Id: 9D38DE46-21BC-4309-83E1-5F0D788EFF1F.1_0
+        # X-Outbound-Mail-Relay-Queue-ID: 07391702BF4DC
+        # X-Outbound-Mail-Relay-Sender: rfc822; shironeko@aol.example.jp
         return nil unless mhead['x-aol-ip']
 
         require 'sisimai/rfc1894'
@@ -117,8 +104,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'].tr("\n", ' '))
 
           MessagesOf.each_key do |r|
@@ -136,6 +121,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
+      def description; return 'Aol Mail: https://www.aol.com'; end
     end
   end
 end

data/lib/sisimai/lhost/apachejames.rb

@@ -16,21 +16,11 @@ module Sisimai::Lhost
         error:   ['Error message below:'],
       }.freeze
 
-      def description; return 'Java Apache Mail Enterprise Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Apache James
-      # @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
         match += 1 if mhead['subject'] == '[BOUNCE]'
@@ -120,15 +110,10 @@ module Sisimai::Lhost
         # message in the bounce mail.
         emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Java Apache Mail Enterprise Server'; end
     end
   end
 end

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

@@ -10,21 +10,11 @@ module Sisimai::Lhost
       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
@@ -120,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?
@@ -131,7 +119,7 @@ module Sisimai::Lhost
 
         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

@@ -17,21 +17,11 @@ module Sisimai::Lhost
         '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:')
@@ -92,7 +82,6 @@ module Sisimai::Lhost
         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|
@@ -105,7 +94,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'BIGLOBE: https://www.biglobe.ne.jp'; end
     end
   end
 end

data/lib/sisimai/lhost/courier.rb

@@ -24,21 +24,11 @@ module Sisimai::Lhost
         'networkerror' => ['DNS lookup failed.'],
       }.freeze
 
-      def description; return 'Courier MTA'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Courier MTA
-      # @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
         match += 1 if mhead['from'].include?('Courier mail server at ')
@@ -136,6 +126,7 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+          e['command'] ||= commandtxt || ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           MessagesOf.each_key do |r|
@@ -144,15 +135,11 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-
-          e['agent']     = self.smtpagent
-          e['command'] ||= commandtxt || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Courier MTA'; end
     end
   end
 end

data/lib/sisimai/lhost/domino.rb

@@ -7,35 +7,30 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/delivery-status|.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
         'userunknown' => [
           'not listed in Domino Directory',
           'not listed in public Name & Address Book',
+          "dans l'annuaire Domino", # TODO: "non répertorié dans l'annuaire Domino",
           'Domino ディレクトリには見つかりません',
         ],
         'filtered' => ['Cannot route mail to user'],
         'systemerror' => ['Several matches found in Domino Directory'],
       }.freeze
 
-      def description; return 'IBM Domino Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from IBM Domino Server
-      # @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?('DELIVERY FAILURE:')
+        return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
+
+        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)
@@ -97,24 +92,42 @@ module Sisimai::Lhost
             elsif cv = e.match(/\A[ ][ ]Subject: (.+)\z/)
               #   Subject: Nyaa
               subjecttxt = cv[1]
+
+            elsif f = Sisimai::RFC1894.match(e)
+              # There are some fields defined in RFC3464, try to match 
+              o = Sisimai::RFC1894.field(e) || next
+              next if o[-1] == 'addr'
+
+              if o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec']      = o[1] if v['spec'].to_s.empty?
+                v['diagnosis'] = o[2] if v['diagnosis'].to_s.empty?
+              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
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
+          e['lhost']   ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            e['status'] = Sisimai::SMTP::Status.code(r.to_s, false) || ''
+            e['reason']   = r
+            e['status'] ||= Sisimai::SMTP::Status.code(r.to_s, false) || ''
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         # Set the value of subjecttxt as a Subject if there is no original
@@ -123,7 +136,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'IBM Domino Server'; end
     end
   end
 end

data/lib/sisimai/lhost/einsundeins.rb

@@ -14,21 +14,11 @@ module Sisimai::Lhost
       }.freeze
       MessagesOf = { 'mesgtoobig' => ['Mail size limit exceeded'] }.freeze
 
-      def description; return '1&1: https://www.1und1.de'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from 1&1
-      # @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'].start_with?('"Mail Delivery System"')
         return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
@@ -62,7 +52,7 @@ module Sisimai::Lhost
           # http://postmaster.1and1.com/en/error-messages?ip=%1s
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
+          if cv = e.match(/\A([^ ]+[@][^ ]+?)[:]?\z/)
             # general@example.eu
             if v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -91,7 +81,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']       = self.smtpagent
           e['diagnosis'] ||= ''
           e['diagnosis']   = e['alterrors'] if e['diagnosis'].empty?
 
@@ -119,7 +108,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '1&1: https://www.1und1.de'; end
     end
   end
 end