sisimai 4.22.5 → 4.22.6

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

@@ -15,10 +15,10 @@ module Sisimai::Bite::Email
             )
         /x,
       }.freeze
-      ReFailures = {
-        mailboxfull: %r/As their mailbox is full/,
-        norelaying:  %r/Due to the following SMTP relay error/,
-        hostunknown: %r/As the remote domain doesnt exist/,
+      MessagesOf = {
+        mailboxfull: ['As their mailbox is full'],
+        norelaying:  ['Due to the following SMTP relay error'],
+        hostunknown: ['As the remote domain doesnt exist'],
       }.freeze
 
       def description; return 'au by KDDI: http://www.au.kddi.com'; end
@@ -133,9 +133,9 @@ module Sisimai::Bite::Email
               e['reason'] = 'userunknown'
             else
               # SMTP command is not RCPT
-              ReFailures.each_key do |r|
+              MessagesOf.each_key do |r|
                 # Verify each regular expression of session errors
-                next unless e['diagnosis'] =~ ReFailures[r]
+                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end

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

@@ -17,25 +17,35 @@ module Sisimai::Bite::Email
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
       ].freeze
-      ReFailures = {
-        expired:     %r/(?:retry timeout exceeded|No action is required on your part)/,
-        userunknown: %r/user not found/,
-        hostunknown: %r{(?>
-             all[ ](?:
-                 host[ ]address[ ]lookups[ ]failed[ ]permanently
-                |relevant[ ]MX[ ]records[ ]point[ ]to[ ]non[-]existent[ ]hosts
-                )
-            |Unrouteable[ ]address
-            )
-        }x,
-        mailboxfull: %r/(?:mailbox is full:?|error: quota exceed)/,
-        notaccept:   %r{(?:
-             an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
-            |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
-            )
-        }x,
-        systemerror:  %r/(?:delivery to (?:file|pipe) forbidden|local delivery failed)/,
-        contenterror: %r/Too many ["]Received["] headers /,
+      MessagesOf = {
+        expired: [
+          'retry timeout exceeded',
+          'No action is required on your part',
+        ],
+        userunknown: ['user not found'],
+        hostunknown: [
+          'all host address lookups failed permanently',
+          'all relevant MX records point to non-existent hosts',
+          'Unrouteable address',
+        ],
+        mailboxfull: ['mailbox is full', 'error: quota exceed'],
+        notaccept: [
+          'an MX or SRV record indicated no SMTP service',
+          'no host found for existing SMTP connection',
+        ],
+        syntaxerror: [
+          'angle-brackets nested too deep',
+          'expected word or "<"',
+          'domain missing in source-routed address',
+          'malformed address:',
+        ],
+        systemerror: [
+          'delivery to file forbidden',
+          'delivery to pipe forbidden',
+          'local delivery failed',
+          'LMTP error after ',
+        ],
+        contenterror: ['Too many "Received" headers'],
       }.freeze
 
       def description; return '@mail.ru: https://mail.ru'; end
@@ -230,9 +240,9 @@ module Sisimai::Bite::Email
               e['reason'] = 'rejected'
             else
               # Verify each regular expression of session errors
-              ReFailures.each_key do |r|
+              MessagesOf.each_key do |r|
                 # Check each regular expression
-                next unless e['diagnosis'] =~ ReFailures[r]
+                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end

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

@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
       Indicators = Sisimai::Bite::Email.INDICATORS
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MarkingsOf = { rfc822: %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)! }.freeze
-      ReFailures = { hostunknown: %r|Illegal host/domain name found| }.freeze
+      MessagesOf = { hostunknown: ['Illegal host/domain name found'] }.freeze
 
       def description; return 'Oracle Communications Messaging Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -175,9 +175,9 @@ module Sisimai::Bite::Email
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

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

@@ -18,39 +18,59 @@ module Sisimai::Bite::Email
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
       ].freeze
