sisimai 4.25.5 → 4.25.6

data/lib/sisimai/lhost/interscanmss.rb

@@ -6,23 +6,13 @@ module Sisimai::Lhost
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
       require 'sisimai/lhost'
-
       ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
-      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
 
       # Parse bounce messages from InterScanMSS
-      # @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)
         # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
         match = 0
@@ -32,6 +22,7 @@ module Sisimai::Lhost
           'メール配信に失敗しました',
         ]
         match += 1 if mhead['from'].start_with?('"InterScan MSS"')
+        match += 1 if mhead['from'].start_with?('"InterScan Notification"')
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
         return nil unless match > 0
 
@@ -46,20 +37,20 @@ module Sisimai::Lhost
           # to the previous line of the beginning of the original message.
           next if e.empty?
 
-          # Sent <<< RCPT TO:<kijitora@example.co.jp>
-          # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
           v = dscontents[-1]
-
           if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
+                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)   ||
+                  e.match(/\A(?:Reason:[ ]+)?Unable[ ]to[ ]deliver[ ]message[ ]to[ ][<](.+)[>]/)
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            # Unable to deliver message to <kijitora@neko.example.jp>
             if v['recipient'] && cv[1] != 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'] = e if e =~ /Unable[ ]to[ ]deliver[ ]/
             recipients = dscontents.size
           end
 
@@ -85,14 +76,12 @@ module Sisimai::Lhost
         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] ||= '' }
+          e['reason'] = 'userunknown' if e['diagnosis'] =~ /Unable[ ]to[ ]deliver/
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
     end
   end
 end

data/lib/sisimai/lhost/kddi.rb

@@ -21,21 +21,11 @@ module Sisimai::Lhost
         'hostunknown' => ['As the remote domain doesnt exist'],
       }.freeze
 
-      def description; return 'au by KDDI: https://www.au.kddi.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from au by KDDI
-      # @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)
         # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
@@ -90,7 +80,6 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
@@ -117,7 +106,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end
   end
 end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -13,21 +13,11 @@ module Sisimai::Lhost
         error:   ['Delivery failed for the following reason:'],
       }.freeze
 
-      def description; return 'MailFoundry'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MailFoundry
-      # @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'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
@@ -84,15 +74,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 'MailFoundry'; end
     end
   end
 end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -15,21 +15,11 @@ module Sisimai::Lhost
         rcpts:   ['The following recipients were affected:'],
       }.freeze
 
-      def description; return 'Trustwave Secure Email Gateway'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return ['X-Mailer']; end
-
       # Parse bounce messages from MailMarshalSMTP
-      # @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?('Undeliverable Mail: "')
 
@@ -127,15 +117,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 'Trustwave Secure Email Gateway'; end
     end
   end
 end

data/lib/sisimai/lhost/mailru.rb

@@ -45,21 +45,11 @@ module Sisimai::Lhost
         'contenterror' => ['Too many "Received" headers'],
       }.freeze
 
-      def description; return '@mail.ru: https://mail.ru'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-failed-recipients]; end
-
       # Parse bounce messages from @mail.ru
-      # @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'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
         return nil unless mhead['message-id'].end_with?('.mail.ru>', 'smailru.net>')
@@ -216,12 +206,11 @@ module Sisimai::Lhost
             end
           end
           e['command'] ||= ''
-          e['agent']     = self.smtpagent
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return '@mail.ru: https://mail.ru'; end
     end
   end
 end

data/lib/sisimai/lhost/mcafee.rb

@@ -19,22 +19,13 @@ module Sisimai::Lhost
         }x,
       }.freeze
 
-      def description; return 'McAfee Email Appliance'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-nai-header]; end
-
       # Parse bounce messages from McAfee Email Appliance
-      # @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)
+        # X-NAI-Header: Modified by McAfee Email and Web Security Virtual Appliance
         return nil unless mhead['x-nai-header']
         return nil unless mhead['x-nai-header'].start_with?('Modified by McAfee ')
         return nil unless mhead['subject'] == 'Delivery Status'
@@ -110,21 +101,18 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-
           ReFailures.each_key do |r|
             # Verify each regular expression of session errors
             next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'McAfee Email Appliance'; end
     end
   end
 end

data/lib/sisimai/lhost/messagelabs.rb

@@ -15,28 +15,17 @@ module Sisimai::Lhost
         'securityerror' => %r/Please turn on SMTP Authentication in your mail client/,
       }.freeze
 
-      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-
-      # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
-      # X-Originating-IP: [10.245.230.38]
-      # X-StarScan-Received:
-      # X-StarScan-Version: 6.12.5; banners=-,-,-
-      # X-VirusChecked: Checked
-      def headerlist;  return %w[x-msg-ref]; end
-
       # Parse bounce messages from Symantec.cloud(MessageLabs)
-      # @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)
+        # X-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
+        # X-Originating-IP: [10.245.230.38]
+        # X-StarScan-Received:
+        # X-StarScan-Version: 6.12.5; banners=-,-,-
+        # X-VirusChecked: Checked
         return nil unless mhead['x-msg-ref']
         return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
         return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
@@ -115,7 +104,6 @@ module Sisimai::Lhost
           e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['command']   = commandset.shift || ''
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           ReFailures.each_key do |r|
@@ -128,7 +116,7 @@ module Sisimai::Lhost
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Symantec.cloud http://www.messagelabs.com'; end
     end
   end
 end

data/lib/sisimai/lhost/messagingserver.rb

@@ -12,21 +12,11 @@ module Sisimai::Lhost
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
-      def description; return 'Oracle Communications Messaging Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from MessagingServer
-      # @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)
         # :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
         match  = 0
@@ -144,21 +134,18 @@ 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|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Oracle Communications Messaging Server'; end
     end
   end
 end

data/lib/sisimai/lhost/mfilter.rb

@@ -15,23 +15,13 @@ module Sisimai::Lhost
       }.freeze
       MarkingsOf = { message: %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/ }.freeze
 
-      def description; return 'Digital Arts m-FILTER'; end
-      def smtpagent;   return 'Email::mFILTER'; end
-      def headerlist;  return %w[x-mailer]; end
-
       # Parse bounce messages from Digital Arts m-FILTER
-      # @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 [<]MAILER-DAEMON[@]/,
+        # X-Mailer: m-FILTER
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
         return nil unless mhead['subject'] == 'failure notice'
 
@@ -106,9 +96,8 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e.each_key { |a| e[a] ||= '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['agent']     = self.smtpagent
+          e['agent'] = 'mFILTER'
 
           # Get localhost and remote host name from Received header.
           next if mhead['received'].empty?
@@ -122,10 +111,9 @@ module Sisimai::Lhost
             e['rhost'] = ee
           end
         end
-
         return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Digital Arts m-FILTER'; end
     end
   end
 end