sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/rfc5322.rb

@@ -4,12 +4,12 @@ module Sisimai
     # Imported from p5-Sisimail/lib/Sisimai/RFC5322.pm
     class << self
       HeaderTable = {
-        :messageid => ['Message-Id'],
-        :subject   => ['Subject'],
-        :listid    => ['List-Id'],
-        :date      => %w[Date Posted-Date Posted Resent-Date],
-        :addresser => %w[From Return-Path Reply-To Errors-To Reverse-Path X-Postfix-Sender Envelope-From X-Envelope-From],
-        :recipient => %w[To Delivered-To Forward-Path Envelope-To X-Envelope-To Resent-To Apparently-To],
+        :messageid => %w[message-id],
+        :subject   => %w[subject],
+        :listid    => %w[list-id],
+        :date      => %w[date posted-date posted resent-date],
+        :addresser => %w[from return-path reply-to errors-to reverse-path x-postfix-sender envelope-from x-envelope-from],
+        :recipient => %w[to delivered-to forward-path envelope-to x-envelope-to resent-to apparently-to],
       }.freeze
 
       build_regular_expressions = lambda do
@@ -44,7 +44,7 @@ module Sisimai
         # called from Sisimai::Bite::Email::*
         fv = {}
         HeaderTable.each_value do |e|
-          e.each { |ee| fv[ee.downcase] = 1 }
+          e.each { |ee| fv[ee] = true }
         end
         return fv
       end
@@ -80,33 +80,20 @@ module Sisimai
         return false
       end
 
-      # Check that the argument is an domain part of email address or not
-      # @param    [String] dpart  Domain part of the email address
-      # @return   [True,False]    true: Valid domain part
-      #                           false: Not a valid domain part
-      def is_domainpart(dpart)
-        return false unless dpart.is_a?(::String)
-        return false if dpart =~ /(?:[\x00-\x1f]|\x1f)/
-        return false if dpart.include?('@')
-        return true  if dpart =~ Re[:domain]
-        return false
-      end
-
       # Check that the argument is mailer-daemon or not
       # @param    [String] email  Email address
       # @return   [True,False]    true: mailer-daemon
       #                           false: Not mailer-daemon
       def is_mailerdaemon(email)
         return false unless email.is_a?(::String)
-
-        re = %r/(?:
+        regex = %r/(?:
            (?:mailer-daemon|postmaster)[@]
           |[<(](?:mailer-daemon|postmaster)[)>]
           |\A(?:mailer-daemon|postmaster)\z
           |[ ]?mailer-daemon[ ]
           )
-        /x
-        return true if email.downcase =~ re
+        /x.freeze
+        return true if email.downcase =~ regex
         return false
       end
 
@@ -202,24 +189,21 @@ module Sisimai
 
         while e = argv1.shift do
           # After "message/rfc822"
-          if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.*\z/)
-            # Get required headers
-            lhs = cv[1].downcase
+          if e.start_with?(' ', "\t")
+            # Continued line from the previous line
+            next if rfc822next[previousfn]
+            rfc822part << e + "\n" if LongHeaders.key?(previousfn)
+          else
+            # Get required headers only
+            (lhs, rhs) = e.split(/:[ ]*/, 2)
+            next unless lhs
+            lhs.downcase!
+
             previousfn = ''
             next unless HeaderIndex.key?(lhs)
 
             previousfn  = lhs
             rfc822part << e + "\n"
-
-          elsif e.start_with?(' ', "\t")
-            # Continued line from the previous line
-            next if rfc822next[previousfn]
-            rfc822part << e + "\n" if LongHeaders.key?(previousfn)
-          else
-            # Check the end of headers in rfc822 part
-            next unless LongHeaders.key?(previousfn)
-            next unless e.empty?
-            rfc822next[previousfn] = true
           end
         end
 

data/lib/sisimai/rhost.rb

