sisimai 4.22.3 → 4.22.4

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

@@ -6,22 +6,21 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Google.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/[@]googlemail[.]com[>]?\z/,
-        :subject => %r/Delivery[ ]Status[ ]Notification/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Delivery to the following recipient'],
+        error:   ['The error that the other server returned was:'],
       }.freeze
-      Re1 = {
-        :begin   => %r/Delivery to the following recipient/,
-        :start   => %r/Technical details of (?:permanent|temporary) failure:/,
-        :error   => %r/The error that the other server returned was:/,
-        :rfc822  => %r{\A(?:
+      MarkingsOf = {
+        start:  %r/Technical details of (?:permanent|temporary) failure:/,
+        rfc822: %r{\A(?:
              -----[ ]Original[ ]message[ ]-----
             |[ \t]*-----[ ]Message[ ]header[ ]follows[ ]-----
             )\z
         }x,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      ReFailure = {
+
+      ReFailures = {
         expired: %r{(?:
              DNS[ ]Error:[ ]Could[ ]not[ ]contact[ ]DNS[ ]servers
             |Delivery[ ]to[ ]the[ ]following[ ]recipient[ ]has[ ]been[ ]delayed
@@ -107,12 +106,10 @@ module Sisimai::Bite::Email
         # 550 550 Unknown user *****@***.**.*** (state 18).
         '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Google Gmail: https://mail.google.com'; 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 Google Gmail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -176,8 +173,8 @@ module Sisimai::Bite::Email
         #   The error that the other server returned was:
         #   550 5.1.1 <userunknown@example.jp>... User Unknown
         #
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['from'].include?('<mailer-daemon@googlemail.com>')
+        return nil unless mhead['subject'].include?('Delivery Status Notification')
 
         require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -189,15 +186,15 @@ module Sisimai::Bite::Email
         statecode0 = 0      # (Integer) The value of (state *) in the error message
         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.include?(StartingOf[:message][0])
           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
@@ -211,7 +208,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -247,18 +243,16 @@ module Sisimai::Bite::Email
                 v['recipient'] = addr0
                 recipients += 1
               end
-
             else
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' '
+              v['diagnosis'] << e + ' '
             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'])
@@ -287,12 +281,11 @@ module Sisimai::Bite::Email
             # (state *)
             e['reason']  = StateTable[statecode0]['reason']
             e['command'] = StateTable[statecode0]['command']
-
           else
             # No state code
-            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
@@ -301,10 +294,7 @@ module Sisimai::Bite::Email
 
           # Set pseudo status code
           e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-          if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
-            # Override bounce reason
-            e['reason'] = Sisimai::SMTP::Status.name(e['status'])
-          end
+          e['reason'] = Sisimai::SMTP::Status.name(e['status']) if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -6,28 +6,22 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/GSuite.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/[@]googlemail[.]com[>]?\z/,
-        :subject => %r/Delivery[ ]Status[ ]Notification/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\A[*][*][ ].+[ ][*][*]\z/,
-        :error   => %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
-        :html    => %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
-        :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      MarkingsOf = {
+        message: %r/\A[*][*][ ].+[ ][*][*]\z/,
+        rfc822:  %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
+        error:   %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
+        html:    %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
       }.freeze
       ErrorMayBe = {
-        :userunknown  => %r/because the address couldn't be found/,
-        :notaccept    => %r/Null MX/,
-        :networkerror => %r/DNS type .+ lookup of .+ responded with code NXDOMAIN/,
+        userunknown:  %r/because the address couldn't be found/,
+        notaccept:    %r/Null MX/,
+        networkerror: %r/DNS type .+ lookup of .+ responded with code NXDOMAIN/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'G Suite: https://gsuite.google.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Gm-Message-State']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from G Suite (Transfer from G Suite to a destinaion host)
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -44,8 +38,8 @@ module Sisimai::Bite::Email
         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'].include?('<mailer-daemon@googlemail.com>')
+        return nil unless mhead['subject'].include?('Delivery Status Notification')
         return nil unless mhead['x-gm-message-state']
 
         require 'sisimai/address'
@@ -55,7 +49,7 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        endoferror = true   # (Integer) Flag for a blank line after error messages
+        endoferror = false  # (Integer) Flag for a blank line after error messages
         anotherset = {}     # (Hash) Another error information
         emptylines = 0      # (Integer) The number of empty lines
         connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
@@ -65,15 +59,15 @@ 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
-            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 =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -87,7 +81,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -101,7 +94,7 @@ module Sisimai::Bite::Email
               # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
               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; kijitora@example.de
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -111,63 +104,60 @@ 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]
 
-              elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: dns; 192.0.2.222 (192.0.2.222, the server for the domain.)
                 v['rhost'] = cv[1].downcase
                 v['rhost'] = '' if v['rhost'] =~ /\A\s+\z/  # Remote-MTA: DNS;
 
-              elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
                 # Last-Attempt-Date: Fri, 24 Mar 2017 23:34:10 -0700 (PDT)
                 v['date'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: smtp; 550 #5.1.0 Address rejected.
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
                 else
                   # Append error messages continued from the previous line
-                  if endoferror && (v['diagnosis'] && v['diagnosis'].size > 0)
-                    endoferror = true if e.empty?
-                    endoferror = true if e.start_with?('--')
+                  if endoferror == false && v['diagnosis'].to_s.size > 0
+                    endoferror ||= true if e.empty?
+                    endoferror ||= true if e.start_with?('--')
 
                     next if endoferror
-                    next unless e =~ /\A[ ]/
-                    v['diagnosis'] += e
+                    next unless e.start_with?(' ')
+                    v['diagnosis'] << e
                   end
                 end
               end
-
             else
               # Reporting-MTA: dns; googlemail.com
               # Received-From-MTA: dns; sironeko@example.jp
               # Arrival-Date: Fri, 24 Mar 2017 23:34:07 -0700 (PDT)
               # X-Original-Message-ID: <06C1ED5C-7E02-4036-AEE1-AA448067FB2C@example.jp>
-              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
                 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: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
                 connvalues += 1
-
               else
                 # Detect SMTP session error or connection error
-                if e =~ Re1[:error]
+                if e =~ MarkingsOf[:error]
                   # The response from the remote server was:
-                  anotherset['diagnosis'] += e
+                  anotherset['diagnosis'] << e
                 else
                   # ** Address not found **
                   #
@@ -176,7 +166,7 @@ module Sisimai::Bite::Email
                   #
                   # The response from the remote server was:
                   # 550 #5.1.0 Address rejected.
-                  next if e =~ Re1[:html]
+                  next if e =~ MarkingsOf[:html]
 
                   if anotherset['diagnosis']
                     # Continued error messages from the previous line like
@@ -187,14 +177,14 @@ module Sisimai::Bite::Email
                       emptylines += 1
                       next
                     end
-                    anotherset['diagnosis'] += ' ' + e
+                    anotherset['diagnosis'] << ' ' << e
                   else
                     # ** Address not found **
                     #
                     # Your message wasn't delivered to * because the address couldn't be found.
                     # Check for typos or unnecessary spaces and try again.
                     next if e.empty?
-                    next unless e =~ Re1[:begin]
+                    next unless e =~ MarkingsOf[:message]
                     anotherset['diagnosis'] = e
                   end
                 end
@@ -203,12 +193,11 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/reply'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -224,7 +213,10 @@ module Sisimai::Bite::Email
               as = nil  # status
               ar = nil  # replycode
 
-              if e['status'] == '' || e['status'] =~ /\A[45][.]0[.]0\z/
+              e['status']    ||= ''
+              e['replycode'] ||= ''
+
+              if e['status'] == '' || e['status'].start_with?('4.0.0', '5.0.0')
                 # Check the value of D.S.N. in anotherset
                 as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
                 if as.size > 0 && as[-3, 3] != '0.0'
@@ -233,7 +225,7 @@ module Sisimai::Bite::Email
                 end
               end
 
-              if e['replycode'] == '' || e['replycode'] =~ /\A[45]00\z/
+              if e['replycode'].empty? || e['replycode'].start_with?('400', '500')
                 # Check the value of SMTP reply code in anotherset
                 ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
                 if ar.size > 0 && ar[-2, 2].to_i != 0
@@ -258,7 +250,6 @@ module Sisimai::Bite::Email
             e['reason'] = q.to_s
             break
           end
-
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -7,41 +7,32 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite::Email/IMailServer.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'x-mailer' => %r/\A[<]SMTP32 v[\d.]+[>][ ]*\z/,
-        :'subject'  => %r/\AUndeliverable Mail[ ]*\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\A\z/,    # Blank line
-        :error  => %r/Body of message generated response:/,
-        :rfc822 => %r/\AOriginal message follows[.]\z/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: [''],  # Blank line
+        rfc822:  ['Original message follows.'],
+        error:   ['Body of message generated response:'],
       }.freeze
+
       ReSMTP = {
-        conn: %r{(?:
-             SMTP[ ]connection[ ]failed,
-            |Unexpected[ ]connection[ ]response[ ]from[ ]server:
-            )
-        },
+        conn: %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
         ehlo: %r|Unexpected response to EHLO/HELO:|,
         mail: %r|Server response to MAIL FROM:|,
         rcpt: %r|Additional RCPT TO generated following response:|,
         data: %r|DATA command generated response:|,
       }.freeze
-      ReFailure = {
-        hostunknown: %r/Unknown[ ]host/x,
-        userunknown: %r/\A(?:Unknown[ ]user|Invalid[ ]final[ ]delivery[ ]userid)/x,
-        mailboxfull: %r/\AUser[ ]mailbox[ ]exceeds[ ]allowed[ ]size/x,
-        securityerr: %r/\ARequested[ ]action[ ]not[ ]taken:[ ]virus[ ]detected/x,
-        undefined:   %r/\Aundeliverable[ ]to[ ]/x,
-        expired:     %r/\ADelivery[ ]failed[ ]\d+[ ]attempts/x,
+      ReFailures = {
+        hostunknown: %r/Unknown host/,
+        userunknown: %r/\A(?:Unknown user|Invalid final delivery userid)/,
+        mailboxfull: %r/\AUser mailbox exceeds allowed size/,
+        securityerr: %r/\ARequested action not taken: virus detected/,
+        undefined:   %r/\Aundeliverable to /,
+        expired:     %r/\ADelivery failed \d+ attempts/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'IPSWITCH IMail Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from IMailServer
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -59,8 +50,8 @@ module Sisimai::Bite::Email
         return nil unless mbody
 
         match  = 0
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['x-mailer'] && mhead['x-mailer'] =~ Re0[:'x-mailer']
+        match += 1 if mhead['subject'] =~ /\AUndeliverable Mail[ ]*\z/
+        match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
         return nil if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -71,10 +62,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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -82,7 +73,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
@@ -96,7 +87,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             break if readcursor & Indicators[:'message-rfc822'] > 0
@@ -126,24 +116,20 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               # Other error message text
-              v['alterrors']  += ' ' + e if v['alterrors']
-              if e =~ Re1[:error]
-                # Body of message generated response:
-                v['alterrors'] = e
-              end
+              v['alterrors'] << ' ' << e if v['alterrors']
+              v['alterrors'] = e if e.include?(StartingOf[:error][0])
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent'] = self.smtpagent
 
-          if e['alterrors'] && e['alterrors'].size > 0
+          if e['alterrors'].to_s.size > 0
             # Copy alternative error message
             e['diagnosis'] = if e['diagnosis']
                                e['alterrors'] + ' ' + e['diagnosis']
@@ -162,9 +148,9 @@ module Sisimai::Bite::Email
             break
           end
 
-          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