sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/rfc3834.rb

@@ -4,34 +4,31 @@ module Sisimai
     # Imported from p5-Sisimail/lib/Sisimai/RFC3834.pm
     class << self
       # http://tools.ietf.org/html/rfc3834
-      Re0 = {
+      MarkingsOf = { :boundary => %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/ }
+      AutoReply1 = {
         # http://www.iana.org/assignments/auto-submitted-keywords/auto-submitted-keywords.xhtml
-        :'auto-submitted' => %r/\Aauto-(?:generated|replied|notified)/i,
+        :'auto-submitted' => %r/\Aauto-(?:generated|replied|notified)/,
         # https://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
-        :'x-auto-response-suppress' => %r/(?:OOF|AutoReply)/i,
+        :'x-auto-response-suppress' => %r/(?:oof|autoreply)/,
         :'precedence' => %r/\Aauto_reply\z/,
         :'subject' => %r/\A(?>
-             Auto:
-            |Auto[ ]Response:
-            |Automatic[ ]reply:
-            |Out[ ]of[ ](?:the[ ])*Office:
+             auto:
+            |auto[ ]response:
+            |automatic[ ]reply:
+            |out[ ]of[ ](?:the[ ])*office:
           )
-        /xi,
+        /x,
       }.freeze
-      Re1 = {
-        :boundary => %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/,
-        :endof    => %r/\A__END_OF_EMAIL_MESSAGE__\z/
-      }
-      Re2 = {
+      Excludings = {
         :subject => %r/(?:
-             SECURITY[ ]information[ ]for  # sudo
-            |Mail[ ]failure[ ][-]          # Exim
+             security[ ]information[ ]for  # sudo
+            |mail[ ]failure[ ][-]          # Exim
             )
         /x,
-        :from    => %r/(?:root|postmaster|mailer-daemon)[@]/i,
+        :from    => %r/(?:root|postmaster|mailer-daemon)[@]/,
         :to      => %r/root[@]/,
       }.freeze
-      ReV = %r{\A(?>
+      SubjectSet = %r{\A(?>
          (?:.+?)?Re:
         |Auto(?:[ ]Response):
         |Automatic[ ]reply:
@@ -42,14 +39,7 @@ module Sisimai
 
       def description; 'Detector for auto replied message'; end
       def smtpagent;   'RFC3834'; end
-      def pattern;     return Re0; end
-      def headerlist
-        return [
-          'Auto-Submitted',
-          'Precedence',
-          'X-Auto-Response-Suppress',
-        ]
-      end
+      def headerlist;  return %w[Auto-Submitted Precedence X-Auto-Response-Suppress]; end
 
       # Detect auto reply message as RFC3834
       # @param         [Hash] mhead       Message header of a bounce email
@@ -72,22 +62,22 @@ module Sisimai
         match = 0
 
         # DETECT_EXCLUSION_MESSAGE
-        Re2.each_key do |e|
+        Excludings.each_key do |e|
           # Exclude message from root@
           next unless mhead.key?(e.to_s)
           next unless mhead[e.to_s]
-          next unless mhead[e.to_s] =~ Re2[e]
+          next unless mhead[e.to_s].downcase =~ Excludings[e]
           leave = 1
           break
         end
         return nil if leave > 0
 
         # DETECT_AUTO_REPLY_MESSAGE
-        Re0.each_key do |e|
+        AutoReply1.each_key do |e|
           # RFC3834 Auto-Submitted and other headers
           next unless mhead.key?(e.to_s)
           next unless mhead[e.to_s]
-          next unless mhead[e.to_s] =~ Re0[e]
+          next unless mhead[e.to_s].downcase =~ AutoReply1[e]
           match += 1
           break
         end
@@ -95,7 +85,6 @@ module Sisimai
 
         require 'sisimai/bite/email'
         require 'sisimai/address'
-
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.scrub('?').split("\n")
         rfc822part = '' # (String) message/rfc822-headers part
@@ -107,7 +96,7 @@ module Sisimai
         v = dscontents[-1]
 
         # RECIPIENT_ADDRESS
-        ['from', 'return-path'].each do |e|
+        %w[from return-path].each do |e|
           # Try to get the address of the recipient
           next unless mhead.key?(e)
           next unless mhead[e]
@@ -127,13 +116,13 @@ module Sisimai
           # the boundary string.
           require 'sisimai/mime'
           b0 = Sisimai::MIME.boundary(mhead['content-type'], 0)
-          Re1[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
+          MarkingsOf[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
         end
 
         # BODY_PARSER: Get vacation message
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Read the first 5 lines except a blank line
-          countuntil += 1 if e =~ Re1[:boundary]
+          countuntil += 1 if e =~ MarkingsOf[:boundary]
 
           unless e.size > 0
             # Check a blank line
@@ -141,11 +130,12 @@ module Sisimai
             break if blanklines > countuntil
             next
           end
-          next unless e =~ / /
-          next if e =~ /\AContent-(?:Type|Transfer)/
+          next unless e.include?(' ')
+          next if e.start_with?('Content-Type')
+          next if e.start_with?('Content-Transfer')
 
           v['diagnosis'] ||= ''
-          v['diagnosis']  += e + ' '
+          v['diagnosis']  << e + ' '
           haveloaded += 1
           break if haveloaded >= maxmsgline
         end
@@ -160,9 +150,9 @@ module Sisimai
 
         v.each_key { |a| v[a] ||= '' }
 
-        if cv = mhead['subject'].match(ReV)
+        if cv = mhead['subject'].match(SubjectSet)
           # Get the Subject header from the original message
-          rfc822part = sprintf("Subject: %s\n", cv[1])
+          rfc822part = 'Subject: ' << cv[1] + "\n"
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end

data/lib/sisimai/rfc5322.rb

@@ -7,15 +7,11 @@ module Sisimai
         :messageid => ['Message-Id'],
         :subject   => ['Subject'],
         :listid    => ['List-Id'],
-        :date      => ['Date', 'Posted-Date', 'Posted', 'Resent-Date'],
-        :addresser => [
-          'From', 'Return-Path', 'Reply-To', 'Errors-To', 'Reverse-Path',
-          'X-Postfix-Sender', 'Envelope-From', 'X-Envelope-From',
-        ],
-        :recipient => [
-          'To', 'Delivered-To', 'Forward-Path', 'Envelope-To',
-          'X-Envelope-To', 'Resent-To', 'Apparently-To'
-        ],
+        :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
@@ -95,7 +91,7 @@ module Sisimai
       def is_domainpart(dpart)
         return false unless dpart.is_a?(::String)
         return false if dpart =~ /(?:[\x00-\x1f]|\x1f)/
-        return false if dpart =~ /[@]/
+        return false if dpart.include?('@')
         return true  if dpart =~ Re[:domain]
         return false
       end
@@ -113,8 +109,8 @@ module Sisimai
           |\A(?:mailer-daemon|postmaster)\z
           |[ ]?mailer-daemon[ ]
           )
-        /xi
-        return true if email =~ re
+        /x
+        return true if email.downcase =~ re
         return false
       end
 
@@ -144,7 +140,7 @@ module Sisimai
           value['by']   = cr[1]
         end
 
-        if value['from'] =~ / /
+        if value['from'].include?(' ')
           # Received: from [10.22.22.222] (smtp-gateway.kyoto.ocn.ne.jp [192.0.2.222])
           #   (authenticated bits=0)
           #   by nijo.example.jp (V8/cf) with ESMTP id s1QB5ka0018055;
@@ -155,13 +151,12 @@ module Sisimai
           hostname = ''
           hostaddr = ''
 
-          received.each do |e|
+          while e = received.shift do
             # Received: from [10.22.22.222] (smtp-gateway.kyoto.ocn.ne.jp [192.0.2.222])
             if e =~ /\A[\[(]\d+[.]\d+[.]\d+[.]\d+[)\]]\z/
               # [192.0.2.1] or (192.0.2.1)
               e = e.delete('[]()')
               addrlist << e
-
             else
               # hostname
               e = e.delete('()')
@@ -169,9 +164,9 @@ module Sisimai
             end
           end
 
-          namelist.each do |e|
+          while e = namelist.shift do
             # 1. Hostname takes priority over all other IP addresses
-            next unless e =~ /[.]/
+            next unless e.include?('.')
             hostname = e
             break
           end
@@ -180,9 +175,8 @@ module Sisimai
             # 2. Use IP address as a remote host name
             addrlist.each do |e|
               # Skip if the address is a private address
-              next if e =~ /\A(?:10|127)[.]/
+              next if e.start_with?('10.', '127.', '192.168.')
               next if e =~ /\A172[.](?:1[6-9]|2[0-9]|3[0-1])[.]/
-              next if e =~ /\A192[.]168[.]/
               hostaddr = e
               break
             end
@@ -210,7 +204,7 @@ module Sisimai
         rfc822part = '' # (String) message/rfc822-headers part
         previousfn = '' # (String) Previous field name
 
-        argv1.each do |e|
+        while e = argv1.shift do
           # After "message/rfc822"
           if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
             # Get required headers
@@ -219,13 +213,12 @@ module Sisimai
             next unless HeaderIndex.key?(lhs)
 
             previousfn  = lhs
-            rfc822part += e + "\n"
+            rfc822part << e + "\n"
 
-          elsif e =~ /\A[ \t]+/
+          elsif e.start_with?(' ', "\t")
             # Continued line from the previous line
             next if rfc822next[previousfn]
-            rfc822part += e + "\n" if LongHeaders.key?(previousfn)
-
+            rfc822part << e + "\n" if LongHeaders.key?(previousfn)
           else
             # Check the end of headers in rfc822 part
             next unless LongHeaders.key?(previousfn)

data/lib/sisimai/rhost.rb

@@ -7,10 +7,13 @@ module Sisimai
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
-        %r/\Aaspmx[.]l[.]google[.]com\z/                 => 'GoogleApps',
-        %r/[.](?:prod|protection)[.]outlook[.]com\z/     => 'ExchangeOnline',
-        %r/\A(?:smtp|mailstore1)[.]secureserver[.]net\z/ => 'GoDaddy',
-        %r/\b(?:laposte[.]net|orange[.]fr)\z/            => 'FrancePTT',
+        'aspmx.l.google.com'          => 'GoogleApps',
+        '.prod.outlook.com'           => 'ExchangeOnline',
+        '.protection.outlook.com'     => 'ExchangeOnline',
+        'smtp.secureserver.net'       => 'GoDaddy',
+        'mailstore1.secureserver.net' => 'GoDaddy',
+        'laposte.net'                 => 'FrancePTT',
+        'orange.fr'                   => 'FrancePTT',
       }.freeze
 
       # Retrun the list of remote hosts Sisimai support
@@ -32,7 +35,7 @@ module Sisimai
 
         RhostClass.each_key do |e|
           # Try to match with each key of RhostClass
-          next unless host0 =~ e
+          next unless host0.end_with?(e)
           match = true
           break
         end
@@ -53,8 +56,8 @@ module Sisimai
 
         RhostClass.each_key do |e|
           # Try to match with each key of RhostClass
-          next unless remotehost =~ e
-          modulename = 'Sisimai::Rhost::' + RhostClass[e]
+          next unless remotehost.end_with?(e)
+          modulename = 'Sisimai::Rhost::' << RhostClass[e]
           rhostclass = modulename.gsub('::', '/').downcase
           break
         end

data/lib/sisimai/rhost/exchangeonline.rb

@@ -8,254 +8,103 @@ module Sisimai
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/ExchangeOnline.pm
 
         # https://technet.microsoft.com/en-us/library/bb232118
-        CodeTable = {
-          %r/\A4[.]3[.]1\z/ => [
-            {
-              :reason => 'systemfull',
-              :regexp => %r/Insufficient system resources/,
-            },
-          ],
-          %r/\A4[.]3[.]2\z/ => [
-            {
-              :reason => 'notaccept',
-              :regexp => %r/System not accepting network messages/,
-            },
-          ],
+        StatusList = {
+          '4.3.1'  => [{ reason: 'systemfull', string: 'Insufficient system resources' }],
+          '4.3.2'  => [{ reason: 'notaccept',  string: 'System not accepting network messages' }],
+          '4.4.2'  => [{ reason: 'blocked',    string: 'Connection dropped' }],
+          '4.7.26' => [{
+              reason: 'securityerror',
+              string: 'must pass either SPF or DKIM validation, this message is not signed'
+          }],
+          '5.0.0'  => [{ reason: 'blocked',     string: 'HELO / EHLO requires domain address' }],
+          '5.1.4'  => [{ reason: 'systemerror', string: 'Destination mailbox address ambiguous' }],
+          '5.2.1'  => [{ reason: 'suspend',     string: 'Mailbox cannot be accessed' }],
+          '5.2.2'  => [{ reason: 'mailboxfull', string: 'Mailbox full' }],
+          '5.2.3'  => [{ reason: 'exceedlimit', string: 'Message too large' }],
+          '5.2.4'  => [{ reason: 'systemerror', string: 'Mailing list expansion problem' }],
+          '5.3.3'  => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
+          '5.3.4'  => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
+          '5.3.5'  => [{ reason: 'systemerror', string: 'System incorrectly configured' }],
+          '5.4.1'  => [{ reason: 'userunknown', string: 'Recipient address rejected: Access denied' }],
+          '5.4.14' => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
+          '5.5.2'  => [{ reason: 'syntaxerror', string: 'Send hello first' }],
+          '5.5.3'  => [{ reason: 'syntaxerror', string: 'Too many recipients' }],
+          '5.5.4'  => [{ reason: 'filtered',    string: 'Invalid domain name' }],
+          '5.5.6'  => [{ reason: 'contenterror',string: 'Invalid message content' }],
+          '5.7.1'  => [
+              { reason: 'securityerror', string: 'Delivery not authorized' },
+              { reason: 'securityerror', string: 'Client was not authenticated' },
+              { reason: 'norelaying',    string: 'Unable to relay' },
+          ],
+          '5.7.25'  => [{ reason: 'blocked',      string: 'must have a reverse DNS record' }],
+          '5.7.506' => [{ reason: 'blocked',      string: 'Bad HELO' }],
+          '5.7.508' => [{ reason: 'toomanyconn',  string: 'has exceeded permitted limits within ' }],
+          '5.7.509' => [{ reason: 'rejected',     string: 'does not pass DMARC verification' }],
+          '5.7.510' => [{ reason: 'notaccept',    string: 'does not accept email over IPv6' }],
+          '5.7.511' => [{ reason: 'blocked',      string: 'banned sender' }],
+          '5.7.512' => [{ reason: 'contenterror', string: 'message must be RFC 5322' }],
+        }.freeze
+        ReStatuses = {
           %r/\A4[.]4[.][17]\z/ => [
-            {
-              :reason => 'expired',
-              :regexp => %r/(?:Connection[ ]timed[ ]out|Message[ ]expired)/x,
-            },
-          ],
-          %r/\A4[.]4[.]2\z/ => [
-            {
-              :reason => 'blocked',
-              :regexp => %r/Connection dropped/,
-            },
-          ],
-          %r/\A4[.]7[.]26\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/Access denied, a message sent over IPv6 .+ must pass either SPF or DKIM validation, this message is not signed/,
-            },
+              { reason: 'expired', string: ['Connection timed out', 'Message expired'] }
           ],
-          %r/\A4[.]7[.][568]\d{2}\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/Access denied, please try again later/,
-            },
-          ],
-          %r/\A5[.]0[.]0\z/ => [
-            {
-              :reason => 'blocked',
-              :regexp => %r|HELO / EHLO requires domain address|,
-            },
+          %r/\A4[.]7[.][568]\d\d\z/ => [
+              { reason: 'securityerror', string: ['Access denied, please try again later'] }
           ],
           %r/\A5[.]1[.][07]\z/ => [
-            {
-              :reason => 'rejected',
-              :regexp => %r/(?:Sender[ ]denied|Invalid[ ]address)/x,
-            },
-          ],
-          %r/\A5[.]1[.][123]\z/ => [
-            {
-              :reason => 'userunknown',
-              :regexp => %r{(?:
-                 Bad[ ]destination[ ]mailbox[ ]address
-                |Invalid[ ]X[.]400[ ]address
-                |Invalid[ ]recipient[ ]address
-                )
-              }x,
-            },
-          ],
-          %r/\A5[.]1[.]4\z/ => [
-            {
-              :reason => 'systemerror',
-              :regexp => %r/Destination mailbox address ambiguous/,
-            },
-          ],
-          %r/\A5[.]2[.]1\z/ => [
-            {
-              :reason => 'suspend',
-              :regexp => %r/Mailbox cannot be accessed/,
-            },
-          ],
-          %r/\A5[.]2[.]2\z/ => [
-            {
-              :reason => 'mailboxfull',
-              :regexp => %r/Mailbox full/,
-            },
-          ],
-          %r/\A5[.]2[.]3\z/ => [
-            {
-              :reason => 'exceedlimit',
-              :regexp => %r/Message too large/,
-            },
-          ],
-          %r/\A5[.]2[.]4\z/ => [
-            {
-              :reason => 'systemerror',
-              :regexp => %r/Mailing list expansion problem/,
-            },
-          ],
-          %r/\A5[.]3[.]3\z/ => [
-            {
-              :reason => 'systemfull',
-              :regexp => %r/Unrecognized command/,
-            },
-          ],
-          %r/\A5[.]3[.]4\z/ => [
-            {
-              :reason => 'mesgtoobig',
-              :regexp => %r/Message too big for system/,
-            },
-          ],
-          %r/\A5[.]3[.]5\z/ => [
-            {
-              :reason => 'systemerror',
-              :regexp => %r/System incorrectly configured/,
-            },
-          ],
-          %r/\A5[.]4[.]1\z/ => [
-            {
-              :reason => 'userunknown',
-              :regexp => %r/Recipient address rejected: Access denied/,
-            },
-          ],
-          %r/\A5[.]4[.][46]\z/ => [
-            {
-              :reason => 'networkerror',
-              :regexp => %r/(?:Invalid[ ]arguments|Routing[ ]loop[ ]detected)/x,
-            },
-          ],
-          %r/\A5[.]4[.]14\z/ => [
-            {
-              :reason => 'networkerror',
-              :regexp => %r/Hop[ ]count[ ]exceeded/x
-            },
-          ],
-          %r/\A5[.]5[.]2\z/ => [
-            {
-              :reason => 'syntaxerror',
-              :regexp => %r/Send hello first/,
-            },
-          ],
-          %r/\A5[.]5[.]3\z/ => [
-            {
-              :reason => 'syntaxerror',
-              :regexp => %r/Too many recipients/,
-            },
-          ],
-          %r/\A5[.]5[.]4\z/ => [
-            {
-              :reason => 'filtered',
-              :regexp => %r/Invalid domain name/,
-            },
-          ],
-          %r/\A5[.]5[.]6\z/ => [
-            {
-              :reason => 'contenterror',
-              :regexp => %r/Invalid message content/,
-            },
-          ],
-          %r/\A5[.]7[.][13]\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/(?:Delivery[ ]not[ ]authorized|Not[ ]Authorized)/x,
-            },
-          ],
-          %r/\A5[.]7[.]1\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/(?:Delivery[ ]not[ ]authorized|Client[ ]was[ ]not[ ]authenticated)/x,
-            },
-            {
-              :reason => 'norelaying',
-              :regexp => %r/Unable to relay/,
-            },
-          ],
-          %r/\A5[.]7[.]25\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/Access denied, the sending IPv6 address .+ must have a reverse DNS record/,
-            },
-          ],
-          %r/\A5[.]7[.]50[1-3]\z/ => [
-            {
-              :reason => 'spamdetected',
-              :regexp => %r/Access[ ]denied,[ ](?:spam[ ]abuse[ ]detected|banned[ ]sender)/x,
-            },
-          ],
-          %r/\A5[.]7[.]50[457]\z/ => [
-            {
-              :reason => 'filtered',
-              :regexp => %r{(?>
-                 Recipient[ ]address[ ]rejected:[ ]Access[ ]denied
-                |Access[ ]denied,[ ](?:banned[ ]recipient|rejected[ ]by[ ]recipient)
-                )
-              },
-            },
-          ],
-          %r/\A5[.]7[.]506\z/ => [
-            {
-              :reason => 'blocked',
-              :regexp => %r/Access Denied, Bad HELO/,
-            },
-          ],
-          %r/\A5[.]7[.]508\z/ => [
-            {
-              :reason => 'toomanyconn',
-              :regexp => %r/Access denied, .+ has exceeded permitted limits within .+ range/,
-            },
-          ],
-          %r/\A5[.]7[.]509\z/ => [
-            {
-              :reason => 'securityerror',
-              :regexp => %r/Access denied, sending domain .+ does not pass DMARC verification/,
-            },
-          ],
-          %r/\A5[.]7[.]510\z/ => [
-            {
-              :reason => 'notaccept',
-              :regexp => %r/Access denied, .+ does not accept email over IPv6/,
-            },
-          ],
-          %r/\A5[.]7[.]511\z/ => [
-            {
-              :reason => 'blocked',
-              :regexp => %r/Access denied, banned sender/,
-            },
-          ],
-          %r/\A5[.]7[.]512\z/ => [
-            {
-              :reason => 'contenterror',
-              :regexp => %r/Access denied, message must be RFC 5322 section 3[.]6[.]2 compliant/,
-            },
-          ],
-          %r/\A5[.]7[.]6\d{2}\z/ => [
-            {
-              :reason => 'blocked',
-              :regexp => %r/Access[ ]denied,[ ]banned[ ]sending[ ]IP[ ].+/,
-            },
-          ],
-          %r/\A5[.]7[.]7\d{2}\z/ => [
-            {
-              :reason => 'toomanyconn',
-              :regexp => %r/Access denied, tenant has exceeded threshold/,
-            },
+              { reason: 'rejected', string: ['Sender denied', 'Invalid address'] }
+          ],
+          %r/\A5[.]1[.][123]\z/ => [{
+              reason: 'userunknown',
+              string: [
+                  'Bad destination mailbox address',
+                  'Invalid X.400 address',
+                  'Invalid recipient address',
+              ]
+          }],
+          %r/\A5[.]4[.][46]\z/ => [{
+              reason: 'networkerror',
+              string: ['Invalid arguments', 'Routing loop detected'],
+          }],
+          %r/\A5[.]7[.][13]\z/ => [{
+              reason: 'securityerror',
+              string: ['Delivery not authorized', 'Not Authorized'],
+          }],
+          %r/\A5[.]7[.]50[1-3]\z/ => [{
+              reason: 'spamdetected',
+              string: ['Access denied, spam abuse detected', 'Access denied, banned sender'],
+          }],
+          %r/\A5[.]7[.]50[457]\z/ => [{
+              reason: 'filtered',
+              string: [
+                  'Recipient address rejected: Access denied',
+                  'Access denied, banned recipient',
+                  'Access denied, rejected by recipient'
+              ]
+          }],
+          %r/\A5[.]7[.]6\d\d\z/ => [
+              { reason: 'blocked', string: ['Access denied, banned sending IP '] }
+          ],
+          %r/\A5[.]7[.]7\d\d\z/ => [
+              { reason: 'toomanyconn', string: ['Access denied, tenant has exceeded threshold'] }
           ],
         }.freeze
-        MesgTable = {
+        MessagesOf = {
           # Copied and converted from Sisimai::Bite::Email::Exchange2007
-          :expired       => %r/QUEUE[.]Expired/,
-          :hostunknown   => %r/SMTPSEND[.]DNS[.]NonExistentDomain/,
-          :mesgtoobig    => %r/RESOLVER[.]RST[.]Recip(?:ient)?SizeLimit/,
-          :networkerror  => %r/SMTPSEND[.]DNS[.]MxLoopback/,
-          :rejected      => %r/RESOLVER[.]RST[.]NotAuthorized/,
-          :securityerror => %r/RESOLVER[.]RST[.]AuthRequired/,
-          :systemerror   => %r/RESOLVER[.]ADR[.](?:Ambiguous|BadPrimary|InvalidInSmtp)/,
-          :toomanyconn   => %r/RESOLVER[.]ADR[.]Recip(?:ient)?Limit/,
-          :userunknown   => %r/RESOLVER[.]ADR[.](?:Ex)?Recip(?:ient)?NotFound/,
+          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',
+            'RESOLVER.ADR.ExRecipientNotFound',
+          ],
         }.freeze
 
         # Detect bounce reason from Exchange Online
@@ -270,28 +119,48 @@ module Sisimai
           statusmesg = argvs.diagnosticcode
           reasontext = ''
 
-          CodeTable.each_key do |e|
-            # Try to match with each regular expression of delivery status codes
-            next unless statuscode =~ e
-            CodeTable[e].each do |f|
-              # Try to match with each regular expression of error messages
-              next unless statusmesg =~ f[:regexp]
+          StatusList.each_key do |e|
+            # Try to compare with each status code as a key
+            next unless statuscode == e
+            StatusList[e].each do |f|
+              # Try to compare with each string of error messages
+              next unless statusmesg.include?(f[:string])
               reasontext = f[:reason]
               break
             end
+            break if reasontext.size > 0
           end
 
           if reasontext.empty?
-            # D.S.N. included in the error message did not matched with any key
-            # in CodeTable
-            MesgTable.each_key do |e|
-              # Try to match with error messages defined in MesgTable
-              next unless statusmesg =~ MesgTable[e]
-              reasontext = e.to_s
-              break
+            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 if reasontext.size > 0
+              end
+              break if reasontext.size > 0
             end
-          end
 
+            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 if reasontext.size > 0
+              end
+            end
+          end
           return reasontext
         end