sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/rhost/franceptt.rb

@@ -7,7 +7,7 @@ module Sisimai
     module FrancePTT
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/FrancePTT.pm
-        CodeTable = {
+        ErrorCodes = {
           :'103' => 'blocked',       # Service refuse. Veuillez essayer plus tard.
           :'104' => 'toomanyconn',   # Too many connections, slow down. LPN105_104
           :'105' => nil,             # Veuillez essayer plus tard.
@@ -46,7 +46,7 @@ module Sisimai
           if cv = statusmesg.match(/\b(LPN|OFR|OUK)(_[0-9]{3}|[0-9]{3}[-_][0-9]{3})\b/)
             # OUK_513, LPN105-104, OFR102-104
             v = sprintf("%03d", (cv[1] + cv[2])[-3, 3])
-            reasontext = CodeTable[v.to_sym] || 'undefined'
+            reasontext = ErrorCodes[v.to_sym] || 'undefined'
           end
           return reasontext
         end

data/lib/sisimai/rhost/godaddy.rb

@@ -7,7 +7,7 @@ module Sisimai
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoDaddy.pm
         # https://www.godaddy.com/help/what-does-my-email-bounceback-mean-3568
-        CodeTable = {
+        ErrorCodes = {
           :IB103 => 'blocked',       # 554 Connection refused. This IP has a poor reputation on Cloudmark Sender Intelligence (CSI). IB103
           :IB104 => 'blocked',       # 554 Connection refused. This IP is listed on the Spamhaus Block List (SBL). IB104
           :IB105 => 'blocked',       # 554 Connection refused. This IP is listed on the Exploits Block List (XBL). IB105
@@ -30,26 +30,12 @@ module Sisimai
           :IB607 => 'toomanyconn',   # 550 This IP has sent too many to too many recipients this hour. IB607
           :IB705 => 'virusdetected', # 552 Virus infected message rejected. IB705
         }.freeze
-
-        MesgTable = {
-          :blocked => [
-              %r{\A553 http://www[.]spamhaus[.]org/query/bl[?]ip=.+},
-              %r/\A554 RBL Reject[.]/,
-          ],
-          :expired => [
-              %r/Delivery timeout/,
-              %r/451 Sorry, I wasn't able to establish an SMTP connection[.]/,
-          ],
-          :mailboxfull => [
-              %r/Account storage limit/,
-          ],
-          :userunknown => [
-              %r/Account does not exist/,
-              %r/550 Recipient not found[.]/,
-          ],
-          :suspend => [
-              %r/Account disabled/,
-          ],
+        MessagesOf = {
+            blocked:     ['553 http://www.spamhaus.org/query/bl?ip=', '554 RBL Reject.'],
+            expired:     ['Delivery timeout', "451 Sorry, I wasn't able to establish an SMTP connection."],
+            suspend:     ['Account disabled'],
+            mailboxfull: ['Account storage limit'],
+            userunknown: ['Account does not exist', '550 Recipient not found.'],
         }.freeze
 
         # Detect bounce reason from GoDaddy
@@ -66,15 +52,16 @@ module Sisimai
 
           if cv = statusmesg.match(/\s(IB\d{3})\b/)
             # 192.0.2.22 has sent to too many recipients this hour. IB607 ...
-            reasontext = CodeTable[cv[1].to_sym]
+            reasontext = ErrorCodes[cv[1].to_sym]
           else
             # 553 http://www.spamhaus.org/query/bl?ip=192.0.0.222
-            MesgTable.each_key do |e|
-              MesgTable[e].each do |f|
-                next unless statusmesg =~ f
+            MessagesOf.each_key do |e|
+              MessagesOf[e].each do |f|
+                next unless statusmesg.include?(f)
                 reasontext = e.to_s
                 break
               end
+              break if reasontext.size > 0
             end
           end
           return reasontext

data/lib/sisimai/rhost/googleapps.rb

@@ -6,206 +6,104 @@ module Sisimai
     module GoogleApps
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoogleApps.pm
-        CodeTable = {
-          :'X.1.1' => [
-            {
-              :reason => 'userunknown',
-              :regexp => [%r/The email account that you tried to reach does not exist[.]/],
-            }
-          ],
-          :'X.1.2' => [
-            {
-              :reason => 'hostunknown',
-              :regexp => [%r/We weren't able to find the recipient domain[.]/],
-            },
-          ],
-          :'X.2.1' => [
-            {
-              :reason => 'undefined',
-              :regexp => [
-                %r/The user you are trying to contact is receiving mail too quickly[.]/,
-                %r/The user you are trying to contact is receiving mail at a rate/,
+        StatusList = {
+          # https://support.google.com/a/answer/3726730
+          'X.1.1' => [{ reason: 'userunknown', stirng: ['The email account that you tried to reach does not exist.'] }],
+          'X.1.2' => [{ reason: 'hostunknown', stirng: ["We weren't able to find the recipient domain."] }],
+          'X.2.1' => [
+            { reason: 'suspend',   stirng: ['The email account that you tried to reach is disabled.'] },
+            { reason: 'undefined', stirng: ['The user you are trying to contact is receiving mail ']  },
+          ],
+          'X.2.2' => [{ reason: 'mailboxfull', stirng: ['The email account that you tried to reach is over quota.'] }],
+          'X.2.3' => [{ reason: 'exceedlimit', stirng: ["Your message exceeded Google's message size limits."] }],
+          'X.3.0' => [
+            { reason: 'syntaxerror', stirng: ['Multiple destination domains per transaction is unsupported.'] },
+            { reason: 'undefined',   stirng: ['Mail server temporarily rejected message.'] },
+          ],
+          'X.4.2' => [{ reason: 'expired', stirng: ['Timeout - closing connection.'] }],
+          'X.4.5' => [
+            { reason: 'exceedlimit', stirng: ['Daily sending quota exceeded.'] },
+            { reason: 'undefined',   stirng: ['Server busy, try again later.'] },
+          ],
+          'X.5.0' => [{ reason: 'syntaxerror', stirng: ['SMTP protocol violation'] }],
+          'X.5.1' => [
+            { reason: 'securityerror', stirng: ['Authentication Required.'] },
+            {
+              reason: 'syntaxerror',
+              stirng: [
+                'STARTTLS may not be repeated',
+                'Too many unrecognized commands, goodbye.',
+                'Unimplemented command.',
+                'Unrecognized command.',
+                'EHLO/HELO first.',
+                'MAIL first.',
+                'RCPT first.',
               ],
             },
-            {
-              :reason => 'suspend',
-              :regexp => [%r/The email account that you tried to reach is disabled[.]/],
-            },
           ],
-          :'X.2.2' => [
-            {
-              :reason => 'mailboxfull',
-              :regexp => [%r/The email account that you tried to reach is over quota[.]/],
-            },
-          ],
-          :'X.2.3' => [
-            {
-              :reason => 'exceedlimit',
-              :regexp => [%r/Your message exceeded Google's message size limits[.]/],
-            },
-          ],
-          :'X.3.0' => [
-            {
-              :reason => 'undefined',
-              :regexp => [
-                %r/Mail server temporarily rejected message[.]/,
-                %r/Multiple destination domains per transaction is unsupported[.]/,
-              ],
-            },
+          'X.5.2' => [
+            { reason: 'securityerror', stirng: ['Cannot Decode response.'] },   # 2FA related error, maybe.
+            { reason: 'syntaxerror',   stirng: ['Syntax error.'] },
           ],
-          :'X.4.2' => [
-            {
-              :reason => 'expired',
-              :regexp => [%r/Timeout [-] closing connection[.]/],
-            },
+          'X.5.3' => [
+            { reason: 'mailboxfull',    stirng: ['Domain policy size per transaction exceeded,'] },
+            { reason: 'policyviolation',stirng: ['Your message has too many recipients.'] },
           ],
-          :'X.4.5' => [
-            {
-              :reason => 'undefined',
-              :regexp => [%r/Server busy, try again later[.]/],
-            },
-            {
-              :reason => 'exceedlimit',
-              :regexp => [%r/Daily sending quota exceeded[.]/],
-            },
+          'X.5.4' => [{ reason: 'syntaxerror', stirng: ['Optional Argument not permitted for that AUTH mode.'] }],
+          'X.6.0' => [
+            { reason: 'contenterror', stirng: ['Mail message is malformed.'] },
+            { reason: 'networkerror', stirng: ['Message exceeded 50 hops'] }
           ],
-          :'X.5.0' => [
+          'X.7.0' => [
             {
-              :reason => 'undefined',
-              :regexp => [
-                %r/SMTP protocol violation, see RFC 2821[.]/,
-                %r/SMTP protocol violation, no commands allowed to pipeline after STARTTLS/,
+              reason: 'blocked',
+              stirng: [
+                'IP not in whitelist for RCPT domain, closing connection.',
+                'Our system has detected an unusual rate of unsolicited mail originating from your IP address.',
               ],
             },
-          ],
-          :'X.5.1' => [
             {
-              :reason => 'syntaxerror',
-              :regexp => [
-                %r/STARTTLS may not be repeated[.]/,
-                %r/Too many unrecognized commands, goodbye[.]/,
-                %r/Unimplemented command[.]/,
-                %r/Unrecognized command[.]/,
-                %r|EHLO/HELO first[.]|,
-                %r/MAIL first[.]/,
-                %r/RCPT first[.]/,
+              reason: 'expired',
+              stirng: [
+                'Temporary System Problem. Try again later.',
+                'Try again later, closing connection.',
               ],
             },
             {
-              :reason => 'securityerror',
-              :regexp => [%r/Authentication Required[.]/],
-            },
-          ],
-          :'X.5.2' => [
-            {
-              :reason => 'undefined',
-              :regexp => [%r/Cannot Decode response[.]/],
-            },
-            {
-              :reason => 'syntaxerror',
-              :regexp => [%r/Syntax error[.]/],
-            },
-          ],
-          :'X.5.3' => [
-            {
-              :reason => 'undefined',
-              :regexp => [
-                %r/Domain policy size per transaction exceeded[,]/,
-                %r/Your message has too many recipients[.]/,
+              reason: 'securityerror',
+              stirng: [
+                'TLS required for RCPT domain, closing connection.',
+                'No identity changes permitted.',
+                'Must issue a STARTTLS command first.',
+                'Too Many Unauthenticated commands.',
               ],
             },
+            { reason: 'systemerror', stirng: ['Cannot authenticate due to temporary system problem.'] },
+            { reason: 'norelaying',  stirng: ['Mail relay denied.'] },
+            { reason: 'rejected',    stirng: ['Mail Sending denied.'] },
           ],
-          :'X.5.4' => [
+          'X.7.1' => [
+            { reason: 'mailboxfull', stirng: ['Email quota exceeded.'] },
             {
-              :reason => 'syntaxerror',
-              :regexp => [%r/Optional Argument not permitted for that AUTH mode[.]/],
-            },
-          ],
-          :'X.6.0' => [
-            {
-              :reason => 'contenterror',
-              :regexp => [
-                %r/Mail message is malformed[.]/,
-                %r/Message exceeded 50 hops/,
-              ],
-            },
-          ],
-          :'X.7.0' => [
-            {
-              :reason => 'blocked',
-              :regexp => [
-                %r/IP not in whitelist for RCPT domain, closing connection[.]/,
-                %r/Our system has detected an unusual rate of unsolicited mail originating from your IP address[.]/,
+              reason: 'securityerror',
+              stirng: [
+                'Application-specific password required.',
+                'Please log in with your web browser and then try again.',
+                'Username and Password not accepted.',
               ],
             },
             {
-              :reason => 'expired',
-              :regexp => [
-                %r/Temporary System Problem. Try again later[.]/,
-                %r/Try again later, closing connection[.]/,
+              reason: 'blocked',
+              stirng: [
+                'Our system has detected an unusual rate of unsolicited mail originating from your IP address.',
+                "The IP you're using to send mail is not authorized to send email directly to our servers.",
               ],
             },
-            {
-              :reason => 'securityerror',
-              :regexp => [
-                %r/TLS required for RCPT domain, closing connection[.]/,
-                %r/No identity changes permitted[.]/,
-                %r/Must issue a STARTTLS command first[.]/,
-                %r/Too Many Unauthenticated commands[.]/,
-              ],
-            },
-            {
-              :reason => 'systemerror',
-              :regexp => [%r/Cannot authenticate due to temporary system problem[.]/],
-            },
-            {
-              :reason => 'norelaying',
-              :regexp => [%r/Mail relay denied[.]/],
-            },
-            {
-              :reason => 'rejected',
-              :regexp => [%r/Mail Sending denied[.]/],
-            },
-          ],
-          :'X.7.1' => [
-            {
-              :reason => 'securityerror',
-              :regexp => [
-                %r/Application-specific password required[.]/,
-                %r/Please log in with your web browser and then try again[.]/,
-                %r/Username and Password not accepted[.]/,
-              ],
-            },
-            {
-              :reason => 'mailboxfull',
-              :regexp => [%r/Email quota exceeded[.]/],
-            },
-            {
-              :reason => 'blocked',
-              :regexp => [
-                %r/Our system has detected an unusual rate of unsolicited mail originating from your IP address[.]/,
-                %r/The IP you[']re using to send mail is not authorized to send email directly to our servers[.]/,
-              ],
-            },
-            {
-              :reason => 'contenterror',
-              :regexp => [%r/Our system has detected that this message is likely unsolicited mail[.]/],
-            },
-            {
-              :reason => 'filtered',
-              :regexp => [%r/The user or domain that you are sending to [(]or from[)] has a policy/],
-            },
-            {
-              :reason => 'rejected',
-              :regexp => [%r/Unauthenticated email is not accepted from this domain[.]/],
-            },
-          ],
-          :'X.7.4' => [
-            {
-              :reason => 'securityerror',
-              :regexp => [%r/Unrecognized Authentication Type[.]/],
-            },
+            { reason: 'spamdetected',   stirng: ['Our system has detected that this message is likely unsolicited mail.'] },
+            { reason: 'policyviolation',stirng: ['The user or domain that you are sending to (or from) has a policy'] },
+            { reason: 'rejected',       stirng: ['Unauthenticated email is not accepted from this domain.'] },
           ],
+          'X.7.4' => [{ reason: 'syntaxerror', stirng: ['Unrecognized Authentication Type.'] }],
         }.freeze
 
         # Detect bounce reason from Google Apps
@@ -217,16 +115,17 @@ module Sisimai
           return nil unless argvs.is_a? Sisimai::Data
           return argvs.reason if argvs.reason.size > 0
 
-          statuscode = argvs.deliverystatus.sub(/\A\d[.](\d+[.]\d+)\z/, 'X.\1')
-          statusmesg = argvs.diagnosticcode
           reasontext = ''
-          errortable = CodeTable[statuscode.to_sym] || []
+          statuscode = argvs.deliverystatus.clone
+
+          statuscode[0] = 'X'
+          return '' unless StatusList[statuscode.to_sym]
 
-          errortable.each do |e|
+          StatusList[statuscode.to_sym].each do |e|
             # Try to match
-            next unless e[:regexp].find { |a| statusmesg =~ a }
+            next unless e[:regexp].find { |a| argvs.diagnosticcode.include?(a) }
             reasontext = e[:reason]
-            break if reasontext.size > 0
+            break
           end
           return reasontext
         end

data/lib/sisimai/smtp.rb

@@ -9,10 +9,10 @@ module Sisimai
       # @return   [Hash] SMTP command regular expressions
       def command
         return {
-          :helo => %r/\b(?:HELO|EHLO)\b/,
-          :mail => %r/\bMAIL F(?:ROM|rom)\b/,
-          :rcpt => %r/\bRCPT T[Oo]\b/,
-          :data => %r/\bDATA\b/,
+          helo: %r/\b(?:HELO|EHLO)\b/,
+          mail: %r/\bMAIL F(?:ROM|rom)\b/,
+          rcpt: %r/\bRCPT T[Oo]\b/,
+          data: %r/\bDATA\b/,
         }
       end
 

data/lib/sisimai/smtp/error.rb

@@ -9,13 +9,12 @@ module Sisimai
         require 'sisimai/smtp/status'
 
         SoftOrHard = {
-          :soft => %w|
+          :soft => %w[
             blocked contenterror exceedlimit expired filtered mailboxfull
             mailererror mesgtoobig networkerror norelaying policyviolation
             rejected securityerror spamdetected suspend syntaxerror systemerror
-            systemfull toomanyconn virusdetected
-          |,
-          :hard => %w|hasmoved hostunknown userunknown|
+            systemfull toomanyconn virusdetected],
+          :hard => %w[hasmoved hostunknown userunknown]
         }.freeze
 
         # Permanent error or not
@@ -49,10 +48,11 @@ module Sisimai
             end
           else
             # Check with regular expression
-            getchecked = if argv1 =~ /(?:temporar|persistent)/i
+            v = argv1.downcase
+            getchecked = if v.include?('temporar') || v.include?('persistent')
                            # Temporary failure
                            false
-                         elsif argv1 =~ /permanent/i
+                         elsif v.include?('permanent')
                            # Permanently failure
                            true
                          end
@@ -74,7 +74,7 @@ module Sisimai
           getchecked = nil
           softorhard = nil
 
-          if argv1 =~ /\A(?:delivered|feedback|vacation)\z/
+          if %w[delivered feedback vacation].include?(argv1)
             # These are not dealt as a bounce reason
             softorhard = ''
 
@@ -115,7 +115,7 @@ module Sisimai
           else
             # Check all the reasons defined at the above
             catch :SOFT_OR_HARD do
-              loop do
+              while true
                 [:hard, :soft].each do |e|
                   # Soft or Hard?
                   SoftOrHard[e].each do |f|