sisimai 5.5.0-java → 5.7.0-java

data/lib/sisimai/lhost/qmail.rb

@@ -66,59 +66,9 @@ module Sisimai::Lhost
         "DATA" => [" failed on DATA command", " failed after I sent the message"],
       }.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();
-      # qmail-remote-fallback.patch
-      HasExpired = "this message has been in the queue too long.".freeze
-      OnHoldPair = [" does not like recipient.", "this message has been in the queue too long."].freeze
-      FailOnLDAP = {
-        # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        "exceedlimit" => ["The message exeeded the maximum size the user accepts"], # 5.2.3
-        "userunknown" => ["Sorry, no mailbox here by that name"],           # 5.1.1
-        "suspend"     => [ # 5.2.1
-          "Mailaddress is administrativly disabled",
-          "Mailaddress is administrativley disabled",
-          "Mailaddress is administratively disabled",
-          "Mailaddress is administrativeley disabled",
-        ],
-        "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-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" => ["Sorry, I couldn't find any host "],
-        # error_str.c:192|  X(EDQUOT,"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"  => ["Message size exceeds fixed maximum message size:"],
-        "networkerror"=> [
-            "Sorry, I wasn't able to establish an SMTP connection",
-            "Sorry. Although I'm listed as a best-preference MX or A for that host",
-        ],
-        "notaccept" => [
-            # notqmail 1.08 returns the following error message when the destination MX is NullMX
-            "Sorry, I couldn't find a mail exchanger or IP address",
-        ],
-        "systemerror" => [
-            "bad interpreter: No such file or directory",
-            "system error",
-            "Unable to",
-        ],
-        "systemfull"  => ["Requested action not taken: mailbox unavailable (not enough free space)"],
-        # 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");
+        # notqmail 1.08 returns the following error message when the destination MX is NullMX
+        "notaccept"   => ["Sorry, I couldn't find a mail exchanger or IP address"],
         "userunknown" => ["no mailbox here by that name"],
       }.freeze
 
@@ -186,7 +136,7 @@ module Sisimai::Lhost
               cm = r.size
               p2 = e.index(" ", p1 + cm + 1) || p2 = e.rindex(".") 
 
-              v["rhost"] = Sisimai::String.sweep(e[p1 + cm, p2 - p1 - cm])
+              v["rhost"] = e[p1 + cm, p2 - p1 - cm]
               break
             end
           end
@@ -194,9 +144,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"])
-
           # Get the SMTP command name for the session
           CommandSet.each_key do |r|
             # Get the last SMTP command
@@ -216,32 +163,18 @@ module Sisimai::Lhost
             e["reason"] = "blocked"
           else
             # Try to match with each error message in the table
-            if Sisimai::String.aligned(e["diagnosis"], OnHoldPair)
-              # To decide the reason require pattern match with Sisimai::Reason::* modules
-              e["reason"] = "onhold"
-            else
-              # Check that the error message includes any of message patterns or not
-              [e["alterrors"], e["diagnosis"]].each do |f|
-                # Try to detect an error reason
-                break if e["reason"] != ""
-                next  if f.nil?
-                MessagesOf.each_key do |r|
-                  # The key is a bounce reason name
-                  next if MessagesOf[r].none? { |a| f.include?(a) }
-                  e["reason"] = r
-                  break
-                end
-                break if e["reason"]
-
-                FailOnLDAP.each_key do |r|
-                  # The key is a bounce reason name
-                  next if FailOnLDAP[r].none? { |a| f.include?(a) }
-                  e["reason"] = r
-                  break
-                end
-                break if e["reason"]
-                e["reason"] = "expired" if e["diagnosis"].include?(HasExpired)
+            # Check that the error message includes any of message patterns or not
+            [e["alterrors"], e["diagnosis"]].each do |f|
+              # Try to detect an error reason
+              break if e["reason"] != ""
+              next  if f.nil?
+              MessagesOf.each_key do |r|
+                # The key is a bounce reason name
+                next if MessagesOf[r].none? { |a| f.include?(a) }
+                e["reason"] = r
+                break
               end
+              break if e["reason"]
             end
           end
 

data/lib/sisimai/lhost/sendmail.rb

@@ -67,7 +67,8 @@ module Sisimai::Lhost
             o = Sisimai::RFC1894.field(e) || next
             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'
