sisimai 4.22.3-java → 4.22.4-java

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

@@ -6,55 +6,42 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Exim.pm
       require 'sisimai/bite/email'
 
-      ReE = {
-        :from    => %r/[@].+[.]mail[.]ru[>]?/,
-      }.freeze
-      Re0 = {
-        :from    => %r/\AMail Delivery System/,
-        :subject => %r{(?:
-           Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
-          |Delivery[ ]Status[ ]Notification
-          |Mail[ ]failure
-          |Message[ ]frozen
-          |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
-          )
-        }x,
-        # :'message-id' => %r/\A[<]\w+[-]\w+[-]\w+[@].+\z/,
-        # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        deliverystatus: ['Content-type: message/delivery-status'],
+        endof:          ['__END_OF_EMAIL_MESSAGE__'],
       }.freeze
-
-      # Error text regular expressions which defined in exim/src/deliver.c
-      #
-      # deliver.c:6292| fprintf(f,
-      # deliver.c:6293|"This message was created automatically by mail delivery software.\n");
-      # deliver.c:6294|        if (to_sender)
-      # deliver.c:6295|          {
-      # deliver.c:6296|          fprintf(f,
-      # deliver.c:6297|"\nA message that you sent could not be delivered to one or more of its\n"
-      # deliver.c:6298|"recipients. This is a permanent error. The following address(es) failed:\n");
-      # deliver.c:6299|          }
-      # deliver.c:6300|        else
-      # deliver.c:6301|          {
-      # deliver.c:6302|          fprintf(f,
-      # deliver.c:6303|"\nA message sent by\n\n  <%s>\n\n"
-      # deliver.c:6304|"could not be delivered to one or more of its recipients. The following\n"
-      # deliver.c:6305|"address(es) failed:\n", sender_address);
-      # deliver.c:6306|          }
-      #
-      # deliver.c:6423|          if (bounce_return_body) fprintf(f,
-      # deliver.c:6424|"------ This is a copy of the message, including all the headers. ------\n");
-      # deliver.c:6425|          else fprintf(f,
-      # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
-      Re1 = {
-        :alias  => %r/\A([ ]+an[ ]undisclosed[ ]address)\z/,
-        :frozen => %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
-        :rfc822 => %r{\A(?:
+      MarkingsOf = {
+        # Error text regular expressions which defined in exim/src/deliver.c
+        #
+        # deliver.c:6292| fprintf(f,
+        # deliver.c:6293|"This message was created automatically by mail delivery software.\n");
+        # deliver.c:6294|        if (to_sender)
+        # deliver.c:6295|          {
+        # deliver.c:6296|          fprintf(f,
+        # deliver.c:6297|"\nA message that you sent could not be delivered to one or more of its\n"
+        # deliver.c:6298|"recipients. This is a permanent error. The following address(es) failed:\n");
+        # deliver.c:6299|          }
+        # deliver.c:6300|        else
+        # deliver.c:6301|          {
+        # deliver.c:6302|          fprintf(f,
+        # deliver.c:6303|"\nA message sent by\n\n  <%s>\n\n"
+        # deliver.c:6304|"could not be delivered to one or more of its recipients. The following\n"
+        # deliver.c:6305|"address(es) failed:\n", sender_address);
+        # deliver.c:6306|          }
+        #
+        # deliver.c:6423|          if (bounce_return_body) fprintf(f,
+        # deliver.c:6424|"------ This is a copy of the message, including all the headers. ------\n");
+        # deliver.c:6425|          else fprintf(f,
+        # deliver.c:6426|"------ This is a copy of the message's headers. ------\n");
+        alias:  %r/\A([ ]+an undisclosed address)\z/,
+        frozen: %r/\AMessage .+ (?:has been frozen|was frozen on arrival)/,
+        rfc822: %r{\A(?:
              [-]+[ ]This[ ]is[ ]a[ ]copy[ ]of[ ](?:the|your)[ ]message.+headers[.][ ][-]+
             |Content-Type:[ ]*message/rfc822
             )\z
           }x,
-        :begin  => %r{\A(?>
+        message: %r{\A(?>
            This[ ]message[ ]was[ ]created[ ]automatically[ ]by[ ]mail[ ]delivery[ ]software[.]
           |A[ ]message[ ]that[ ]you[ ]sent[ ]was[ ]rejected[ ]by[ ]the[ ]local[ ]scanning[ ]code
           |A[ ]message[ ]that[ ]you[ ]sent[ ]contained[ ]one[ ]or[ ]more[ ]recipient[ ]addresses[ ]
@@ -62,11 +49,9 @@ module Sisimai::Bite::Email
           |The[ ].+[ ]router[ ]encountered[ ]the[ ]following[ ]error[(]s[)]:
           )
          }x,
-        :deliverystatus => %r|\AContent-type: message/delivery-status|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
 
-      ReCommand = [
+      ReCommands = [
         # transports/smtp.c:564|  *message = US string_sprintf("SMTP error from remote mail server after %s%s: "
         # transports/smtp.c:837|  string_sprintf("SMTP error from remote mail server after RCPT TO:<%s>: "
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
@@ -74,11 +59,10 @@ module Sisimai::Bite::Email
         %r/LMTP error after ([A-Za-z]{4})/,
         %r/LMTP error after end of ([A-Za-z]{4})/,
       ].freeze
-
-      # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
-      ReFailure = {
+      ReFailures = {
+        # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-        userunknown: %r/user[ ]not[ ]found/x,
+        userunknown: %r/user not found/,
         # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
         # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
         # route.c:1826|  uschar *message = US"Unrouteable address";
@@ -93,7 +77,7 @@ module Sisimai::Bite::Email
         # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
         # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
         # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
-        mailboxfull: %r/(?:mailbox[ ]is[ ]full:?|error:[ ]quota[ ]exceed)/x,
+        mailboxfull: %r/(?:mailbox is full:?|error: quota exceed)/,
         # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
         # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
         notaccept: %r{(?:
@@ -122,7 +106,7 @@ module Sisimai::Bite::Email
           )
         }x,
         # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
-        contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers/x,
+        contenterror: %r/Too many ["]Received["] headers/,
       }.freeze
 
       # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
@@ -134,7 +118,7 @@ module Sisimai::Bite::Email
       # deliver.c:7586|  "Message %s has been frozen%s.\nThe sender is <%s>.\n", message_id,
       # receive.c:4021|  moan_tell_someone(freeze_tell, NULL, US"Message frozen on arrival",
       # receive.c:4022|  "Message %s was frozen on arrival by %s.\nThe sender is <%s>.\n",
-      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
@@ -143,12 +127,10 @@ module Sisimai::Bite::Email
         |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival[ ]by[ ])
         )
       }x
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Exim'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Failed-Recipients']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Exim
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -164,9 +146,19 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil if     mhead['from']    =~ ReE[:from]
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['subject'] =~ Re0[:subject]
+
+        # :'message-id' => %r/\A[<]\w+[-]\w+[-]\w+[@].+\z/,
+        return nil if     mhead['from'] =~ /[@].+[.]mail[.]ru[>]?/
+        return nil unless mhead['from'].start_with?('Mail Delivery System')
+        return nil unless mhead['subject'] =~ %r{(?:
+           Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
+          |Warning:[ ]message[ ].+[ ]delayed[ ]+
+          |Delivery[ ]Status[ ]Notification
+          |Mail[ ]failure
+          |Message[ ]frozen
+          |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
+          )
+        }x
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -188,20 +180,20 @@ module Sisimai::Bite::Email
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
         end
 
-        hasdivided.each do |e|
-          break if e =~ Re1[:endof]
+        while e = hasdivided.shift do
+          break if e == StartingOf[:endof][0]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
-              next unless e =~ Re1[:frozen]
+              next unless e =~ MarkingsOf[:frozen]
             end
           end
 
           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
@@ -215,7 +207,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -233,7 +224,7 @@ module Sisimai::Bite::Email
 
             if cv = e.match(/\A[ \t]{2}([^ \t]+[@][^ \t]+[.]?[a-zA-Z]+)(:.+)?\z/) ||
                     e.match(/\A[ \t]{2}[^ \t]+[@][^ \t]+[.][a-zA-Z]+[ ]<(.+?[@].+?)>:.+\z/) ||
-                    e.match(Re1[:alias])
+                    e.match(MarkingsOf[:alias])
               #   kijitora@example.jp
               #   sabineko@example.jp: forced freeze
               #   mikeneko@example.jp <nekochan@example.org>: ...
@@ -271,49 +262,46 @@ module Sisimai::Bite::Email
               #  pipe to |/bin/echo "Some pipe output"
               #    generated by userx@myhost.test.ex
               v['alias'] = cv[1]
-
             else
               next if e.empty?
 
-              if e =~ Re1[:frozen]
+              if e =~ MarkingsOf[:frozen]
                 # Message *** has been frozen by the system filter.
                 # Message *** was frozen on arrival by ACL.
                 v['alterrors'] ||= ''
-                v['alterrors']  += e + ' '
-
+                v['alterrors'] <<  e + ' '
               else
                 if boundary00.size > 0
                   # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
                   # Content-type: message/delivery-status
                   # ...
-                  if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+                  if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                     # Reporting-MTA: dns; mx.example.jp
                     v['lhost'] = 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[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+                  elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                     # Status: 5.0.0
                     v['status'] = cv[1]
 
-                  elsif cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                  elsif 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 cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
+                  elsif cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*(.+)\z/)
                     # Final-Recipient: rfc822;|/bin/echo "Some pipe output"
-                    v['spec'] ||= cv[1] =~ /[@]/ ? 'SMTP' : 'X-UNIX'
-
+                    v['spec'] ||= cv[1].include?('@') ? 'SMTP' : 'X-UNIX'
                   else
                     # Error message ?
                     if havepassed[:deliverystatus].zero?
                       # Content-type: message/delivery-status
-                      havepassed[:deliverystatus] = 1 if e =~ Re1[:deliverystatus]
+                      havepassed[:deliverystatus] = 1 if e.start_with?(StartingOf[:deliverystatus][0])
                       v['alterrors'] ||= ''
-                      v['alterrors']  += e + ' ' if e =~ /\A[ ]+/
+                      v['alterrors'] << e + ' ' if e.start_with?(' ')
                     end
                   end
                 else
@@ -321,8 +309,7 @@ module Sisimai::Bite::Email
                     # Error message
                     next unless e.size
                     v['diagnosis'] ||= ''
-                    v['diagnosis']  += e + '  '
-
+                    v['diagnosis'] << e + '  '
                   else
                     # Error message when email address above does not include '@'
                     # and domain part.
@@ -331,9 +318,9 @@ module Sisimai::Bite::Email
                       #   generated by kijitora@example.com
                       v['diagnosis'] = e
                     else
-                      next unless e =~ /\A[ ]{4}/
+                      next unless e.start_with?('    ')
                       v['alterrors'] ||= ''
-                      v['alterrors']  += e + ' '
+                      v['alterrors'] << e + ' '
                     end
 
                   end
@@ -349,12 +336,11 @@ module Sisimai::Bite::Email
             # Replace the recipient address with the value of "alias"
             next unless q['alias']
             next unless q['alias'].size > 0
-            if q['recipient'].empty? || q['recipient'] !~ /[@]/
+            if q['recipient'].empty? || q['recipient'].include?('@') == false
               # The value of "recipient" is empty or does not include "@"
               q['recipient'] = q['alias']
             end
           end
-
         else
           # Fallback for getting recipient addresses
           if mhead['x-failed-recipients']
@@ -367,7 +353,7 @@ module Sisimai::Bite::Email
             end
             recipients = rcptinhead.size
 
-            rcptinhead.each do |e|
+            while e = rcptinhead.shift do
               # Insert each recipient address into dscontents
               dscontents[-1]['recipient'] = e
               next if dscontents.size == recipients
@@ -388,7 +374,6 @@ module Sisimai::Bite::Email
         require 'sisimai/string'
         require 'sisimai/smtp/reply'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           e['agent']   = self.smtpagent
@@ -412,33 +397,30 @@ module Sisimai::Bite::Email
               e['diagnosis'] = dscontents[0]['diagnosis'] || ''
               e['spec']    ||= dscontents[0]['spec']
 
-              if dscontents[0]['alterrors'] && dscontents[0]['alterrors'].size > 0
+              if dscontents[0]['alterrors'].to_s.size > 0
                 # The value of "alterrors" is also copied
                 e['alterrors'] = dscontents[0]['alterrors']
               end
             end
           end
 
-          if e['alterrors'] && e['alterrors'].size > 0
+          if e['alterrors'].to_s.size > 0
             # Copy alternative error message
             if e['diagnosis'].nil? || e['diagnosis'].empty?
               e['diagnosis'] = e['alterrors']
             end
 
-            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
+            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
               e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
-
             else
               # Check the both value and try to match
               if e['diagnosis'].size < e['alterrors'].size
                 # Check the value of alterrors
                 rxdiagnosis = %r/e['diagnosis']/i
-                if e['alterrors'] =~ rxdiagnosis
-                  # Override the value of diagnostic code message because
-                  # the value of alterrors includes the value of diagnosis.
-                  e['diagnosis'] = e['alterrors']
-                end
+                # Override the value of diagnostic code message because
+                # the value of alterrors includes the value of diagnosis.
+                e['diagnosis'] = e['alterrors'] if e['alterrors'] =~ rxdiagnosis
               end
             end
             e.delete('alterrors')
@@ -454,16 +436,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
@@ -472,26 +452,25 @@ module Sisimai::Bite::Email
             end
 
             # Detect the reason of bounce
-            if e['command'] =~ /\A(?:HELO|EHLO)\z/
+            if %w[HELO EHLO].index(e['command'])
               # HELO | Connected to 192.0.2.135 but my name was rejected.
               e['reason'] = 'blocked'
 
             elsif e['command'] == 'MAIL'
               # MAIL | Connected to 192.0.2.135 but sender was rejected.
               e['reason'] = 'onhold'
-
             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
@@ -511,25 +490,27 @@ module Sisimai::Bite::Email
           r1 = 0  # First character of SMTP reply code as integer
 
           # "Status:" field did not exist in the bounce message
-          if sv.empty?
+          while true
+            break unless sv.empty?
+            break if rv.empty?
+
             # Check SMTP reply code
-            if rv.size > 0
-              # Generate pseudo DSN code from SMTP reply code
-              r1 = rv[0, 1].to_i
-              if r1 == 4
-                # Get the internal DSN(temporary error)
-                sv = Sisimai::SMTP::Status.code(e['reason'], true)
-
-              elsif r1 == 5
-                # Get the internal DSN(permanent error)
-                sv = Sisimai::SMTP::Status.code(e['reason'], false)
-              end
+            # Generate pseudo DSN code from SMTP reply code
+            r1 = rv[0, 1].to_i
+            if r1 == 4
+              # Get the internal DSN(temporary error)
+              sv = Sisimai::SMTP::Status.code(e['reason'], true)
+
+            elsif r1 == 5
+              # Get the internal DSN(permanent error)
+              sv = Sisimai::SMTP::Status.code(e['reason'], false)
             end
+            break
           end
 
           s1  = sv[0, 1].to_i if sv.size > 0
           v1  = s1 + r1
-          v1 += e['status'][0, 1].to_i if e['status']
+          v1 << e['status'][0, 1].to_i if e['status']
 
           if v1 > 0
             # Status or SMTP reply code exists
@@ -537,7 +518,7 @@ module Sisimai::Bite::Email
             e['status'] = sv if r1 > 0
           else
             # Neither Status nor SMTP reply code exist
-            sv = if e['reason'] =~ /\A(?:expired|mailboxfull)/
+            sv = if %w[expired mailboxfull].include?(e['reason'])
                    # Set pseudo DSN (temporary error)
                    Sisimai::SMTP::Status.code(e['reason'], true)
                  else