-      ReFailures = {
-        userunknown: %r/user not found/,
-        hostunknown: %r{(?>
-             all[ ](?:
-                 host[ ]address[ ]lookups[ ]failed[ ]permanently
-                |relevant[ ]MX[ ]records[ ]point[ ]to[ ]non[-]existent[ ]hosts
-                )
-            |Unrouteable[ ]address
-            )
-        }x,
-        mailboxfull: %r/(?:mailbox is full:?|error: quota exceed)/,
-        notaccept:   %r{(?:
-             an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
-            |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
-            )
-        }x,
-        systemerror: %r{(?>
-             delivery[ ]to[ ](?:file|pipe)[ ]forbidden
-            |local[ ]delivery[ ]failed
-            |LMTP[ ]error[ ]after[ ]
-            )
-        }x,
-        contenterror: %r/Too many ["]Received["] headers/,
+      MessagesOf = {
+        # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
+        # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
+        userunknown: ['user not found'],
+        # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
+        # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
+        # route.c:1826|  uschar *message = US"Unrouteable address";
+        hostunknown: [
+          'all host address lookups failed permanently',
+          'all relevant MX records point to non-existent hosts',
+          'Unrouteable address',
+        ],
+        # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
+        # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
+        # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
+        mailboxfull: ['mailbox is full', 'error: quota exceed'],
+        # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
+        # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
+        notaccept: [
+          'an MX or SRV record indicated no SMTP service',
+          'no host found for existing SMTP connection',
+        ],
+        # parser.c:666| *errorptr = string_sprintf("%s (expected word or \"<\")", *errorptr);
+        # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
+        # parser.c:738| FAILED(US"domain missing in source-routed address");
+        # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
+        syntaxerror: [
+          'angle-brackets nested too deep',
+          'expected word or "<"',
+          'domain missing in source-routed address',
+          'malformed address:',
+        ],
+        # deliver.c:5614|  addr->message = US"delivery to file forbidden";
+        # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
+        # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
+        systemerror: [
+          'delivery to file forbidden',
+          'delivery to pipe forbidden',
+          'local delivery failed',
+          'LMTP error after ',
+        ],
+        # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
+        contenterror: ['Too many "Received" headers'],
       }.freeze
-      ReDelaying = %r{(?:
-         retry[ ]timeout[ ]exceeded
-        |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
-        |retry[ ]time[ ]not[ ]reached[ ]for[ ]any[ ]host[ ]after[ ]a[ ]long[ ]failure[ ]period
-        |all[ ]hosts[ ]have[ ]been[ ]failing[ ]for[ ]a[ ]long[ ]time[ ]and[ ]were[ ]last[ ]tried
-        |Delay[ ]reason:[ ]
-        |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival[ ]by[ ])
-        )
-      }x
+      DelayedFor = [
+        'retry timeout exceeded',
+        'No action is required on your part',
+        'retry time not reached for any host after a long failure period',
+        'all hosts have been failing for a long time and were last tried',
+        'Delay reason: ',
+        'has been frozen',
+        'was frozen on arrival by ',
+      ].freeze
 
       def description; return 'McAfee SaaS'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -209,16 +229,16 @@ module Sisimai::Bite::Email
               e['reason'] = 'blocked'
             else
               # Verify each regular expression of session errors
-              ReFailures.each_key do |r|
+              MessagesOf.each_key do |r|
                 # Check each regular expression
-                next unless e['diagnosis'] =~ ReFailures[r]
+                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end
 
               unless e['reason']
                 # The reason "expired"
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
+                e['reason'] = 'expired' if DelayedFor.find { |a| e['diagnosis'].include?(a) }
               end
             end
           end

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

@@ -11,13 +11,12 @@ module Sisimai::Bite::Email
         message: ['------- Failure Reasons '],
         rfc822:  ['------- Returned Message '],
       }.freeze
-      ReFailures = {
-        userunknown: %r{(?:
-           User[ ]not[ ]listed[ ]in[ ]public[ ]Name[ ][&][ ]Address[ ]Book
-          |ディレクトリのリストにありません
-          )
-        }x,
-        networkerror: %r/Message has exceeded maximum hop count/,
+      MessagesOf = {
+        userunknown: [
+          'User not listed in public Name & Address Book',
+          'ディレクトリのリストにありません',
+        ],
+        networkerror: ['Message has exceeded maximum hop count'],
       }.freeze
 
       def description; return 'Lotus Notes'; end
@@ -152,9 +151,9 @@ module Sisimai::Bite::Email
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Check each regular expression of Notes error messages
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
             e['status'] = pseudostatus if pseudostatus.size > 0

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

@@ -46,6 +46,9 @@ module Sisimai::Bite::Email
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
       }.freeze
+      ReCommands = {
+        RCPT: %r/unknown recipient or mailbox unavailable ->.+[<].+[@].+[>]/,
+      }.freeze
 
       def description; return 'Microsoft Office 365: http://office.microsoft.com/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -143,9 +146,9 @@ module Sisimai::Bite::Email
             next if e.empty?
 
             # kijitora@example.com<mailto:kijitora@example.com>
-            # The email address wasn=92t found at the destination domain. It might be mis=
-            # spelled or it might not exist any longer. Try retyping the address and rese=
-            # nding the message.
+            # The email address wasn't found at the destination domain. It might
+            # be misspelled or it might not exist any longer. Try retyping the
+            # address and resending the message.
             v = dscontents[-1]
 
             if cv = e.match(/\A.+[@].+[<]mailto:(.+[@].+)[>]\z/)
