sisimai 4.22.3-java → 4.22.4-java

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

@@ -6,15 +6,12 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Domino.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject => %r/\ADELIVERY FAILURE:/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\AYour message/,
-        :rfc822  => %r|\AContent-Type: message/delivery-status\z|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Your message'],
+        rfc822:  ['Content-Type: message/delivery-status'],
       }.freeze
-      ReFailure = {
+      ReFailures = {
         userunknown: %r{(?>
            not[ ]listed[ ]in[ ](?:
              Domino[ ]Directory
@@ -23,15 +20,13 @@ module Sisimai::Bite::Email
           |Domino[ ]ディレクトリには見つかりません
           )
         }x,
-        filtered:    %r/Cannot[ ]route[ ]mail[ ]to[ ]user/x,
-        systemerror: %r/Several[ ]matches[ ]found[ ]in[ ]Domino[ ]Directory/x,
+        filtered:    %r/Cannot route mail to user/,
+        systemerror: %r/Several matches found in Domino Directory/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'IBM Domino Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from IBM Domino Server
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -47,7 +42,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?('DELIVERY FAILURE:')
 
         require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -59,12 +54,12 @@ module Sisimai::Bite::Email
         subjecttxt = ''     # (String) The value of Subject:
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           next if e.empty?
 
           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
@@ -72,7 +67,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
@@ -86,7 +81,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -105,7 +99,7 @@ module Sisimai::Bite::Email
             #
             v = dscontents[-1]
 
-            if e =~ /\Awas not delivered to:\z/
+            if e.start_with?('was not delivered to:')
               # was not delivered to:
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
@@ -120,13 +114,11 @@ module Sisimai::Bite::Email
               #   kijitora@example.net
               v['recipient'] = Sisimai::Address.s3s4(cv[1])
 
-            elsif e =~ /\Abecause:\z/
+            elsif e.start_with?('because:')
               # because:
               v['diagnosis'] = e
-
             else
-
-              if v['diagnosis'] && v['diagnosis'] == 'because:'
+              if v['diagnosis'].to_s == 'because:'
                 # Error message, continued from the line "because:"
                 v['diagnosis'] = e
 
@@ -137,19 +129,18 @@ module Sisimai::Bite::Email
             end
           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 Domino 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, false)
             e['status'] = pseudostatus if pseudostatus.size > 0
@@ -158,10 +149,10 @@ module Sisimai::Bite::Email
           e.each_key { |a| e[a] ||= '' }
         end
 
-        unless rfc822list.find { |a| a =~ /^Subject:/ }
+        unless rfc822list.find { |a| a.start_with?('Subject:') }
           # Set the value of subjecttxt as a Subject if there is no original
           # message in the bounce mail.
-          rfc822list << sprintf('Subject: %s', subjecttxt)
+          rfc822list << ('Subject: ' << subjecttxt)
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -6,26 +6,18 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/EinsUndEins.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\A["]Mail Delivery System["]/,
-        :subject => %r/\AMail delivery failed: returning message to sender\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\AThis message was created automatically by mail delivery software/,
-        :error   => %r/\AFor the following reason:/,
-        :rfc822  => %r/\A--- The header of the original message is following/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
-      ReFailure = {
-        mesgtoobig: %r/Mail[ ]size[ ]limit[ ]exceeded/x,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by mail delivery software'],
+        error:   ['For the following reason:'],
+        rfc822:  ['--- The header of the original message is following'],
+      }.freeze
+      ReFailures = { mesgtoobig: %r/Mail size limit exceeded/ }.freeze
 
       def description; return '1&1: http://www.1and1.de'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       # X-UI-Out-Filterresults: unknown:0;
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from 1&1
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -41,8 +33,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['from'].start_with?('"Mail Delivery System"')
+        return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -52,10 +44,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
@@ -63,7 +55,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
@@ -77,7 +69,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -103,31 +94,26 @@ module Sisimai::Bite::Email
               v['recipient'] = cv[1]
               recipients += 1
 
-            elsif e =~ Re1[:error]
+            elsif e.start_with?(StartingOf[:error][0])
               # For the following reason:
               v['diagnosis'] = e
-
             else
-              # Get error message
-              if v['diagnosis']
-                # Append error message strings
-                v['diagnosis'] += ' ' + e
-              end
+              # Get error message and append error message strings
+              v['diagnosis'] << ' ' << e if v['diagnosis']
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
-          e['agent']       = self.smtpagent
-          e['diagnosis'] ||= ''
-          e['diagnosis']   = e['diagnosis'].gsub(/\A#{Re1[:error]}/, '')
-          e['diagnosis']   = Sisimai::String.sweep(e['diagnosis'])
+          e['agent']     = self.smtpagent
+          e['diagnosis'] = e['diagnosis'].to_s.gsub(/\A#{StartingOf[:error][0]}/, '')
+          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/exchange2003.rb

@@ -7,25 +7,13 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Exchange2003.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        # X-Mailer: Internet Mail Service (5.0.1461.28)
-        # X-Mailer: Microsoft Exchange Server Internet Mail Connector Version ...
-        :'x-mailer'  => %r{\A(?:
-           Internet[ ]Mail[ ]Service[ ][(][\d.]+[)]\z
-          |Microsoft[ ]Exchange[ ]Server[ ]Internet[ ]Mail[ ]Connector
-          )
-        }x,
-        :'x-mimeole' => %r/\AProduced By Microsoft Exchange/,
-        # Received: by ***.**.** with Internet Mail Service (5.5.2657.72)
-        :'received'  => %r/\Aby .+ with Internet Mail Service [(][\d.]+[)]/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AYour message/,
-        :error  => %r/\Adid not reach the following recipient[(]s[)]:/,
-        :rfc822 => %r|\AContent-Type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Your message'],
+        error:   ['did not reach the following recipient(s):'],
+        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      CodeTable = {
+      ErrorCodes = {
         onhold: [
           '000B099C', # Host Unknown, Message exceeds size limit, ...
           '000B09AA', # Unable to relay for, Message exceeds size limit,...
@@ -52,12 +40,10 @@ module Sisimai::Bite::Email
           '000C0595', # Ambiguous Recipient
         ],
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Exchange Server 2003'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-MS-Embedded-Report', 'X-MimeOLE']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Microsoft Exchange Server 2003
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -74,29 +60,31 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
         match = 0
+        tryto = []
 
         match += 1 if mhead['x-ms-embedded-report']
         catch :EXCHANGE_OR_NOT do
-          loop do
+          while true
             throw :EXCHANGE_OR_NOT if match > 0
 
             if mhead['x-mailer']
               # X-Mailer:  Microsoft Exchange Server Internet Mail Connector Version 4.0.994.63
               # X-Mailer: Internet Mail Service (5.5.2232.9)
-              match += 1 if mhead['x-mailer'] =~ Re0[:'x-mailer']
+              tryto = ['Internet Mail Service (', 'Microsoft Exchange Server Internet Mail Connector']
+              match += 1 if mhead['x-mailer'].start_with?(tryto[0], tryto[1])
               throw :EXCHANGE_OR_NOT if match > 0
             end
 
             if mhead['x-mimeole']
               # X-MimeOLE: Produced By Microsoft Exchange V6.5
-              match += 1 if mhead['x-mimeole'] =~ Re0[:'x-mimeole']
+              match += 1 if mhead['x-mimeole'].start_with?('Produced By Microsoft Exchange')
               throw :EXCHANGE_OR_NOT if match > 0
             end
 
             throw :EXCHANGE_OR_NOT if mhead['received'].size.zero?
             mhead['received'].each do |e|
               # Received: by ***.**.** with Internet Mail Service (5.5.2657.72)
-              next unless e =~ Re0[:'received']
+              next unless e.include?(' with Internet Mail Service (')
               match += 1
               throw :EXCHANGE_OR_NOT
             end
@@ -120,10 +108,10 @@ module Sisimai::Bite::Email
         }
         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
@@ -131,7 +119,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
@@ -145,7 +133,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -182,24 +169,20 @@ module Sisimai::Bite::Email
               elsif cv = e.match(/\A[ \t]+(MSEXCH:.+)\z/)
                 #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
                 v['diagnosis'] ||= ''
-                v['diagnosis']  += cv[1]
-
+                v['diagnosis'] << cv[1]
               else
                 next if v['msexch']
-                if v['diagnosis'] =~ /\AMSEXCH:.+/
+                if v['diagnosis'].to_s.start_with?('MSEXCH:')
                   # Continued from MEEXCH in the previous line
                   v['msexch'] = true
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + e
+                  v['diagnosis'] << ' ' << e
                   statuspart = true
-
                 else
                   # Error message in the body part
                   v['alterrors'] ||= ''
-                  v['alterrors']  += ' ' + e
+                  v['alterrors'] << ' ' << e
                 end
               end
-
             else
               # Your message
               #
@@ -230,11 +213,10 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
@@ -242,9 +224,9 @@ module Sisimai::Bite::Email
             errormessage = cv[2]
             pseudostatus = ''
 
-            CodeTable.each_key do |r|
+            ErrorCodes.each_key do |r|
               # Find captured code from the error code table
-              next unless CodeTable[r].index(capturedcode)
+              next unless ErrorCodes[r].index(capturedcode)
               e['reason'] = r.to_s
               pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
               e['status'] = pseudostatus if pseudostatus.size > 0
@@ -269,9 +251,9 @@ module Sisimai::Bite::Email
 
         if rfc822list.empty?
           # When original message does not included in the bounce message
-          rfc822list << sprintf('From: %s', connheader['to'])
-          rfc822list << sprintf('Date: %s', connheader['date'])
-          rfc822list << sprintf('Subject: %s', connheader['subject'])
+          rfc822list << ('From: ' << connheader['to'])
+          rfc822list << ('Date: ' << connheader['date'])
+          rfc822list << ('Subject: ' << connheader['subject'])
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -7,16 +7,12 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Exchange2007.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'subject'          => %r/\AUndeliverable:/,
-        :'content-language' => %r/\A[a-z]{2}(?:[-][A-Z]{2})?\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/[ ]Microsoft[ ]Exchange[ ]Server[ ]20\d{2}/,
-        :error  => %r/[ ]((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
-        :rhost  => %r/\AGenerating[ ]server:[ ]?(.*)/,
-        :rfc822 => %r/\AOriginal message headers:/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Original message headers:'] }.freeze
+      MarkingsOf = {
+        message: %r/ Microsoft Exchange Server 20\d{2}/,
+        error:   %r/ ((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
+        rhost:   %r/\AGenerating server:[ ]?(.*)/,
       }.freeze
       NDRSubject = {
         :'SMTPSEND.DNS.NonExistentDomain'=> 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
@@ -32,12 +28,10 @@ module Sisimai::Bite::Email
         :'RESOLVER.RST.RecipSizeLimit'   => 'mesgtoobig',    # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
         :'QUEUE.Expired'                 => 'expired',       # 550 4.4.7 QUEUE.Expired
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Exchange Server 2007'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['Content-Language']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Microsoft Exchange Server 2007
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -54,9 +48,9 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
-        return nil unless mhead['subject'] =~ Re0[:'subject']
+        return nil unless mhead['subject'].start_with?('Undeliverable:')
         return nil unless mhead['content-language']
-        return nil unless mhead['content-language'] =~ Re0[:'content-language']
+        return nil unless mhead['content-language'] =~ /\A[a-z]{2}(?:[-][A-Z]{2})?\z/
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -70,10 +64,10 @@ module Sisimai::Bite::Email
         }
         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
@@ -81,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.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -95,7 +89,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -129,19 +122,18 @@ module Sisimai::Bite::Email
                 v['replycode'] = cv[1]
                 v['status']    = cv[2]
                 v['diagnosis'] = e
-
               else
                 if v['diagnosis'].to_s.size > 0 && v['diagnosis'].end_with?('=')
                   # Continued line of error messages
-                  v['diagnosis']  = v['diagnosis'].sub(/=\z/, '')
-                  v['diagnosis'] += e
+                  v['diagnosis']  = v['diagnosis'].chomp('=')
+                  v['diagnosis'] << e
                 end
               end
             else
               # Diagnostic information for administrators:
               #
               # Generating server: mta22.neko.example.org
-              if cv = e.match(Re1[:rhost])
+              if cv = e.match(MarkingsOf[:rhost])
                 # Generating server: mta22.neko.example.org
                 next if connheader['rhost'].size > 0
                 connheader['rhost'] = cv[1]
@@ -154,7 +146,7 @@ module Sisimai::Bite::Email
 
         require 'sisimai/string'
         dscontents.map do |e|
-          if cv = e['diagnosis'].match(Re1[:error])
+          if cv = e['diagnosis'].match(MarkingsOf[:error])
             # #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
             f = cv[1]
             NDRSubject.each_key do |r|