@@ -83,7 +84,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]
@@ -159,7 +160,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
@@ -186,7 +187,6 @@ module Sisimai::Lhost
             break
           end
 
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e["command"]   = thecommand if e["command"].empty?
           e["command"]   = Sisimai::SMTP::Command.find(e['diagnosis']) if e["command"].empty?
           e["command"]   = "EHLO" if e["command"].empty? && esmtpreply.size > 0

data/lib/sisimai/lhost/trendmicro.rb

@@ -55,11 +55,12 @@ module Sisimai::Lhost
             recipients = dscontents.size
           end
 
-          if e.start_with?('Sent <<< ')
+          case
+          when e.start_with?('Sent <<< ')
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
             v['command'] = Sisimai::SMTP::Command.find(e)
 
-          elsif e.start_with?('Received >>> ')
+          when e.start_with?('Received >>> ')
             # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
             v['diagnosis'] = e[e.index(' >>> ') + 4, e.size]
           else
@@ -72,7 +73,6 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['reason'] = 'userunknown' if e['diagnosis'].include?('Unable to deliver')
         end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/v5sendmail.rb

@@ -161,7 +161,6 @@ module Sisimai::Lhost
         j = 0; dscontents.each do |e|
           # Tidy up the error message in e.Diagnosis
           e["diagnosis"] = anotherone[j] if e["diagnosis"].empty?
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
           e["replycode"] = Sisimai::SMTP::Reply.find(e["diagnosis"])
           e["replycode"] = Sisimai::SMTP::Reply.find(anotherone[j]) if e["replycode"].empty?

data/lib/sisimai/lhost/verizon.rb

@@ -126,7 +126,7 @@ module Sisimai::Lhost
             else
               # Message could not be delivered to mobile.
               # Error: No valid recipients for this MM
-              v['diagnosis'] = Sisimai::String.sweep(e[7, e.size]) if e.start_with?('Error: ')
+              v['diagnosis'] = e[7, e.size] if e.start_with?('Error: ')
             end
           end
         end
@@ -137,7 +137,6 @@ module Sisimai::Lhost
         emailparts[1] += "Subject: #{subjecttxt}\n" if emailparts[1].include?("\nSubject: ") == false
 
         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) }

data/lib/sisimai/lhost/x1.rb

@@ -67,8 +67,7 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['date']      = datestring || ''
+          e['date'] = datestring || ''
         end
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/x2.rb

@@ -88,8 +88,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #2'; end

data/lib/sisimai/lhost/x3.rb

@@ -64,28 +64,23 @@ module Sisimai::Lhost
             recipients += 1
           else
             # Detect error message
-            if e.start_with?('SMTP:')
+            case
+            when e.start_with?('SMTP:')
               # SMTP:RCPT host 192.0.2.8: 553 5.3.0 <kijitora@example.com>... No such user here
               v['command'] = Sisimai::SMTP::Command.find(e)
               v['diagnosis'] = e
 
-            elsif e.start_with?('Routing: ')
+            when e.start_with?('Routing: ') 
               # Routing: Could not find a gateway for kijitora@example.co.jp
               v['diagnosis'] = e[9, e.size]
 
-            elsif e.start_with?('Diagnostic-Code: smtp; ')
+            when e.start_with?('Diagnostic-Code: smtp; ')
               # Diagnostic-Code: smtp; 552 5.2.2 Over quota
               v['diagnosis'] = e[e.index(';') + 2, e.size]
             end
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
-        end
-
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #3'; end

data/lib/sisimai/lhost/x6.rb

@@ -84,7 +84,6 @@ module Sisimai::Lhost
             # ...(Error following RCPT command).
             e['command'] = cv
           end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
         end
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/zoho.rb

@@ -8,7 +8,6 @@ module Sisimai::Lhost
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Received: from mail.zoho.com by mx.zohomail.com'].freeze
       StartingOf = {message: ['This message was created automatically by mail delivery']}.freeze
-      MessagesOf = {'expired' => ['Host not reachable']}.freeze
 
       # @abstract Decodes the bounce message from Zoho Mail
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -88,17 +87,6 @@ module Sisimai::Lhost
           end
         end
         return nil if recipients == 0
-
-        dscontents.each do |e|
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
-          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 'Zoho Mail: https://www.zoho.com'; end

