sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/bite/email/mcafee.rb

@@ -6,29 +6,18 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/McAfee.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'x-nai'   => %r/Modified by McAfee /,
-        :'subject' => %r/\ADelivery Status\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/[-]+ The following addresses had delivery problems [-]+\z/,
-        :error   => %r|\AContent-Type: [^ ]+/[^ ]+; name="deliveryproblems[.]txt"|,
-        :rfc822  => %r|\AContent-Type: message/rfc822\z|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['--- The following addresses had delivery problems ---'],
+        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      ReFailure = {
-        userunknown: %r{(?:
-           User[ ][(].+[@].+[)][ ]unknown[.]
-          |550[ ]Unknown[ ]user[ ][^ ]+[@][^ ]+
-          )
-        }x,
+      ReFailures = {
+        userunknown: %r/(?:User [(].+[@].+[)] unknown[.]|550 Unknown user [^ ]+[@][^ ]+)/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'McAfee Email Appliance'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-NAI-Header']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from McAfee Email Appliance
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -45,8 +34,8 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
         return nil unless mhead['x-nai-header']
-        return nil unless mhead['x-nai-header'] =~ Re0[:'x-nai']
-        return nil unless mhead['subject']      =~ Re0[:'subject']
+        return nil unless mhead['x-nai-header'].include?('Modified by McAfee ')
+        return nil unless mhead['subject'] == 'Delivery Status'
 
         require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -59,14 +48,14 @@ module Sisimai::Bite::Email
         diagnostic = ''     # (String) Alternative diagnostic message
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.include?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -74,7 +63,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -88,7 +77,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -116,43 +104,41 @@ module Sisimai::Bite::Email
               diagnostic = cv[2]
               recipients += 1
 
-            elsif cv = e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*([^ ]+)\z/)
+            elsif cv = e.match(/\AOriginal-Recipient:[ ]*([^ ]+)\z/)
               # Original-Recipient: <kijitora@example.co.jp>
               v['alias'] = Sisimai::Address.s3s4(cv[1])
 
-            elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
               # Action: failed
               v['action'] = cv[1].downcase
 
-            elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(.+)\z/)
+            elsif cv = e.match(/\ARemote-MTA:[ ]*(.+)\z/)
               # Remote-MTA: 192.0.2.192
               v['rhost'] = cv[1].downcase
-
             else
-              if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+              if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                 v['spec'] = cv[1].upcase
                 v['diagnosis'] = cv[2]
 
-              elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] ||= ' '
-                v['diagnosis']  += ' ' + cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' + e
+                v['diagnosis'] << ' ' << cv[1]
+                havepassed[-1] = 'Diagnostic-Code: ' << e
               end
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/email/messagelabs.rb

@@ -7,25 +7,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MessageLabs.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/MAILER-DAEMON[@]messagelabs[.]com/,
-        :subject => %r/\AMail Delivery Failure/,
-      }.freeze
-      Re1 = {
-        :begin   => %r|\AContent-Type: message/delivery-status|,
-        :error   => %r/\AReason:[ \t]*(.+)\z/,
-        :rfc822  => %r|\AContent-Type: text/rfc822-headers\z|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Content-Type: message/delivery-status'],
+        rfc822:  ['Content-Type: text/rfc822-headers'],
       }.freeze
