sisimai 5.6.0-java → 5.7.1-java

data/lib/sisimai/lhost/dragonfly.rb

@@ -14,23 +14,6 @@ module Sisimai::Lhost
         # https://github.com/corecode/dma/blob/ffad280aa40c242aa9a2cb9ca5b1b6e8efedd17e/mail.c#L84
         message: ['This is the DragonFly Mail Agent '],
       }.freeze
-      MessagesOf = {
-        'expired' => [
-          # https://github.com/corecode/dma/blob/master/dma.c#L370C1-L374C19
-          # dma.c:370| if (gettimeofday(&now, NULL) == 0 &&
-          # dma.c:371|     (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
-          # dma.c:372|     snprintf(errmsg, sizeof(errmsg),
-          # dma.c:373|          "Could not deliver for the last %d seconds. Giving up.",
-          # dma.c:374|          MAX_TIMEOUT);
-          # dma.c:375|     goto bounce;
-          # dma.c:376| }
-          'Could not deliver for the last ',
-        ],
-        'hostunknown' => [
-          # net.c:663| snprintf(errmsg, sizeof(errmsg), "DNS lookup failure: host %s not found", host);
-          'DNS lookup failure: host ',
-        ],
-      }.freeze
 
       # @abstract Decodes the bounce message from DMA: DragonFly Mail Agent
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -92,16 +75,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
-        end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'DragonFly'; end

data/lib/sisimai/lhost/einsundeins.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module EinsUndEins
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -11,7 +12,6 @@ module Sisimai::Lhost
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
       }.freeze
-      MessagesOf = {'emailtoolarge' => ['Mail size limit exceeded']}.freeze
 
       # @abstract Decode the bounce message from 1&1
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -90,22 +90,14 @@ module Sisimai::Lhost
             p1 = e['diagnosis'].index('host: ')
             p2 = e['diagnosis'].index(' reason:')
 
-            e['rhost']   = Sisimai::String.sweep(e['diagnosis'][p1 + 6, p2 - p1 - 6])
-            e['command'] = 'DATA' if e['diagnosis'].include?('for TEXT command')
-            e['spec']    = 'SMTP' if e['diagnosis'].include?('SMTP error')
+            e['rhost']   = e['diagnosis'][p1 + 6, p2 - p1 - 6]
+            e['command'] = Sisimai::Eb::CeDATA if e['diagnosis'].include?('for TEXT command')
+            e['spec']    = 'SMTP'              if e['diagnosis'].include?('SMTP error')
             e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
           else
             # For the following reason:
             e['diagnosis'][0, StartingOf[:error][0].size] = ''
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          MessagesOf.each_key do |r|
-            # Verify each regular expression of session errors
-            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r
-            break
-          end
         end
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/exchange2003.rb