data/lib/sisimai/lhost.rb

@@ -9,21 +9,20 @@ module Sisimai
       # @private
       def DELIVERYSTATUS
         return {
-          'spec'         => "",     # Protocl specification
-          'date'         => "",     # The value of Last-Attempt-Date header
-          'rhost'        => "",     # The value of Remote-MTA header
-          'lhost'        => "",     # The value of Received-From-MTA header
-          'alias'        => "",     # The value of alias entry(RHS)
-          'agent'        => "",     # MTA module name
-          'action'       => "",     # The value of Action header
-          'status'       => "",     # The value of Status header
-          'reason'       => "",     # Temporary reason of bounce
-          'command'      => "",     # SMTP command in the message body
-          'replycode'    => "",     # SMTP Reply code
-          'diagnosis'    => "",     # The value of Diagnostic-Code header
-          'recipient'    => "",     # The value of Final-Recipient header
-          'feedbacktype' => "",     # Feedback Type
-          'toxic'        => false,  # EXPERIMENTAL
+          'spec'         => "", # Protocl specification
+          'date'         => "", # The value of Last-Attempt-Date header
+          'rhost'        => "", # The value of Remote-MTA header
+          'lhost'        => "", # The value of Received-From-MTA header
+          'alias'        => "", # The value of alias entry(RHS)
+          'agent'        => "", # MTA module name
+          'action'       => "", # The value of Action header
+          'status'       => "", # The value of Status header
+          'reason'       => "", # Temporary reason of bounce
+          'command'      => "", # SMTP command in the message body
+          'replycode'    => "", # SMTP Reply code
+          'diagnosis'    => "", # The value of Diagnostic-Code header
+          'recipient'    => "", # The value of Final-Recipient header
+          'feedbacktype' => "", # Feedback Type
         }
       end
 
@@ -37,14 +36,34 @@ module Sisimai
         }
       end
 
+      # @abstract Banners defined in Smail 3 and Deutsche Telekom
+      # @return   [Array] Banner strings
+      # @private
+      def BannerDTAG
+        return [
+          # smail-3.2.0.108/src/
+          #   notify.c:61|static char *log_banner = "\
+          #   notify.c:62||------------------------- Message log follows: -------------------------|\n";
+          #   notify.c:63|static char *addr_error_banner = "\
+          #   notify.c:64||------------------------- Failed addresses follow: ---------------------|\n";
+          #   notify.c:65|static char *text_banner = "\
+          #   notify.c:66||------------------------- Message text follows: ------------------------|\n";
+          "|------------------------- Message log follows: -------------------------|", # 0. Smail 3
+          "|------------------------- Failed addresses follow: ---------------------|", # 1. Smail 3
+          "|------------------------- Message text follows: ------------------------|", # 2. Smail 3
+          "|------------------------- Message header follows: ----------------------|", # 3. Deutsche Telekom
+        # "|----------- Message text follows: (body too large, truncated) ----------|", # 4. Deutsche Telekom
+        ]
+      end
+
       # @abstract MTA list
       # @return   [Array] MTA list with order
       def index
         return %w[
-          Activehunter AmazonSES ApacheJames Biglobe Courier Domino DragonFly EZweb EinsUndEins Exchange2003
-          Exchange2007 Exim FML GMX GoogleWorkspace GoogleGroups Gmail IMailServer KDDI MailFoundry Mimecast
-          MailMarshal MessagingServer Notes OpenSMTPD Postfix Sendmail TrendMicro V5sendmail Verizon
-          X1 X2 X3 X6 Zoho MFILTER Qmail
+          Activehunter AmazonSES ApacheJames Biglobe Courier Domino DeutscheTelekom DragonFly EZweb
+          EinsUndEins Exchange2003 Exchange2007 Exim FML GMX GoogleWorkspace GoogleGroups Gmail
+          IMailServer KDDI MailFoundry Mimecast MailMarshal MessagingServer Notes OpenSMTPD Postfix
+          Sendmail TrendMicro V5sendmail Verizon X1 X2 X3 X6 Zoho MFILTER Qmail
         ]
       end
 

data/lib/sisimai/message.rb

@@ -66,7 +66,7 @@ module Sisimai
             # Remove "Fwd:" string from the Subject: header
             if p1
               # Delete quoted strings, quote symbols(>)