@@ -16,6 +16,7 @@ module Sisimai
         'orange.fr'                   => 'FrancePTT',
         'lsean.ezweb.ne.jp'           => 'KDDI',
         'msmx.au.com'                 => 'KDDI',
+        '.qq.com'                     => 'TencentQQ',
       }.freeze
 
       # Retrun the list of remote hosts Sisimai support

data/lib/sisimai/rhost/exchangeonline.rb

@@ -91,15 +91,15 @@ module Sisimai
         }.freeze
         MessagesOf = {
           # Copied and converted from Sisimai::Bite::Email::Exchange2007
-          expired:       ['QUEUE.Expired'],
-          hostunknown:   ['SMTPSEND.DNS.NonExistentDomain'],
-          mesgtoobig:    ['RESOLVER.RST.RecipSizeLimit', 'RESOLVER.RST.RecipientSizeLimit'],
-          networkerror:  ['SMTPSEND.DNS.MxLoopback'],
-          rejected:      ['RESOLVER.RST.NotAuthorized'],
-          securityerror: ['RESOLVER.RST.AuthRequired'],
-          systemerror:   ['RESOLVER.ADR.Ambiguous', 'RESOLVER.ADR.BadPrimary', 'RESOLVER.ADR.InvalidInSmtp'],
-          toomanyconn:   ['RESOLVER.ADR.RecipLimit', 'RESOLVER.ADR.RecipientLimit'],
-          userunknown:   [
+          'expired'       => ['QUEUE.Expired'],
+          'hostunknown'   => ['SMTPSEND.DNS.NonExistentDomain'],
+          'mesgtoobig'    => ['RESOLVER.RST.RecipSizeLimit', 'RESOLVER.RST.RecipientSizeLimit'],
+          'networkerror'  => ['SMTPSEND.DNS.MxLoopback'],
+          'rejected'      => ['RESOLVER.RST.NotAuthorized'],
+          'securityerror' => ['RESOLVER.RST.AuthRequired'],
+          'systemerror'   => ['RESOLVER.ADR.Ambiguous', 'RESOLVER.ADR.BadPrimary', 'RESOLVER.ADR.InvalidInSmtp'],
+          'toomanyconn'   => ['RESOLVER.ADR.RecipLimit', 'RESOLVER.ADR.RecipientLimit'],
+          'userunknown'   => [
             'RESOLVER.ADR.RecipNotFound',
             'RESOLVER.ADR.RecipientNotFound',
             'RESOLVER.ADR.ExRecipNotFound',
@@ -128,36 +128,34 @@ module Sisimai
             end
             break unless reasontext.empty?
           end
+          return reasontext unless reasontext.empty?
 
-          if reasontext.empty?
-            ReStatuses.each_key do |e|
-              # Try to compare with each string of delivery status codes
-              next unless statuscode =~ e
-              ReStatuses[e].each do |f|
-                # Try to compare with each string of error messages
-                f[:string].each do |g|
-                  next unless statusmesg.include?(g)
-                  reasontext = f[:reason]
-                  break
-                end
-                break unless reasontext.empty?
+          ReStatuses.each_key do |e|
+            # Try to compare with each string of delivery status codes
+            next unless statuscode =~ e
+            ReStatuses[e].each do |f|
+              # Try to compare with each string of error messages
+              f[:string].each do |g|
+                next unless statusmesg.include?(g)
+                reasontext = f[:reason]
+                break
               end
               break unless reasontext.empty?
             end
+            break unless reasontext.empty?
+          end
+          return reasontext unless reasontext.empty?
 
-            if reasontext.empty?
-              # D.S.N. included in the error message did not matched with any
-              # key in ReStatuses
-              MessagesOf.each_key do |e|
-                # Try to compare with error messages defined in MessagesOf
-                MessagesOf[e].each do |f|
-                  next unless statusmesg.include?(f)
-                  reasontext = e.to_s
-                  break
-                end
-                break unless reasontext.empty?
-              end
+          # D.S.N. included in the error message did not matched with any
+          # key in ReStatuses
+          MessagesOf.each_key do |e|
+            # Try to compare with error messages defined in MessagesOf
+            MessagesOf[e].each do |f|
+              next unless statusmesg.include?(f)
+              reasontext = e
+              break
             end
+            break unless reasontext.empty?
           end
           return reasontext
         end

data/lib/sisimai/rhost/franceptt.rb

@@ -8,28 +8,28 @@ module Sisimai
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/FrancePTT.pm
         ErrorCodes = {
-          :'103' => 'blocked',       # Service refuse. Veuillez essayer plus tard.
-          :'104' => 'toomanyconn',   # Too many connections, slow down. LPN105_104
-          :'105' => nil,             # Veuillez essayer plus tard.
-          :'109' => nil,             # Veuillez essayer plus tard. LPN003_109
-          :'201' => nil,             # Veuillez essayer plus tard. OFR004_201
-          :'305' => 'securityerror', # 550 5.7.0 Code d'authentification invalide OFR_305
-          :'401' => 'blocked',       # 550 5.5.0 SPF: *** is not allowed to send mail. LPN004_401
-          :'402' => 'securityerror', # 550 5.5.0 Authentification requise. Authentication Required. LPN105_402
-          :'403' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender.
-          :'405' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender. LPN105_405
-          :'415' => 'rejected',      # Emetteur invalide. Invalid Sender. OFR_415
-          :'416' => 'userunknown',   # 550 5.1.1 Adresse d au moins un destinataire invalide. Invalid recipient. LPN416
-          :'417' => 'mailboxfull',   # 552 5.1.1 Boite du destinataire pleine. Recipient overquota.
-          :'418' => 'userunknown',   # Adresse d au moins un destinataire invalide
-          :'420' => 'suspend',       # Boite du destinataire archivee. Archived recipient.
-          :'421' => 'rejected',      # 5.5.3 Mail from not owned by user. LPN105_421.
-          :'423' => nil,             # Service refused, please try later. LPN105_423
-          :'424' => nil,             # Veuillez essayer plus tard. LPN105_424
-          :'506' => 'spamdetected',  # Mail rejete. Mail rejected. OFR_506 [506]
-          :'510' => 'blocked',       # Veuillez essayer plus tard. service refused, please try later. LPN004_510 
-          :'513' => nil,             # Mail rejete. Mail rejected. OUK_513
-          :'514' => 'mesgtoobig',    # Taille limite du message atteinte
+          '103' => 'blocked',       # Service refuse. Veuillez essayer plus tard.
+          '104' => 'toomanyconn',   # Too many connections, slow down. LPN105_104
+          '105' => nil,             # Veuillez essayer plus tard.
+          '109' => nil,             # Veuillez essayer plus tard. LPN003_109
+          '201' => nil,             # Veuillez essayer plus tard. OFR004_201
+          '305' => 'securityerror', # 550 5.7.0 Code d'authentification invalide OFR_305
+          '401' => 'blocked',       # 550 5.5.0 SPF: *** is not allowed to send mail. LPN004_401
+          '402' => 'securityerror', # 550 5.5.0 Authentification requise. Authentication Required. LPN105_402
+          '403' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender.
+          '405' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender. LPN105_405
+          '415' => 'rejected',      # Emetteur invalide. Invalid Sender. OFR_415
+          '416' => 'userunknown',   # 550 5.1.1 Adresse d au moins un destinataire invalide. Invalid recipient. LPN416
+          '417' => 'mailboxfull',   # 552 5.1.1 Boite du destinataire pleine. Recipient overquota.
+          '418' => 'userunknown',   # Adresse d au moins un destinataire invalide
+          '420' => 'suspend',       # Boite du destinataire archivee. Archived recipient.
+          '421' => 'rejected',      # 5.5.3 Mail from not owned by user. LPN105_421.
+          '423' => nil,             # Service refused, please try later. LPN105_423
+          '424' => nil,             # Veuillez essayer plus tard. LPN105_424
+          '506' => 'spamdetected',  # Mail rejete. Mail rejected. OFR_506 [506]
+          '510' => 'blocked',       # Veuillez essayer plus tard. service refused, please try later. LPN004_510 
+          '513' => nil,             # Mail rejete. Mail rejected. OUK_513
+          '514' => 'mesgtoobig',    # Taille limite du message atteinte
         }.freeze
 
         # Detect bounce reason from Oranage or La Poste
@@ -44,7 +44,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 = ErrorCodes[v.to_sym] || 'undefined'
+            reasontext = ErrorCodes[v] || 'undefined'
           end
           return reasontext
         end

data/lib/sisimai/rhost/godaddy.rb

@@ -8,34 +8,34 @@ module Sisimai
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoDaddy.pm
         # https://www.godaddy.com/help/what-does-my-email-bounceback-mean-3568
         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
-          :IB106 => 'blocked',       # 554 Connection refused. This IP is listed on the Policy Block List (PBL). IB106
-          :IB007 => 'toomanyconn',   # 421 Connection refused, too many sessions from This IP. Please lower the number of concurrent sessions. IB007
-          :IB101 => 'expired',       # 421 Server temporarily unavailable. Try again later. IB101
-          :IB108 => 'blocked',       # 421 Temporarily rejected. Reverse DNS for this IP failed. IB108
-          :IB110 => 'blocked',       # 554 This IP has been temporarily blocked for attempting to send too many messages containing content judged to be spam by the Internet community. IB110
-          :IB111 => 'blocked',       # 554 This IP has been blocked for the day, for attempting to send too many messages containing content judged to be spam by the Internet community. IB111
-          :IB112 => 'blocked',       # 554 This IP has been temporarily blocked for attempting to mail too many invalid recipients. IB112
-          :IB113 => 'blocked',       # 554 This IP has been blocked for the day, for attempting to mail too many invalid recipients. IB113
-          :IB212 => 'spamdetected',  # 552 This message has been rejected due to content judged to be spam by the Internet community. IB212
-          :IB401 => 'securityerror', # 535 Authentication not allowed on IBSMTP Servers. IB401
-          :IB501 => 'rejected',      # 550 holly@coolexample.com Blank From: addresses are not allowed. Please provide a valid From. IB501
-          :IB502 => 'rejected',      # 550 holly@coolexample.com IP addresses are not allowed as a From: Address. Please provide a valid From. IB502
-          :IB504 => 'toomanyconn',   # 550 This IP has sent too many messages this hour. IB504
-          :IB506 => 'rejected',      # 550 coolexample.com From: Domain is invalid. Please provide a valid From: IB506
-          :IB508 => 'rejected',      # 550 holly@coolexample.com Invalid SPF record. Please inspect your SPF settings, and try again. IB508
-          :IB510 => 'toomanyconn',   # 550 This message has exceeded the max number of messages per session. Please open a new session and try again. IB510
-          :IB607 => 'toomanyconn',   # 550 This IP has sent too many to too many recipients this hour. IB607
-          :IB705 => 'virusdetected', # 552 Virus infected message rejected. IB705
+          '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
+          'IB106' => 'blocked',       # 554 Connection refused. This IP is listed on the Policy Block List (PBL). IB106
+          'IB007' => 'toomanyconn',   # 421 Connection refused, too many sessions from This IP. Please lower the number of concurrent sessions. IB007
+          'IB101' => 'expired',       # 421 Server temporarily unavailable. Try again later. IB101
+          'IB108' => 'blocked',       # 421 Temporarily rejected. Reverse DNS for this IP failed. IB108
+          'IB110' => 'blocked',       # 554 This IP has been temporarily blocked for attempting to send too many messages containing content judged to be spam by the Internet community. IB110
+          'IB111' => 'blocked',       # 554 This IP has been blocked for the day, for attempting to send too many messages containing content judged to be spam by the Internet community. IB111
+          'IB112' => 'blocked',       # 554 This IP has been temporarily blocked for attempting to mail too many invalid recipients. IB112
+          'IB113' => 'blocked',       # 554 This IP has been blocked for the day, for attempting to mail too many invalid recipients. IB113
+          'IB212' => 'spamdetected',  # 552 This message has been rejected due to content judged to be spam by the Internet community. IB212
+          'IB401' => 'securityerror', # 535 Authentication not allowed on IBSMTP Servers. IB401
+          'IB501' => 'rejected',      # 550 holly@coolexample.com Blank From: addresses are not allowed. Please provide a valid From. IB501
+          'IB502' => 'rejected',      # 550 holly@coolexample.com IP addresses are not allowed as a From: Address. Please provide a valid From. IB502
+          'IB504' => 'toomanyconn',   # 550 This IP has sent too many messages this hour. IB504
+          'IB506' => 'rejected',      # 550 coolexample.com From: Domain is invalid. Please provide a valid From: IB506
+          'IB508' => 'rejected',      # 550 holly@coolexample.com Invalid SPF record. Please inspect your SPF settings, and try again. IB508
+          'IB510' => 'toomanyconn',   # 550 This message has exceeded the max number of messages per session. Please open a new session and try again. IB510
+          '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
         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.'],
+            '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
@@ -50,13 +50,13 @@ 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 = ErrorCodes[cv[1].to_sym]
+            reasontext = ErrorCodes[cv[1]]
           else
             # 553 http://www.spamhaus.org/query/bl?ip=192.0.0.222
             MessagesOf.each_key do |e|
               MessagesOf[e].each do |f|
                 next unless statusmesg.include?(f)
-                reasontext = e.to_s
+                reasontext = e
                 break
               end
               break unless reasontext.empty?

data/lib/sisimai/rhost/googleapps.rb

@@ -8,29 +8,29 @@ module Sisimai
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoogleApps.pm
         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.1.1' => [{ reason: 'userunknown', string: ['The email account that you tried to reach does not exist.'] }],
+          'X.1.2' => [{ reason: 'hostunknown', string: ["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 ']  },
+            { reason: 'suspend',   string: ['The email account that you tried to reach is disabled.'] },
+            { reason: 'undefined', string: ['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.2.2' => [{ reason: 'mailboxfull', string: ['The email account that you tried to reach is over quota.'] }],
+          'X.2.3' => [{ reason: 'exceedlimit', string: ["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.'] },
+            { reason: 'syntaxerror', string: ['Multiple destination domains per transaction is unsupported.'] },
+            { reason: 'undefined',   string: ['Mail server temporarily rejected message.'] },
           ],
-          'X.4.2' => [{ reason: 'expired', stirng: ['Timeout - closing connection.'] }],
+          'X.4.2' => [{ reason: 'expired', string: ['Timeout - closing connection.'] }],
           'X.4.5' => [
-            { reason: 'exceedlimit', stirng: ['Daily sending quota exceeded.'] },
-            { reason: 'undefined',   stirng: ['Server busy, try again later.'] },
+            { reason: 'exceedlimit', string: ['Daily sending quota exceeded.'] },
+            { reason: 'undefined',   string: ['Server busy, try again later.'] },
           ],
-          'X.5.0' => [{ reason: 'syntaxerror', stirng: ['SMTP protocol violation'] }],
+          'X.5.0' => [{ reason: 'syntaxerror', string: ['SMTP protocol violation'] }],
           'X.5.1' => [
-            { reason: 'securityerror', stirng: ['Authentication Required.'] },
+            { reason: 'securityerror', string: ['Authentication Required.'] },
             {
               reason: 'syntaxerror',
-              stirng: [
+              string: [
                 'STARTTLS may not be repeated',
                 'Too many unrecognized commands, goodbye.',
                 'Unimplemented command.',
@@ -42,51 +42,51 @@ module Sisimai
             },
           ],
           'X.5.2' => [
-            { reason: 'securityerror', stirng: ['Cannot Decode response.'] },   # 2FA related error, maybe.
-            { reason: 'syntaxerror',   stirng: ['Syntax error.'] },
+            { reason: 'securityerror', string: ['Cannot Decode response.'] },   # 2FA related error, maybe.
+            { reason: 'syntaxerror',   string: ['Syntax error.'] },
           ],
           'X.5.3' => [
-            { reason: 'mailboxfull',    stirng: ['Domain policy size per transaction exceeded,'] },
-            { reason: 'policyviolation',stirng: ['Your message has too many recipients.'] },
+            { reason: 'mailboxfull',    string: ['Domain policy size per transaction exceeded,'] },
+            { reason: 'policyviolation',string: ['Your message has too many recipients.'] },
           ],
-          'X.5.4' => [{ reason: 'syntaxerror', stirng: ['Optional Argument not permitted for that AUTH mode.'] }],
+          'X.5.4' => [{ reason: 'syntaxerror', string: ['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'] }
+            { reason: 'contenterror', string: ['Mail message is malformed.'] },
+            { reason: 'networkerror', string: ['Message exceeded 50 hops'] }
           ],
           'X.7.0' => [
             {
               reason: 'blocked',
-              stirng: [
+              string: [
                 'IP not in whitelist for RCPT domain, closing connection.',
                 'Our system has detected an unusual rate of unsolicited mail originating from your IP address.',
               ],
             },
             {
               reason: 'expired',
-              stirng: [
+              string: [
                 'Temporary System Problem. Try again later.',
                 'Try again later, closing connection.',
               ],
             },
             {
               reason: 'securityerror',
-              stirng: [
+              string: [
                 '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.'] },
+            { reason: 'systemerror', string: ['Cannot authenticate due to temporary system problem.'] },
+            { reason: 'norelaying',  string: ['Mail relay denied.'] },
+            { reason: 'rejected',    string: ['Mail Sending denied.'] },
           ],
           'X.7.1' => [
-            { reason: 'mailboxfull', stirng: ['Email quota exceeded.'] },
+            { reason: 'mailboxfull', string: ['Email quota exceeded.'] },
             {
               reason: 'securityerror',
-              stirng: [
+              string: [
                 'Application-specific password required.',
                 'Please log in with your web browser and then try again.',
                 'Username and Password not accepted.',
@@ -94,16 +94,16 @@ module Sisimai
             },
             {
               reason: 'blocked',
-              stirng: [
+              string: [
                 '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: '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.'] },
+            { reason: 'spamdetected',   string: ['Our system has detected that this message is likely unsolicited mail.'] },
+            { reason: 'policyviolation',string: ['The user or domain that you are sending to (or from) has a policy'] },
+            { reason: 'rejected',       string: ['Unauthenticated email is not accepted from this domain.'] },
           ],
-          'X.7.4' => [{ reason: 'syntaxerror', stirng: ['Unrecognized Authentication Type.'] }],
+          'X.7.4' => [{ reason: 'syntaxerror', string: ['Unrecognized Authentication Type.'] }],
         }.freeze
 
         # Detect bounce reason from Google Apps
@@ -113,15 +113,13 @@ module Sisimai
         def get(argvs)
           return argvs.reason unless argvs.reason.empty?
 
-          reasontext = ''
-          statuscode = argvs.deliverystatus.clone
-
-          statuscode[0] = 'X'
-          return '' unless StatusList[statuscode.to_sym]
+          (statuscode = argvs.deliverystatus.clone)[0] = 'X'
+          return '' unless StatusList[statuscode]
 
-          StatusList[statuscode.to_sym].each do |e|
+          reasontext = ''
+          StatusList[statuscode].each do |e|
             # Try to match
-            next unless e[:regexp].any? { |a| argvs.diagnosticcode.include?(a) }
+            next unless e[:string].any? { |a| argvs.diagnosticcode.include?(a) }
             reasontext = e[:reason]
             break
           end