sisimai 4.25.5 → 4.25.6

data/lib/sisimai/lhost/qmail.rb

@@ -99,21 +99,11 @@ module Sisimai::Lhost
         ],
       }.freeze
 
-      def description; return 'qmail'; end
-      def smtpagent;   return 'Email::qmail'; end
-      def headerlist;  return []; end
-
       # Parse bounce messages from qmail
-      # @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)
         # Pre process email headers and the body part of the message which generated
         # by qmail, see https://cr.yp.to/qmail.html
@@ -174,7 +164,7 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
+          e['agent']     = 'qmail'
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           unless e['command']
@@ -238,12 +228,11 @@ module Sisimai::Lhost
           end
 
           e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'qmail'; end
     end
   end
 end

data/lib/sisimai/lhost/receivingses.rb

@@ -19,27 +19,14 @@ module Sisimai::Lhost
         'contenterror' => ['Message content rejected'],
       }.freeze
 
-      def description; return 'Amazon SES(Receiving): https://aws.amazon.com/ses/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-SES-Outgoing: 2015.10.01-54.240.27.7
-      # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
-      def headerlist;  return %w[x-ses-outgoing]; end
-
       # Parse bounce messages from Amazon SES/Receiving
-      # @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/\ADelivery Status Notification [(]Failure[)]\z/,
-        # :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
+        # X-SES-Outgoing: 2015.10.01-54.240.27.7
+        # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
         return nil unless mhead['x-ses-outgoing']
 
         require 'sisimai/rfc1894'
@@ -133,14 +120,12 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-
           e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
-          e['agent']    = self.smtpagent
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Amazon SES(Receiving): https://aws.amazon.com/ses/'; end
     end
   end
 end

data/lib/sisimai/lhost/sendgrid.rb

@@ -10,26 +10,14 @@ module Sisimai::Lhost
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['This is an automatically generated message from SendGrid.'] }.freeze
 
-      def description; return 'SendGrid: https://sendgrid.com/'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # Return-Path: <apps@sendgrid.net>
-      # X-Mailer: MIME-tools 5.502 (Entity 5.502)
-      def headerlist;  return %w[return-path x-mailer]; end
-
       # Parse bounce messages from SendGrid
-      # @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/\AMAILER-DAEMON\z/,
+        # Return-Path: <apps@sendgrid.net>
+        # X-Mailer: MIME-tools 5.502 (Entity 5.502)
         return nil unless mhead['return-path']
         return nil unless mhead['return-path'] == '<apps@sendgrid.net>'
         return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
@@ -150,13 +138,12 @@ module Sisimai::Lhost
           end
 
           e['lhost'] ||= permessage['rhost']
-          e['agent']   = self.smtpagent
           e['command'] = commandtxt
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'SendGrid: https://sendgrid.com/'; end
     end
   end
 end

data/lib/sisimai/lhost/sendmail.rb

@@ -21,28 +21,14 @@ module Sisimai::Lhost
         error:   ['... while talking to '],
       }.freeze
 
-      def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Sendmail
-      # @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'] =~ /(?:see transcript for details\z|\AWarning: )/
-        unless mhead['subject'].downcase =~ /\A[ \t]*fwd?:/
-          # Fwd: Returned mail: see transcript for details
-          # Do not execute this code if the bounce mail is a forwarded message.
-          return nil unless mhead['from'].start_with?('Mail Delivery Subsystem')
-        end
+        return nil if mhead['x-aol-ip']
 
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
@@ -178,7 +164,6 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
-          e['agent']     = self.smtpagent
           e['command'] ||= commandtxt
           if e['command'].empty?
             e['command'] = 'EHLO' unless esmtpreply.empty?
@@ -212,12 +197,11 @@ module Sisimai::Lhost
               e['recipient'] = cv[1]
             end
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
     end
   end
 end

data/lib/sisimai/lhost/surfcontrol.rb

@@ -11,26 +11,15 @@ module Sisimai::Lhost
       ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       StartingOf = { message: ['Your message could not be sent.'] }.freeze
 
-      def description; return 'WebSense SurfControl'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      # 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
-      def headerlist;  return %w[x-sef-processed x-mailer]; end
-
       # Parse bounce messages from SurfControl
-      # @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/ [(]Mail Delivery System[)]\z/,
+        # 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
         return nil unless mhead['x-sef-processed']
         return nil unless mhead['x-mailer']
         return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
@@ -106,15 +95,10 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'WebSense SurfControl'; end
     end
   end
 end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -30,21 +30,11 @@ module Sisimai::Lhost
         error:   %r/\A[.]+ while talking to .+[:]\z/,
       }.freeze
 
-      def description; return 'Sendmail version 5'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Sendmail version 5
-      # @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/\AMail Delivery Subsystem/,
         return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
@@ -131,9 +121,7 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           errorindex += 1
-          e['agent']   = self.smtpagent
           e['command'] = commandset[errorindex] || ''
-
           e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
                                # Copy alternative error message
                                anotherset['diagnosis']
@@ -151,12 +139,11 @@ module Sisimai::Lhost
             end
           end
           e.delete('sessionerr')
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Sendmail version 5'; end
     end
   end
 end

data/lib/sisimai/lhost/verizon.rb

@@ -8,21 +8,11 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
       Indicators = Sisimai::Lhost.INDICATORS
 
-      def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Verizon
-      # @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 = -1
         while true
@@ -156,9 +146,7 @@ module Sisimai::Lhost
         emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
           messagesof.each_key do |r|
             # Verify each regular expression of session errors
             next unless messagesof[r].any? { |a| e['diagnosis'].include?(a) }
@@ -169,7 +157,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
     end
   end
 end

data/lib/sisimai/lhost/x1.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown
-  # MTA #1. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1.
+  # Methods in the module are called from only Sisimai::Message.
   module X1
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X1.pm
@@ -10,21 +10,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
       MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
 
-      def description; return 'Unknown MTA #1'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #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['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
@@ -75,15 +65,13 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['date']      = datestring || ''
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #1'; end
     end
   end
 end

data/lib/sisimai/lhost/x2.rb

@@ -1,6 +1,6 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown
-  # MTA #2. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2.
+  # Methods in the module are called from only Sisimai::Message.
   module X2
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/X2.pm
@@ -10,21 +10,11 @@ module Sisimai::Lhost
       ReBackbone = %r|^--- Original message follows[.]|.freeze
       StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
 
-      def description; return 'Unknown MTA #2'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from Unknown MTA #2
-      # @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'].include?('MAILER-DAEMON@')
         return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
@@ -71,15 +61,10 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
-        end
-
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Unknown MTA #2'; end
     end
   end
 end