sisimai 4.22.3-java → 4.22.4-java

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

@@ -8,29 +8,18 @@ module Sisimai::Bite::Email
       # Based on Sisimai::Bite::Email::Exim
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'      => %r/\AMail Delivery System/,
-        :'subject'   => %r{(?:
-             Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-            |Warning:[ ]message[ ].+[ ]delayed[ ]+
-            |Delivery[ ]Status[ ]Notification
-            )
-        }x,
-        :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
-      }.freeze
-      Re1 = {
-        :rfc822 => %r/\AIncluded is a copy of the message header:\z/,
-        :begin  => %r/\AThis message was created automatically by mail delivery software[.]\z/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by mail delivery software.'],
+        rfc822:  ['Included is a copy of the message header:'],
       }.freeze
-      ReCommand = [
+
+      ReCommands = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
       ].freeze
-      ReFailure = {
-        userunknown: %r{
-            user[ ]not[ ]found
-        }x,
+      ReFailures = {
+        userunknown: %r/user not found/,
         hostunknown: %r{(?>
              all[ ](?:
                  host[ ]address[ ]lookups[ ]failed[ ]permanently
@@ -39,12 +28,8 @@ module Sisimai::Bite::Email
             |Unrouteable[ ]address
             )
         }x,
-        mailboxfull: %r{(?:
-             mailbox[ ]is[ ]full:?
-            |error:[ ]quota[ ]exceed
-            )
-        }x,
-        notaccept: %r{(?:
+        mailboxfull: %r/(?:mailbox is full:?|error: quota exceed)/,
+        notaccept:   %r{(?:
              an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
             |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
             )
@@ -55,11 +40,9 @@ module Sisimai::Bite::Email
             |LMTP[ ]error[ ]after[ ]
             )
         }x,
-        contenterror: %r{
-            Too[ ]many[ ]["]Received["][ ]headers
-        }x,
+        contenterror: %r/Too many ["]Received["] headers/,
       }.freeze
-      ReDelayed = %r{(?:
+      ReDelaying = %r{(?:
          retry[ ]timeout[ ]exceeded
         |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
         |retry[ ]time[ ]not[ ]reached[ ]for[ ]any[ ]host[ ]after[ ]a[ ]long[ ]failure[ ]period
@@ -68,7 +51,6 @@ module Sisimai::Bite::Email
         |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival[ ]by[ ])
         )
       }x
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'McAfee SaaS'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -76,7 +58,6 @@ module Sisimai::Bite::Email
       # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
       # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
       def headerlist;  return ['X-MXL-NoteHash', 'X-MXL-Hash', 'X-MX-Bounce']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from MXLogic
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -93,12 +74,18 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        # :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
         match  = 0
         match += 1 if mhead['x-mx-bounce']
         match += 1 if mhead['x-mxl-hash']
         match += 1 if mhead['x-mxl-notehash']
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['from']    =~ Re0[:from]
+        match += 1 if mhead['from'].start_with?('Mail Delivery System')
+        match += 1 if mhead['subject'] =~ %r{(?:
+             Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
+            |Warning:[ ]message[ ].+[ ]delayed[ ]+
+            |Delivery[ ]Status[ ]Notification
+            )
+        }x
         return nil if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -110,10 +97,10 @@ module Sisimai::Bite::Email
         localhost0 = ''     # (String) Local MTA
         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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -121,7 +108,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
@@ -135,7 +122,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -168,8 +154,7 @@ module Sisimai::Bite::Email
             elsif dscontents.size == recipients
               # Error message
               next if e.empty?
-              v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' '
+              v['diagnosis'] << e + ' '
             end
           end
         end
@@ -199,16 +184,14 @@ module Sisimai::Bite::Email
             end
 
             unless e['rhost']
-              if mhead['received'].size > 0
-                # Get localhost and remote host name from Received header.
-                e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop
-              end
+              # Get localhost and remote host name from Received header.
+              e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop if mhead['received'].size > 0
             end
           end
 
           unless e['command']
             # Get the SMTP command name for the session
-            ReCommand.each do |r|
+            ReCommands.each do |r|
               # Verify each regular expression of SMTP commands
               if cv = e['diagnosis'].match(r)
                 e['command'] = cv[1].upcase
@@ -221,22 +204,21 @@ module Sisimai::Bite::Email
               # MAIL | Connected to 192.0.2.135 but sender was rejected.
               e['reason'] = 'rejected'
 
-            elsif e['command'] =~ /\A(?:HELO|EHLO)\z/
+            elsif %w[HELO EHLO].index(e['command'])
               # HELO | Connected to 192.0.2.135 but my name was rejected.
               e['reason'] = 'blocked'
-
             else
               # Verify each regular expression of session errors
-              ReFailure.each_key do |r|
+              ReFailures.each_key do |r|
                 # Check each regular expression
-                next unless e['diagnosis'] =~ ReFailure[r]
+                next unless e['diagnosis'] =~ ReFailures[r]
                 e['reason'] = r.to_s
                 break
               end
 
               unless e['reason']
                 # The reason "expired"
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelayed
+                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
               end
             end
           end

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

@@ -6,15 +6,12 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Notes.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'subject' => %r/\AUndeliverable message/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\A[-]+[ ]+Failure Reasons[ ]+[-]+\z/,
-        :rfc822 => %r/^[-]+[ ]+Returned Message[ ]+[-]+$/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['------- Failure Reasons '],
+        rfc822:  ['------- Returned Message '],
       }.freeze
-      ReFailure = {
+      ReFailures = {
         userunknown: %r{(?:
            User[ ]not[ ]listed[ ]in[ ]public[ ]Name[ ][&][ ]Address[ ]Book
           |ディレクトリのリストにありません
@@ -22,12 +19,10 @@ module Sisimai::Bite::Email
         }x,
         networkerror: %r/Message has exceeded maximum hop count/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Lotus Notes'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Lotus Notes
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -43,7 +38,7 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['subject'].start_with?('Undeliverable message')
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -56,10 +51,10 @@ module Sisimai::Bite::Email
         encodedmsg = ''
         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
@@ -67,7 +62,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -89,7 +84,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -110,10 +104,9 @@ module Sisimai::Bite::Email
               end
               v['recipient'] ||= e
               recipients += 1
-
             else
-              next if e =~ /\A\z/
-              next if e =~ /\A[-]+/
+              next if e.empty?
+              next if e.start_with?('-')
 
               if e =~ /[^\x20-\x7e]/
                 # Error message is not ISO-8859-1
@@ -130,11 +123,11 @@ module Sisimai::Bite::Email
                   encodedmsg = removedmsg
                 end
                 v['diagnosis'] ||= ''
-                v['diagnosis']  += encodedmsg
+                v['diagnosis'] << encodedmsg
               else
                 # Error message does not include multi-byte character
                 v['diagnosis'] ||= ''
-                v['diagnosis']  += e
+                v['diagnosis'] << e
               end
             end
           end
@@ -150,19 +143,18 @@ module Sisimai::Bite::Email
             break
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Check each regular expression of Notes error messages
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
             e['status'] = pseudostatus if pseudostatus.size > 0

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

@@ -7,23 +7,20 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Office365.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'subject'    => %r/Undeliverable:/,
-        :'received'   => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
-        :'message-id' => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        rfc822: ['Content-Type: message/rfc822'],
+        error:  ['Diagnostic information for administrators:'],
+        eoerr:  ['Original message headers:'],
       }.freeze
-      Re1 = {
-        :begin  => %r{\A(?:
+      MarkingsOf = {
+        message: %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
           |.+[ ]rejected[ ]your[ ]message[ ]to[ ]the[ ]following[ ]e[-]?mail[ ]addresses:
           )
         }x,
-        :error  => %r/\ADiagnostic information for administrators:\z/,
-        :eoerr  => %r/\AOriginal message headers:\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      CodeTable = {
+      StatusList = {
         # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
         %r/\A4[.]4[.]7\z/        => 'expired',
         %r/\A4[.]7[.]26\z/       => 'securityerror',
@@ -49,7 +46,6 @@ module Sisimai::Bite::Email
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Office 365: http://office.microsoft.com/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -72,7 +68,6 @@ module Sisimai::Bite::Email
           'X-MS-Exchange-Transport-CrossTenantHeadersStamped',
         ]
       end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Microsoft Office 365
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -89,8 +84,9 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        tryto  = %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/
         match  = 0
-        match += 1 if mhead['subject'] =~ Re0[:subject]
+        match += 1 if mhead['subject'].include?('Undeliverable:')
         match += 1 if mhead['x-ms-exchange-message-is-ndr']
         match += 1 if mhead['x-microsoft-antispam-prvs']
         match += 1 if mhead['x-exchange-antispam-report-test']
@@ -98,10 +94,10 @@ module Sisimai::Bite::Email
         match += 1 if mhead['x-ms-exchange-crosstenant-originalarrivaltime']
         match += 1 if mhead['x-ms-exchange-crosstenant-fromentityheader']
         match += 1 if mhead['x-ms-exchange-transport-crosstenantheadersstamped']
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['received'].find { |a| a =~ tryto }
         if mhead['message-id']
           # Message-ID: <00000000-0000-0000-0000-000000000000@*.*.prod.outlook.com>
-          match += 1 if mhead['message-id'] =~ Re0[:'message-id']
+          match += 1 if mhead['message-id'] =~ tryto
         end
         return nil if match < 2
 
@@ -116,10 +112,10 @@ module Sisimai::Bite::Email
         htmlbegins = false  # (Boolean) Flag for HTML part
         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 =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -127,7 +123,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
@@ -141,7 +137,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -166,43 +161,40 @@ module Sisimai::Bite::Email
             elsif cv = e.match(/\AGenerating server: (.+)\z/)
               # Generating server: FFFFFFFFFFFF.e0.prod.outlook.com
               connheader['lhost'] = cv[1].downcase
-
             else
               if endoferror
                 # After "Original message headers:"
                 if htmlbegins
                   # <html> .. </html>
-                  htmlbegins = false if e =~ %r|\A[<]/html[>]|
+                  htmlbegins = false if e.start_with?('</html>')
                   next
                 end
 
-                if cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+                if 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.2.0
                   v['status'] = 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;BLU004-OMC3S13.hotmail.example.com
                   connheader['lhost'] = cv[1].downcase
 
-                elsif cv = e.match(/\A[Rr]eceived-[Ff]rom-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # Reporting-MTA: dns;BLU004-OMC3S13.hotmail.example.com
                   connheader['rhost'] = cv[1].downcase
 
-                elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+                elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                   # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                   next if connheader['date']
                   connheader['date'] = cv[1]
-
                 else
-                  htmlbegins = true if e =~ /\A[<]html[>]/
+                  htmlbegins = true if e.start_with?('<html>')
                 end
-
               else
-                if e =~ Re1[:error]
+                if e == StartingOf[:error][0]
                   # Diagnostic information for administrators:
                   v['diagnosis'] = e
                 else
@@ -210,23 +202,22 @@ module Sisimai::Bite::Email
                   # Remote Server returned '550 5.1.10 RESOLVER.ADR.RecipientNotFound; Recipien=
                   # t not found by SMTP address lookup'
                   next unless v['diagnosis']
-                  if e =~ Re1[:eoerr]
+                  if e == StartingOf[:eoerr][0]
                     # Original message headers:
                     endoferror = true
                     next
                   end
-                  v['diagnosis'] += ' ' + e
+                  v['diagnosis'] << ' ' << e
                 end
               end
             end
 
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -235,17 +226,17 @@ module Sisimai::Bite::Email
           e['status']  ||= ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
-          if e['status'].empty? || e['status'] =~ /\A\d[.]0[.]0\z/
+          if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
             pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
             e['status'] = pseudostatus if pseudostatus.size > 0
           end
           next unless e['status']
 
-          CodeTable.each_key do |f|
+          StatusList.each_key do |f|
             # Try to match with each key as a regular expression
             next unless e['status'] =~ f
-            e['reason'] = CodeTable[f]
+            e['reason'] = StatusList[f]
             break
           end
         end