@@ -231,6 +234,13 @@ module Sisimai::Bite::Email
             pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
             e['status'] = pseudostatus if pseudostatus.size > 0
           end
+
+          ReCommands.each_key do |p|
+            # Try to match with regular expressions defined in ReCommands
+            next unless e['diagnosis'] =~ ReCommands[p]
+            e['command'] = p.to_s
+            break
+          end
           next unless e['status']
 
           StatusList.each_key do |f|

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

@@ -36,31 +36,33 @@ module Sisimai::Bite::Email
         message: ['    This is the MAILER-DAEMON, please DO NOT REPLY to this '],
         rfc822:  ['    Below is a copy of the original message:'],
       }.freeze
-      ReFailures = {
+      MessagesOf = {
         # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
-        expired: %r/Envelope expired/,
+        expired: ['Envelope expired'],
         # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
         # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
-        hostunknown: %r/(?:Invalid domain name|Domain does not exist)/,
+        hostunknown: [
+          'Invalid domain name',
+          'Domain does not exist',
+        ],
         # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
-        notaccept: %r/Destination seem to reject all mails/,
+        notaccept: ['Destination seem to reject all mails'],
         #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
-        networkerror: %r{(?>
-           Address[ ]family[ ]mismatch[ ]on[ ]destination[ ]MXs
-          |All[ ]routes[ ]to[ ]destination[ ]blocked
-          |bad[ ]DNS[ ]lookup[ ]error[ ]code
-          |Could[ ]not[ ]retrieve[ ]source[ ]address
-          |Loop[ ]detected
-          |Network[ ]error[ ]on[ ]destination[ ]MXs
-          |No[ ](?>
-             MX[ ]found[ ]for[ ](?:domain|destination)
-            |valid[ ]route[ ]to[ ](?:remote[ ]MX|destination)
-            )
-          |Temporary[ ]failure[ ]in[ ]MX[ ]lookup
-          )
-        }x,
+        networkerror: [
+          'Address family mismatch on destination MXs',
+          'All routes to destination blocked',
+          'bad DNS lookup error code',
+          'Could not retrieve source address',
+          'Loop detected',
+          'Network error on destination MXs',
+          'No MX found for domain',
+          'No MX found for destination',
+          'No valid route to remote MX',
+          'No valid route to destination',
+          'Temporary failure in MX lookup',
+        ],
         # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
-        securityerror: %r/Could not retrieve credentials/,
+        securityerror: ['Could not retrieve credentials'],
       }.freeze
 
       def description; return 'OpenSMTPD'; end
@@ -156,9 +158,9 @@ module Sisimai::Bite::Email
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

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

@@ -12,9 +12,9 @@ module Sisimai::Bite::Email
         message: ['This is an automatically generated Delivery Status Notification'],
         rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      ReFailures = {
-        hostunknown: %r/The mail could not be delivered to the recipient because the domain is not reachable/,
-        userunknown: %r/Requested action not taken: mailbox unavailable/,
+      MessagesOf = {
+        hostunknown: ['The mail could not be delivered to the recipient because the domain is not reachable'],
+        userunknown: ['Requested action not taken: mailbox unavailable'],
       }.freeze
 
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
@@ -177,9 +177,9 @@ module Sisimai::Bite::Email
             end
           end
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

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

@@ -50,62 +50,53 @@ module Sisimai::Bite::Email
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )
       }x
-      ReLDAP = {
-        # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        suspend:     %r/Mailaddress is administrative?le?y disabled/,            # 5.2.1
-        userunknown: %r/[Ss]orry, no mailbox here by that name/,                 # 5.1.1
-        exceedlimit: %r/The message exeeded the maximum size the user accepts/,  # 5.2.3
-        systemerror: %r{(?>
-           Automatic[ ]homedir[ ]creator[ ]crashed                    # 4.3.0
-          |Illegal[ ]value[ ]in[ ]LDAP[ ]attribute                    # 5.3.5
-          |LDAP[ ]attribute[ ]is[ ]not[ ]given[ ]but[ ]mandatory      # 5.3.5
-          |Timeout[ ]while[ ]performing[ ]search[ ]on[ ]LDAP[ ]server # 4.4.3
-          |Too[ ]many[ ]results[ ]returned[ ]but[ ]needs[ ]to[ ]be[ ]unique # 5.3.5
-          |Permanent[ ]error[ ]while[ ]executing[ ]qmail[-]forward    # 5.4.4
-          |Temporary[ ](?:
-             error[ ](?:
-               in[ ]automatic[ ]homedir[ ]creation            # 4.3.0 or 5.3.0
-              |while[ ]executing[ ]qmail[-]forward            # 4.4.4
-              )
-            |failure[ ]in[ ]LDAP[ ]lookup                       # 4.4.3
-            )
-          |Unable[ ]to[ ](?:
-             contact[ ]LDAP[ ]server                            # 4.4.3
-            |login[ ]into[ ]LDAP[ ]server,[ ]bad[ ]credentials  # 4.4.3
-            )
-          )
-        }x,
-      }.freeze
 
       # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-      ReDelaying = %r/this message has been in the queue too long[.]\z/