@@ -4,6 +4,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Exchange2003
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -13,29 +14,29 @@ module Sisimai::Lhost
         error:   ['did not reach the following recipient(s):'],
       }.freeze
       ErrorCodes = {
-        'onhold' => [
+        Sisimai::Eb::Re___1 => [
           '000B099C', # Host Unknown, Message exceeds size limit, ...
           '000B09AA', # Unable to relay for, Message exceeds size limit,...
           '000B09B6', # Error messages by remote MTA
         ],
-        'userunknown' => [
+        Sisimai::Eb::ReUSER => [
           '000C05A6', # Unknown Recipient,
         ],
-        'systemerror' => [
+        Sisimai::Eb::RePROC => [
           '00010256', # Too many recipients.
           '000D06B5', # No proxy for recipient (non-smtp mail?)
         ],
-        'networkerror' => [
+        Sisimai::Eb::ReINET => [
           '00120270', # Too Many Hops
         ],
-        'contenterror' => [
+        Sisimai::Eb::ReBODY => [
           '00050311', # Conversion to Internet format failed
           '000502CC', # Conversion to Internet format failed
         ],
-        'securityerror' => [
+        Sisimai::Eb::ReSAFE => [
           '000B0981', # 502 Server does not support AUTH
         ],
-        'filtered' => [
+        Sisimai::Eb::ReFILT => [
           '000C0595', # Ambiguous Recipient
         ],
       }.freeze
@@ -158,19 +159,20 @@ module Sisimai::Lhost
             #  Subject: ...
             #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
             #
-            if e.start_with?('  To: ') || e.start_with?('      To: ')
+            case
+            when e.start_with?('  To: ', '      To: ')
               #  To:      shironeko@example.jp
               next if connheader['to'].empty? == false
               connheader['to'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
-            elsif e.start_with?('      Subject: ') || e.start_with?('  Subject: ')
+            when e.start_with?('      Subject: ', '  Subject: ')
               #  Subject: ...
               next if connheader['subject'].empty? == false
               connheader['subject'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
-            elsif e.start_with?('  Sent: ') || e.start_with?('      Sent: ')
+            when e.start_with?('  Sent: ', '      Sent: ')
               #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
               #  Sent:    4/29/99 9:19:59 AM
               next if connheader['date'].empty? == false
@@ -207,7 +209,6 @@ module Sisimai::Lhost
 
             # Copy alternative error message
             e['diagnosis'] = "#{e['alterrors']} #{e['diagnosis']}"
-            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
         end

data/lib/sisimai/lhost/exchange2007.rb

@@ -4,6 +4,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Exchange2007
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -32,19 +33,19 @@ module Sisimai::Lhost
         ]
       }.freeze
       NDRSubject = {
-        "SMTPSEND.DNS.NonExistentDomain" => "hostunknown",   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
-        "SMTPSEND.DNS.MxLoopback"        => "networkerror",  # 554 5.4.4 SMTPSEND.DNS.MxLoopback
-        "RESOLVER.ADR.BadPrimary"        => "systemerror",   # 550 5.2.0 RESOLVER.ADR.BadPrimary
-        "RESOLVER.ADR.RecipNotFound"     => "userunknown",   # 550 5.1.1 RESOLVER.ADR.RecipNotFound
-        "RESOLVER.ADR.RecipientNotFound" => "userunknown",   # 550 5.1.1 RESOLVER.ADR.RecipientNotFound
-        "RESOLVER.ADR.ExRecipNotFound"   => "userunknown",   # 550 5.1.1 RESOLVER.ADR.ExRecipNotFound
-        "RESOLVER.ADR.RecipLimit"        => "ratelimited",   # 550 5.5.3 RESOLVER.ADR.RecipLimit
-        "RESOLVER.ADR.InvalidInSmtp"     => "systemerror",   # 550 5.1.0 RESOLVER.ADR.InvalidInSmtp
-        "RESOLVER.ADR.Ambiguous"         => "systemerror",   # 550 5.1.4 RESOLVER.ADR.Ambiguous, 420 4.2.0 RESOLVER.ADR.Ambiguous
-        "RESOLVER.RST.AuthRequired"      => "securityerror", # 550 5.7.1 RESOLVER.RST.AuthRequired
-        "RESOLVER.RST.NotAuthorized"     => "rejected",      # 550 5.7.1 RESOLVER.RST.NotAuthorized
-        "RESOLVER.RST.RecipSizeLimit"    => "emailtoolarge", # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
-        "QUEUE.Expired"                  => "expired",       # 550 4.4.7 QUEUE.Expired
+        "SMTPSEND.DNS.NonExistentDomain" => Sisimai::Eb::ReHOST, # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
+        "SMTPSEND.DNS.MxLoopback"        => Sisimai::Eb::ReINET, # 554 5.4.4 SMTPSEND.DNS.MxLoopback
+        "RESOLVER.ADR.BadPrimary"        => Sisimai::Eb::RePROC, # 550 5.2.0 RESOLVER.ADR.BadPrimary
+        "RESOLVER.ADR.RecipNotFound"     => Sisimai::Eb::ReUSER, # 550 5.1.1 RESOLVER.ADR.RecipNotFound
+        "RESOLVER.ADR.RecipientNotFound" => Sisimai::Eb::ReUSER, # 550 5.1.1 RESOLVER.ADR.RecipientNotFound
+        "RESOLVER.ADR.ExRecipNotFound"   => Sisimai::Eb::ReUSER, # 550 5.1.1 RESOLVER.ADR.ExRecipNotFound
+        "RESOLVER.ADR.RecipLimit"        => Sisimai::Eb::ReRATE, # 550 5.5.3 RESOLVER.ADR.RecipLimit
+        "RESOLVER.ADR.InvalidInSmtp"     => Sisimai::Eb::RePROC, # 550 5.1.0 RESOLVER.ADR.InvalidInSmtp
+        "RESOLVER.ADR.Ambiguous"         => Sisimai::Eb::RePROC, # 550 5.1.4 RESOLVER.ADR.Ambiguous, 420 4.2.0 RESOLVER.ADR.Ambiguous
+        "RESOLVER.RST.AuthRequired"      => Sisimai::Eb::ReSAFE, # 550 5.7.1 RESOLVER.RST.AuthRequired
+        "RESOLVER.RST.NotAuthorized"     => Sisimai::Eb::ReFROM, # 550 5.7.1 RESOLVER.RST.NotAuthorized
+        "RESOLVER.RST.RecipSizeLimit"    => Sisimai::Eb::ReSIZE, # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
+        "QUEUE.Expired"                  => Sisimai::Eb::ReTIME, # 550 4.4.7 QUEUE.Expired
       }.freeze
       MailSender = ["postmaster@outlook.com", ".onmicrosoft.com"].freeze
       EmailTitle = [
@@ -64,7 +65,9 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         proceedsto  = 0
         proceedsto += 1 if EmailTitle.any? { |a| mhead["subject"].include?(a) }
-        proceedsto += 1 if MailSender.any? { |a| mhead["from"].include?(a) }
+        proceedsto += 1 if MailSender.any? { |a| mhead["from"].include?(a)    }
+        proceedsto += 1 if StartingOf[:error].any?   { |a| mbody.include?(a)  }
+        proceedsto += 1 if StartingOf[:message].any? { |a| mbody.include?(a)  }
         proceedsto += 1 if mhead["content-language"]
         return nil if proceedsto < 2
 
@@ -150,9 +153,6 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          # Tidy up the error message in $e->{'diagnosis'}, Try to detect the bounce reason.
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
-
           p0 = -1; StartingOf[:error].each do |r|
             # Try to find the NDR subject string such as "RESOLVER.ADR.RecipientNotFound" from the
             # error message

data/lib/sisimai/lhost/exim.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Exim
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/rfc1894'
 
@@ -60,69 +61,25 @@ module Sisimai::Lhost
       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");
-        # 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",
-        ],
+        Sisimai::Eb::ReUSER => ["user not found"],
         # 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" => [
+        Sisimai::Eb::ReCOMM => [
           "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
       DelayedFor = [
-        # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
-        # deliver.c:7475|  "No action is required on your part. Delivery attempts will continue for\n"
-        # smtp.c:3508|  US"retry time not reached for any host after a long failure period" :
-        # smtp.c:3508|  US"all hosts have been failing for a long time and were last tried "
-        #                 "after this message arrived";
-        # deliver.c:7459|  print_address_error(addr, f, US"Delay reason: ");
-        # deliver.c:7586|  "Message %s has been frozen%s.\nThe sender is <%s>.\n", message_id,
-        # receive.c:4021|  moan_tell_someone(freeze_tell, NULL, US"Message frozen on arrival",
-        # receive.c:4022|  "Message %s was frozen on arrival by %s.\nThe sender is <%s>.\n",
-        "retry timeout exceeded",
+        # deliver.c:7475| "No action is required on your part. Delivery attempts will continue for\n"
+        # smtp.c:3508|    US"retry time not reached for any host after a long failure period" :
+        # deliver.c:7459| print_address_error(addr, f, US"Delay reason: ");
         "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
 
       # @abstract Decodes the bounce message from Exim
@@ -133,6 +90,8 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
         # X-Failed-Recipients: kijitora@example.ed.jp
+        return nil if Sisimai::Lhost.BannerDTAG.any? { |a| mbody.include?(a) }
+
         thirdparty = false
         proceedsto = 0
         messageidv = mhead["message-id"] || ""
@@ -255,7 +214,7 @@ module Sisimai::Lhost
                 # parser.c:749|   goto PARSE_FAILED;
                 # parser.c:750|   }
                 cv = Sisimai::Address.s3s4(e[p1, p2 - p1 - 1])
-                v["diagnosis"] = Sisimai::String.sweep(e[p2 + 1, e.size])
+                v["diagnosis"] = e[p2 + 1, e.size]
               else
                 # There is an email address only in the line
                 #   kijitora@example.jp
@@ -288,7 +247,8 @@ module Sisimai::Lhost
                 # "e" matched with any field defined in RFC3464
                 next unless o = Sisimai::RFC1894.field(e)
 
-                if o[3] == "addr"
+                case o[3]
+                when "addr"
                   # Final-Recipient: rfc822; kijitora@example.jp
                   # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                   next if o[0] != "final-recipient"
@@ -296,7 +256,7 @@ module Sisimai::Lhost
                     v["spec"] = o[2].include?('@') ? "SMTP" : "X-UNIX"
                   end
 
-                elsif o[3] == "code"
+                when "code"
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v["spec"] = o[1].upcase
                   v["diagnosis"] = o[2]
@@ -341,24 +301,22 @@ module Sisimai::Lhost
               q["recipient"] = q["alias"]
             end
           end
-        else
+        elsif mhead["x-failed-recipients"]
           # Fallback for getting recipient addresses
-          if mhead["x-failed-recipients"]
-            # X-Failed-Recipients: kijitora@example.jp
-            rcptinhead = mhead["x-failed-recipients"].split(",")
-            rcptinhead.each do |e|
-              # Remove space characters
-              e.lstrip!
-              e.rstrip!
-            end
-            recipients = rcptinhead.size
+          # X-Failed-Recipients: kijitora@example.jp
+          rcptinhead = mhead["x-failed-recipients"].split(",")
+          rcptinhead.each do |e|
+            # Remove space characters
+            e.lstrip!
+            e.rstrip!
+          end
+          recipients = rcptinhead.size
 
-            while e = rcptinhead.shift do
-              # Insert each recipient address into dscontents
-              dscontents[-1]["recipient"] = e
-              next if dscontents.size == recipients
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-            end
+          while e = rcptinhead.shift do
+            # Insert each recipient address into dscontents
+            dscontents[-1]["recipient"] = e
+            next if dscontents.size == recipients
+            dscontents << Sisimai::Lhost.DELIVERYSTATUS
           end
         end
         return nil if recipients == 0
@@ -406,7 +364,7 @@ module Sisimai::Lhost
             end
             e.delete("alterrors")
           end
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"]) || ""; p1 = e["diagnosis"].index("__") || -1
+          p1 = e["diagnosis"].index("__") || -1
           e["diagnosis"] = e["diagnosis"][0, p1] if p1 > 1
 
           if e["rhost"].empty?
@@ -429,14 +387,11 @@ module Sisimai::Lhost
             end
 
             # Detect the reason of bounce
-            if %w[HELO EHLO].index(e["command"])
-              # HELO | Connected to 192.0.2.135 but my name was rejected.
-              e["reason"] = "blocked"
-
-            elsif e["command"] == "MAIL"
-              # MAIL | Connected to 192.0.2.135 but sender was rejected.
-              e["reason"] = "onhold"
-
+            case e["command"]
+              # - HELO | Connected to 192.0.2.135 but my name was rejected.
+              # - MAIL | Connected to 192.0.2.135 but sender was rejected.
+              when Sisimai::Eb::CeHELO, Sisimai::Eb::CeEHLO then e["reason"] = Sisimai::Eb::ReBLOC
+              when Sisimai::Eb::CeMAIL                      then e["reason"] = Sisimai::Eb::Re___1
             else
               # Try to match the error message with each message pattern 
               MessagesOf.each_key do |r|
@@ -447,9 +402,7 @@ module Sisimai::Lhost
               end
 
               if e["reason"].empty?
-                # The reason "expired", or "mailererror"
-                e["reason"] = "expired" if DelayedFor.any? { |a| e["diagnosis"].include?(a) }
-                e["reason"] = "mailererror" if e["reason"].empty? && e["diagnosis"].include?("pipe to |")
+                e["reason"] = Sisimai::Eb::ReTIME if DelayedFor.any? { |a| e["diagnosis"].include?(a) }
               end
             end
           end
@@ -468,7 +421,7 @@ module Sisimai::Lhost
           re = e["reason"]
           cv = ""
 
-          if Sisimai::SMTP::Failure.is_temporary(cr) || re == "expired" || re == "mailboxfull"
+          if Sisimai::SMTP::Failure.is_temporary(cr) || re == Sisimai::Eb::ReTIME
             # Set the pseudo status code as a temporary error
             cv = Sisimai::SMTP::Status.code(re, true) if Sisimai::Reason.is_explicit(re)
           end

data/lib/sisimai/lhost/ezweb.rb

@@ -3,27 +3,18 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module EZweb
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ["--------------------------------------------------", "Content-Type: message/rfc822"].freeze
       StartingOf = {message: ['The user(s) ', 'Your message ', 'Each of the following', '<']}.freeze
-      Messagesof = {
-        # notaccept: ['The following recipients did not receive this message:'],
-        'expired' => [
-          # Your message was not delivered within 0 days and 1 hours.
-          # Remote host is not responding.
-          'Your message was not delivered within ',
-        ],
-        'mailboxfull' => ['The user(s) account is temporarily over quota'],
-        'onhold'  => ['Each of the following recipients was rejected by a remote mail server'],
-        'suspend' => [
-          # http://www.naruhodo-au.kddi.com/qa3429203.html
-          # The recipient may be unpaid user...?
-          'The user(s) account is disabled.',
-          'The user(s) account is temporarily limited.',
-        ],
-      }.freeze
+      UnpaidUser = [
+        # http://www.naruhodo-au.kddi.com/qa3429203.html
+        # The recipient may be unpaid user...?
+        'The user(s) account is disabled.',
+        'The user(s) account is temporarily limited.',
+      ].freeze
 
       # @abstract Decodes the bounce message from au EZweb
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -48,7 +39,6 @@ module Sisimai::Lhost
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        substrings = []; Messagesof.each_value { |a| substrings << a }; substrings.flatten!
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -94,57 +84,31 @@ module Sisimai::Lhost
 
           else
             # Other error messages
+            #    >>> RCPT TO:<******@ezweb.ne.jp>
+            #    <<< 550 ...
             next if Sisimai::String.is_8bit(e)
-            if e.include?(" >>> ")
-              #    >>> RCPT TO:<******@ezweb.ne.jp>
-              v["command"]    = Sisimai::SMTP::Command.find(e)
-              v["diagnosis"] += " #{e}"
-
-            elsif e.include?(" <<< ")
-              #    <<< 550 ...
-              v["diagnosis"] += " #{e}"
-
-            else
-              # Check error message
-              isincluded = false
-              if substrings.any? { |a| e.include?(a) }
-                # Check with regular expressions of each error
-                v["diagnosis"] += " #{e}"
-                isincluded = true
-              end
-              v["diagnosis"] += " #{e}" if isincluded
-            end
+            v["command"]    = Sisimai::SMTP::Command.find(e) if e.include?(" >>> ")
+            v["diagnosis"] += " #{e}"
           end
         end
         return nil if recipients == 0
 
         dscontents.each do |e|
           # Check each value of DeliveryMatter{}, try to detect the bounce reason.
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = e['diagnosis'].split.join(" ")
           e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
 
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # Filtered recipient returns message that include 'X-SPASIGN' header
-            e['reason'] = 'filtered'
-            e['toxic']  = true
+            e['reason'] = Sisimai::Eb::ReFILT
           else
             # There is no X-SPASIGN header or the value of the header is not "NG"
-            catch :FINDREASON do
-              Messagesof.each_key do |r|
-                # Try to match with each session error message
-                Messagesof[r].each do |f|
-                  # Check each error message pattern
-                  next if e['diagnosis'].include?(f) == false
-                  e['reason'] = r
-                  throw :FINDREASON
-                end
-              end
-            end
+            e['reason'] = Sisimai::Eb::ReQUIT if UnpaidUser.any? { |a| e['diagnosis'].include?(a) }
           end
           next if e['reason'] != ""
           next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')
-          e["reason"] = "userunknown" if e["diagnosis"].start_with?("<")
+          e["reason"] = Sisimai::Eb::ReUSER if e["diagnosis"].start_with?("<")
         end
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/fml.rb

@@ -3,39 +3,25 @@ module Sisimai::Lhost
   # https://www.fml.org/. Methods in the module are called from only Sisimai::Message.
   module FML
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Original mail as follows:'].freeze
       ErrorTitle = {
-        'rejected' => [
+        Sisimai::Eb::ReFROM => [
           ' are not member',
           'NOT MEMBER article from ',
           'reject mail ',
           'Spam mail from a spammer is rejected',
         ],
-        'systemerror' => [
+        Sisimai::Eb::RePROC => [
           'fml system error message',
           'Loop Alert: ',
           'Loop Back Warning: ',
           'WARNING: UNIX FROM Loop',
         ],
-        'securityerror' => ['Security Alert'],
-      }.freeze
-      ErrorTable = {
-        'rejected' => [
-          ' header may cause mail loop',
-          'NOT MEMBER article from ',
-          'reject mail from ',
-          'reject spammers:',
-          'You are not a member of this mailing list',
-        ],
-        'notcompliantrfc' => ['Duplicated Message-ID'],
-        'securityerror' => ['Security alert:'],
-        'systemerror' => [
-          ' has detected a loop condition so that',
-          'Loop Back Warning:',
-        ],
+        Sisimai::Eb::ReSAFE => ['Security Alert'],
       }.freeze
 
       # @abstract Decodes the bounce message from fml mailling list server/manager
@@ -84,23 +70,13 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          ErrorTable.each_key do |f|
-            # Try to match with error messages defined in ErrorTable
-            next if ErrorTable[f].none? { |a| e['diagnosis'].include?(a) }
+          # Error messages in the message body did not matched
+          ErrorTitle.each_key do |f|
+            # Try to match with the Subject string
+            next if ErrorTitle[f].none? { |a| mhead["subject"].include?(a) }
             e['reason'] = f
             break
           end
-
-          if e['reason'].nil?
-            # Error messages in the message body did not matched
-            ErrorTitle.each_key do |f|
-              # Try to match with the Subject string
-              next if ErrorTitle[f].none? { |a| mhead["subject"].include?(a) }
-              e['reason'] = f
-              break
-            end
-          end
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }