sisimai 5.6.0-java → 5.7.0-java

data/lib/sisimai/lhost/courier.rb

@@ -72,7 +72,8 @@ module Sisimai::Lhost
             next unless o = Sisimai::RFC1894.field(e)
             v = dscontents[-1]
 
-            if o[3] == 'addr'
+            case o[3]
+            when "addr"
               # Final-Recipient: rfc822; kijitora@example.jp
               # X-Actual-Recipient: rfc822; kijitora@example.co.jp
               if o[0] == 'final-recipient'
@@ -88,7 +89,7 @@ module Sisimai::Lhost
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 v['alias'] = o[2]
               end
-            elsif o[3] == 'code'
+            when "code"
               # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
               v['spec'] = o[1]
               v['diagnosis'] = o[2]
@@ -116,7 +117,7 @@ module Sisimai::Lhost
               # Continued line of the value of Diagnostic-Code field
               next if readslices[-2].start_with?('Diagnostic-Code:') == false
               next if e.start_with?(' ') == false
-              v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
+              v['diagnosis'] += " " + e
               readslices[-1]  = "Diagnostic-Code: #{e}"
             end
           end
@@ -127,7 +128,7 @@ module Sisimai::Lhost
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['command']   = thecommand if e["command"].empty?
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
+          e['diagnosis'] = e['diagnosis'] || ''
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors

data/lib/sisimai/lhost/deutschetelekom.rb

@@ -0,0 +1,120 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::DeutscheTelekom decodes a bounce email which created by Deutsche Telekom or
+  # T-Online. Methods in the module are called from only Sisimai::Message.
+  module DeutscheTelekom
+    class << self
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      BannerDTAG = Sisimai::Lhost.BannerDTAG
+      StartingOf = { message: [BannerDTAG[1]] }.freeze
+
+      # @abstract Decodes the bounce message from DeutscheTelekom
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to decode or the arguments are missing
+      def inquire(mhead, mbody)
+        # - T-Online: https://www.t-online.de/, @t-online.de, @magenta.de
+        # - DeutscheTelekom: https://www.telekom.com/
+        #   - Based on the bounce format of Smail 3, the original design model for Exim
+        #   - Tailored for Deutsche Telekom's internal Smail 3 fork with custom banners
+        #   - Module name follows the infrastructure owner for cross-language compatibility
+        # - Smail 3: http://www.weird.com/~woods/projects/smail.html
+        return nil unless BannerDTAG.any? { |a| mbody.include?(a) }
+
+        # smail-3.2.0.108/src/
+        #  notify.c:1052|(void) fprintf(f, "Subject: mail failed, %s\nReference: <%s@%s>\n\n",
+        #  notify.c:1053|       subject_to, message_id, primary_name);
+        # 
+        # T-Online specific headers
+        #   Received: from mailin42.aul.t-online.de (mailin42.aul.t-online.de [192.51.100.1])
+        #     by mailout11.t-online.de (Postfix) with SMTP id 05E5A1CAC0
+        #   From: Mail Delivery System <Mailer-Daemon@t-online.de>
+        #   X-TOI-MSGID: c9412855-531f-497b-b007-5ffc033877a0
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
+        emailparts = Sisimai::RFC5322.part(mbody, [BannerDTAG[3], BannerDTAG[2]])
+        bodyslices = emailparts[0].split("\n")
+        messagelog = ''
+        readcursor = 0      # (Integer) Points the current cursor position
+        recipients = 0      # (Integer) The number of 'Final-Recipient' header
+
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
+          if readcursor == 0
+            # Beginning of the bounce message or delivery status part
+            if e.start_with?(StartingOf[:message][0])
+              # |------------------------- Failed addresses follow: ---------------------|
+              readcursor |= Indicators[:deliverystatus]
+            else
+              # |------------------------- Message log follows: -------------------------|
+              # The line above may appears only in Smail 3.
+              #
+              # smail-3.2.0.108/src/
+              #   models.c:787| if (deliver == NULL && defer == NULL) {
+              #   models.c:788| write_log(WRITE_LOG_MLOG, "no valid recipients were found for this message");
+              #   models.c:789| return_to_sender = TRUE;
+              #   models.c:879| }
+              messagelog += ' ' + e if e != "" && e.include?(BannerDTAG[0]) == false
+            end
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
+
+          # |------------------------- Failed addresses follow: ---------------------|
+          #  <example@t-online.de>
+          #    552 5.2.2 <example@t-online.de> Quota exceeded (mailbox for user is full)
+          # 
+          # |------------------------- Message header follows: ----------------------|
+          # Received: from mail.fragdenstaat.de ([94.130.55.89]) by mailin41.mgt.mul.t-online.de.example.com
+          #  with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted)
+          # ...
+          v = dscontents[-1]
+
+
+          if e.start_with?(' <') && e.end_with?('>') && e.count(' ') == 1
+            # Deutsche Telekom: The recipient address is enclosed in angle brackets.
+            # |------------------------- Failed addresses follow: ---------------------|
+            if v["recipient"] != ""
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['recipient'] = e[2, e.size]
+            recipients += 1
+
+          elsif Sisimai::String.aligned(e, [' ', '@', '.', ' ... '])
+            # Smail 3:
+            #   - The recipient address is not enclosed in angle brackets.
+            #   - Error message begins with " ... failed:"
+            # smail-3.2.0.108/src/
+            #   notify.c:845| if (cur->error) {
+            #   notify.c:846| (void) fprintf(f, " %s ... failed: %s\n",
+            #   notify.c:847|            cur->in_addr ? cur->in_addr : "(unknown)",
+            #   notify.c:848|            cur->error->message);
+            #   notify.c:849| }
+            # |------------------------- Failed addresses follow: ---------------------|
+            #  kijitora@neko.nyaan.example.com ... unknown host
+            if v["recipient"] != ""
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['recipient'] = e[1, e.index(' ... ')]
+            v['diagnosis'] = messagelog << ' ' + e
+            recipients += 1
+
+          else
+            #    552 5.2.2 <example@t-online.de> Quota exceeded (mailbox for user is full)
+            v['diagnosis'] = e
+          end
+        end
+        return nil if recipients == 0
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+      end
+      def description; return 'DeutscheTelekom'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/domino.rb

@@ -9,8 +9,6 @@ module Sisimai::Lhost
       Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {message: ['Your message']}.freeze
       MessagesOf = {
-        "filtered"    => ["Cannot route mail to user"],
-        "systemerror" => ["Several matches found in Domino Directory"],
         "userunknown" => [
           "not listed in Domino Directory",
           "not listed in public Name & Address Book",
@@ -120,7 +118,6 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 

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

@@ -11,7 +11,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,7 +89,7 @@ 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['rhost']   = 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['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
@@ -98,14 +97,6 @@ module Sisimai::Lhost
             # 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

@@ -158,19 +158,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 +208,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

@@ -64,7 +64,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 +152,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

@@ -58,32 +58,9 @@ module Sisimai::Lhost
         ],
       }.freeze
       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",
-        ],
         # 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");
@@ -94,35 +71,14 @@ module Sisimai::Lhost
           "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 +89,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 +213,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 +246,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 +255,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 +300,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 +363,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 +386,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 "HELO", "EHLO" then e["reason"] = "blocked"
+              when "MAIL"         then e["reason"] = "onhold"
             else
               # Try to match the error message with each message pattern 
               MessagesOf.each_key do |r|
@@ -447,9 +401,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 |")
               end
             end
           end
@@ -468,7 +420,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 == "expired"
             # 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

@@ -8,22 +8,12 @@ module 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 +38,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,53 +83,27 @@ 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
           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'] = "suspend" if UnpaidUser.any? { |a| e['diagnosis'].include?(a) }
           end
           next if e['reason'] != ""
           next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')

data/lib/sisimai/lhost/fml.rb

@@ -22,21 +22,6 @@ module Sisimai::Lhost
         ],
         '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:',
-        ],
-      }.freeze
 
       # @abstract Decodes the bounce message from fml mailling list server/manager
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -84,23 +69,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] }