-      ReFailure = {
-        userunknown: %r{(?:
-           542[ ].+[ ]Rejected
-          |No[ ]such[ ]user
-          )
-        }x,
+      ReFailures = {
+        userunknown:   %r/(?:542 .+ Rejected|No such user)/,
         securityerror: %r/Please turn on SMTP Authentication in your mail client/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Symantec.cloud http://www.messagelabs.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -36,7 +26,6 @@ module Sisimai::Bite::Email
       # X-StarScan-Version: 6.12.5; banners=-,-,-
       # X-VirusChecked: Checked
       def headerlist;  return ['X-Msg-Ref']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Symantec.cloud(MessageLabs)
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -53,8 +42,8 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
         return nil unless mhead['x-msg-ref']
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
+        return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -71,14 +60,14 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -86,7 +75,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -100,7 +89,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -140,7 +128,7 @@ module Sisimai::Bite::Email
               # Final-Recipient: rfc822; maria@dest.example.net
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: rfc822; maria@dest.example.net
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -150,38 +138,35 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status: 5.0.0
                 v['status'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: smtp; 550 maria@dest.example.net... No such user
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # Reporting-MTA: dns; server-15.bemta-3.messagelabs.com
               # Arrival-Date: Tue, 23 Dec 2014 20:39:34 +0000
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; server-15.bemta-3.messagelabs.com
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Tue, 23 Dec 2014 20:39:34 +0000
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
@@ -191,8 +176,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -200,9 +185,9 @@ module Sisimai::Bite::Email
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/email/messagingserver.rb

@@ -8,25 +8,14 @@ module Sisimai::Bite::Email
       require 'sisimai/bite'
       require 'sisimai/rfc5322'
 
-      Re0 = {
-        :subject  => %r/\ADelivery Notification: /,
-        :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
-        :boundary => %r/Boundary_[(]ID_.+[)]/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis report relates to a message you sent with the following header fields:/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-        :rfc822 => %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)!x,
-      }.freeze
-      ReFailure = {
-        hostunknown: %r|Illegal[ ]host/domain[ ]name[ ]found|x,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
+      MarkingsOf = { rfc822: %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)! }.freeze
+      ReFailures = { hostunknown: %r|Illegal host/domain name found| }.freeze
 
       def description; return 'Oracle Communications Messaging Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from MessagingServer
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -43,9 +32,10 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        # :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
         match  = 0
-        match += 1 if mhead['content-type'] =~ Re0[:boundary]
-        match += 1 if mhead['subject']      =~ Re0[:subject]
+        match += 1 if mhead['content-type'].include?('Boundary_(ID_')
+        match += 1 if mhead['subject'].start_with?('Delivery Notification: ')
         return nil if match.zero?
 
         require 'sisimai/address'
@@ -57,10 +47,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -68,7 +58,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -82,7 +72,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -148,7 +137,6 @@ module Sisimai::Bite::Email
                 v['lhost'] = cv[1]
                 v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
               end
-
             else
               # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
@@ -162,16 +150,16 @@ module Sisimai::Bite::Email
               #  (6jo.example.jp ESMTP SENDMAIL-VM)
               # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
               #
-              if cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
+              if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
                 # Status: 5.1.1 (Remote SMTP server has rejected address)
                 v['status'] = cv[1]
                 v['diagnosis'] ||= cv[2]
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
                 v['date'] ||= cv[1]
 
-              elsif cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
                 localhost = cv[1]
                 v['lhost'] ||= localhost
@@ -181,15 +169,15 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/email/mfilter.rb

@@ -7,24 +7,17 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/mFILTER.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'     => %r/\AMailer Daemon [<]MAILER-DAEMON[@]/,
-        :'subject'  => %r/\Afailure notice\z/,
-        :'x-mailer' => %r/\Am-FILTER\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/,
-        :error   => %r/\A-------server message\z/,
-        :command => %r/\A-------SMTP command\z/,
-        :rfc822  => %r/\A-------original (?:message|mail info)\z/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        error:   ['-------server message'],
+        command: ['-------SMTP command'],
+        rfc822:  ['-------original message', '--------original mail info'],
+      }.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 ['X-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Digital Arts m-FILTER
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -40,9 +33,10 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['x-mailer']
-        return nil unless mhead['x-mailer'] =~ Re0[:'x-mailer']
-        return nil unless mhead['subject']  =~ Re0[:'subject']
+
+        # :'from'     => %r/\AMailer Daemon [<]MAILER-DAEMON[@]/,
+        return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
+        return nil unless mhead['subject'] == 'failure notice'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -53,15 +47,15 @@ module Sisimai::Bite::Email
         markingset = { 'diagnosis' => false, 'command' => false }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e =~ Re1[:begin]
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -75,7 +69,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -114,20 +107,18 @@ module Sisimai::Bite::Email
               # DATA
               next if v['command']
               v['command'] = e if markingset['command']
-
             else
               # Get error message and SMTP command
-              if e =~ Re1[:error]
+              if e == StartingOf[:error][0]
                 # -------server message
                 markingset['diagnosis'] = true
 
-              elsif e =~ Re1[:command]
+              elsif e == StartingOf[:command][0]
                 # -------SMTP command
                 markingset['command'] = true
-
               else
                 # 550 5.1.1 unknown user <kijitora@example.jp>
-                next if e =~ /\A[-]+/
+                next if e.start_with?('-')
                 next if v['diagnosis']
                 v['diagnosis'] = e
               end
@@ -135,8 +126,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           if mhead['received'].size > 0
             # Get localhost and remote host name from Received header.
@@ -144,9 +135,9 @@ module Sisimai::Bite::Email
             rhosts = Sisimai::RFC5322.received(rheads[-1])
 
             e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
-            rhosts.each do |ee|
+            while ee = rhosts.shift do
               # Avoid "... by m-FILTER"
-              next unless ee =~ /[.]/
+              next unless ee.include?('.')
               e['rhost'] = ee
             end
           end