-              cq = Sisimai::String.sweep(cq[cq.index(':') + 1, cq.size])
+              cq = cq[cq.index(':') + 1, cq.size]
               aftersplit[2] = aftersplit[2].gsub(/^[>][ ]/, '').gsub(/^[>]$/, '')
             end
             thing['header']['subject'] = cq
@@ -297,6 +297,8 @@ module Sisimai
           email += sprintf("%s: %s\n", fn, bf)
         end
 
+        # 5. Convert the lower-cased SMTP command to the upper-cased.
+        email  = email.gsub("after end of data:", "after end of DATA:")
         email += "\n" if email.end_with?("\n\n") == false
         return email
       end

data/lib/sisimai/order.rb

@@ -11,11 +11,12 @@ module Sisimai
         'Sisimai::Lhost::Sendmail',
         'Sisimai::Lhost::Exchange2007',
         'Sisimai::Lhost::Exchange2003',
+        'Sisimai::Lhost::AmazonSES',
         'Sisimai::Lhost::TrendMicro',
+        'Sisimai::Lhost::DeutscheTelekom',
         'Sisimai::Lhost::KDDI',
         'Sisimai::Lhost::FML',
         'Sisimai::Lhost::Verizon',
-        'Sisimai::Lhost::AmazonSES',
         'Sisimai::Lhost::ApacheJames',
         'Sisimai::Lhost::X2',
       ].freeze
@@ -83,8 +84,10 @@ module Sisimai
           'Sisimai::Lhost::GMX',
           'Sisimai::Lhost::Zoho',
           'Sisimai::Lhost::EinsUndEins',
+          'Sisimai::Lhost::DeutscheTelekom',
         ],
         'mail-could'   => ['Sisimai::Lhost::TrendMicro'],
+        'mail-failed'  => ['Sisimai::Lhost::DeutscheTelekom'],
         'mail-failure' => ['Sisimai::Lhost::Exim'],
         'mail-system'  => ['Sisimai::Lhost::EZweb'],
         'message-delivery' => ['Sisimai::Lhost::MailFoundry'],

data/lib/sisimai/reason/authfailure.rb

@@ -12,23 +12,19 @@ module Sisimai
     # Diagnostic-Code: smtp; 550 5.7.1 Email rejected per DMARC policy for example.org
     module AuthFailure
       class << self
-        require 'sisimai/string'
-
         Index = [
-          '//spf.pobox.com',
-          'bad spf records for',
-          'dmarc policy',
+          "//spf.pobox.com",
+          "5322.From address doesn't meet the authentication requirements",
+          "bad spf records for",
+          "dmarc policy",
           "doesn't meet the required authentication level",
-          'please inspect your spf settings',
-          'sender policy framework (spf) fail',
-          'sender policy framework violation',
-          'spf (sender policy framework) domain authentication fail',
-          'spf check: fail',
-          "the 5322.From address doesn't meet the authentication requirements defined for the sender",
+          "please inspect your spf settings",
+          "sender policy framework",
+          "spf check: fail",
         ].freeze
         Pairs = [
-          [' is not allowed to send mail.', '_401'],
-          ['is not allowed to send from <', " per it's spf record"],
+          ["spf: ", " is not allowed to send "],
+          ["is not allowed to send ", " spf "],
         ].freeze
 
         def text; return 'authfailure'; end

data/lib/sisimai/reason/badreputation.rb

@@ -15,13 +15,13 @@ module Sisimai
     module BadReputation
       class << self
         Index = [
-          'a poor email reputation score',
-          'has been temporarily rate limited due to ip reputation',
-          'ip/domain reputation problems',
-          'likely suspicious due to the very low reputation',
-          'none/bad reputation', # t-online.de
-          'temporarily deferred due to unexpected volume or user complaints', # Yahoo Inc.
-          "the sending mta's poor reputation",
+          "has been temporarily rate limited due to ip reputation",
+          "ip/domain reputation problems",
+          "likely suspicious due to the very low reputation",
+          "none/bad reputation", # t-online.de
+          "poor email reputation score",
+          "sending mta's poor reputation",
+          "temporarily deferred due to unexpected volume or user complaints", # Yahoo Inc.
         ].freeze
         def text; return 'badreputation'; end
         def description; return 'Email rejected due to an IP address reputation'; end