+      HasExpired = 'this message has been in the queue too long.'
       ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4}) /
       ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
-      ReFailures = {
+      FailOnLDAP = {
+        # qmail-ldap-1.03-20040101.patch:19817 - 19866
+        suspend:     ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
+        userunknown: ['Sorry, no mailbox here by that name'],           # 5.1.1
+        exceedlimit: ['The message exeeded the maximum size the user accepts'], # 5.2.3
+        systemerror: [
+            'Automatic homedir creator crashed',                # 4.3.0
+            'Illegal value in LDAP attribute',                  # 5.3.5
+            'LDAP attribute is not given but mandatory',        # 5.3.5
+            'Timeout while performing search on LDAP server',   # 4.4.3
+            'Too many results returned but needs to be unique', # 5.3.5
+            'Permanent error while executing qmail-forward',    # 5.4.4
+            'Temporary error in automatic homedir creation',    # 4.3.0 or 5.3.0
+            'Temporary error while executing qmail-forward',    # 4.4.4
+            'Temporary failure in LDAP lookup',                 # 4.4.3
+            'Unable to contact LDAP server',                    # 4.4.3
+            'Unable to login into LDAP server, bad credentials',# 4.4.3
+        ],
+      }.freeze
+      MessagesOf = {
         # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        userunknown: %r/(?:no mailbox here by that name| does not like recipient[.])/,
+        userunknown: ['no mailbox here by that name', 'does not like recipient.'],
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        mailboxfull: %r/disk quota exceeded/,
+        mailboxfull: ['disk quota exceeded'],
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        mesgtoobig: %r/Message size exceeds fixed maximum message size:/,
+        mesgtoobig:  ['Message size exceeds fixed maximum message size:'],
         # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
         # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        hostunknown: %r/\ASorry, I couldn't find any host /,
-        systemfull:  %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
-        systemerror: %r{(?>
-           bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
-          |system[ ]error
-          |Unable[ ]to\b
-          )
-        }x,
-        networkerror: %r{Sorry(?:
-           [,][ ]I[ ]wasn[']t[ ]able[ ]to[ ]establish[ ]an[ ]SMTP[ ]connection
-          |[,][ ]I[ ]couldn[']t[ ]find[ ]a[ ]mail[ ]exchanger[ ]or[ ]IP[ ]address
-          |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]or[ ]A[ ]for[ ]that[ ]host
-          )
-        }x,
+        hostunknown: ["Sorry, I couldn't find any host "],
+        systemfull:  ['Requested action not taken: mailbox unavailable (not enough free space)'],
+        systemerror: [
+          'bad interpreter: No such file or directory',
+          'system error',
+          'Unable to',
+        ],
+        networkerror: [
+          "Sorry, I wasn't able to establish an SMTP connection",
+          "Sorry, I couldn't find a mail exchanger or IP address",
+          "Sorry. Although I'm listed as a best-preference MX or A for that host",
+        ],
       }.freeze
 
       def description; return 'qmail'; end
@@ -246,31 +237,31 @@ module Sisimai::Bite::Email
               # Sisimai::Reason::* modules
               e['reason'] = 'onhold'
             else
-              ReFailures.each_key do |r|
+              MessagesOf.each_key do |r|
                 # Verify each regular expression of session errors
                 if e['alterrors']
                   # Check the value of "alterrors"
-                  next unless e['alterrors'] =~ ReFailures[r]
+                  next unless MessagesOf[r].find { |a| e['alterrors'].include?(a) }
                   e['reason'] = r.to_s
                 end
                 break if e['reason']
 
-                next unless e['diagnosis'] =~ ReFailures[r]
+                next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
                 e['reason'] = r.to_s
                 break
               end
 
               unless e['reason']
-                ReLDAP.each_key do |r|
+                FailOnLDAP.each_key do |r|
                   # Verify each regular expression of LDAP errors
-                  next unless e['diagnosis'] =~ ReLDAP[r]
+                  next unless FailOnLDAP[r].find { |a| e['diagnosis'].include?(a) }
                   e['reason'] = r.to_s
                   break
                 end
               end
 
               unless e['reason']
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
+                e['reason'] = 'expired' if e['diagnosis'].include?(HasExpired)
               end
             end
           end