sisimai 5.1.0-java → 5.2.0-java

data/lib/sisimai/message.rb

@@ -20,14 +20,17 @@ module Sisimai
       Fields5965 = Sisimai::RFC5965.FIELDINDEX.freeze
       FieldIndex = [Fields1894.flatten, Fields5322.flatten, Fields5965.flatten].flatten.freeze
       FieldTable = FieldIndex.map { |e| [e.downcase, e] }.to_h.freeze
-      ReplacesAs = { 'Content-Type' => [%w[message/xdelivery-status message/delivery-status]] }.freeze
       Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
+      ReplacesAs = {
+        "Content-Type" => [
+          %w[message/xdelivery-status message/delivery-status],
+          %w[message/disposition-notification message/delivery-status],
+        ]
+      }.freeze
 
       # Read an email message and convert to structured format
       # @param         [Hash] argvs       Module to be loaded
       # @options argvs [String] :data     Entire email message
-      # @options argvs [Array]  :load     User defined MTA module list
-      # @options argvs [Array]  :order    The order of MTA modules
       # @options argvs [Code]   :hook     Reference to callback method
       # @return        [Sisimai::Message] Structured email data or nil if each
       #                                   value of the arguments are missing
@@ -37,16 +40,6 @@ module Sisimai
         thing = { 'from' => '','header' => {}, 'rfc822' => '', 'ds' => [], 'catch' => nil }
         param = {}
 
-        # 0. Load specified MTA modules
-        [:load, :order].each do |e|
-          # Order of MTA modules
-          next unless argvs[e]
-          next unless argvs[e].is_a? Array
-          next if argvs[e].empty?
-          param[e.to_s] = argvs[e]
-        end
-        tobeloaded = Sisimai::Message.load(param)
-
         aftersplit = nil
         beforefact = nil
         parseagain = 0
@@ -71,7 +64,7 @@ module Sisimai
             if p1
               # Delete quoted strings, quote symbols(>)
               cq = Sisimai::String.sweep(cq[cq.index(':') + 1, cq.size])
-              aftersplit[2] = aftersplit[2].gsub(/^[>]+[ ]/, '').gsub(/^[>]$/, '')
+              aftersplit[2] = aftersplit[2].gsub(/^[>][ ]/, '').gsub(/^[>]$/, '')
             end
             thing['header']['subject'] = cq
           end
@@ -81,7 +74,6 @@ module Sisimai
             'hook' => argvs[:hook] || nil,
             'mail' => thing,
             'body' => aftersplit[2],
-            'tobeloaded' => tobeloaded,
             'tryonfirst' => Sisimai::Order.make(thing['header']['subject'])
           }
           break if beforefact = Sisimai::Message.sift(param)
@@ -91,7 +83,7 @@ module Sisimai
           #    There is a bounce message inside of mutipart/*, try to sift the first message/rfc822
           #    part as a entire message body again.
           parseagain += 1
-          email = Sisimai::RFC5322.part(aftersplit[2], Boundaries, true).pop.sub(/\A[\r\n\s]+/, '')
+          email = Sisimai::RFC5322.part(aftersplit[2], Boundaries, true).pop.sub(/\A\s+/, '')
           break unless email.size > 128
         end
         return nil unless beforefact
@@ -106,46 +98,7 @@ module Sisimai
         return thing
       end
 
-      # Load MTA modules which specified at 'order' and 'load' in the argument
-      # @param         [Hash] argvs       Module information to be loaded
-      # @options argvs [Array]  load      User defined MTA module list
-      # @options argvs [Array]  order     The order of MTA modules
-      # @return        [Array]            Module list
-      # @since v4.20.0
-      def load(argvs)
-        modulelist = []
-        tobeloaded = []
-
-        %w[load order].each do |e|
-          # The order of MTA modules specified by user
-          next unless argvs[e]
-          next unless argvs[e].is_a? Array
-          next if argvs[e].empty?
-
-          modulelist += argvs['order'] if e == 'order'
-          next unless e == 'load'
-
-          # Load user defined MTA module
-          argvs['load'].each do |v|
-            # Load user defined MTA module
-            begin
-              require v.to_s.gsub('::', '/').downcase
-            rescue LoadError
-              warn ' ***warning: Failed to load ' << v
-              next
-            end
-            tobeloaded << v
-          end
-        end
-
-        while e = modulelist.shift do
-          # Append the custom order of MTA modules
-          next if tobeloaded.index(e)
-          tobeloaded << e
-        end
-
-        return tobeloaded
-      end
+      def load(argvs); ' ***warning: Sisimai::Message.load will be removed at v5.3.0'; return []; end
 
       # Divide email data up headers and a body part.
       # @param         [String] email  Email data
@@ -199,20 +152,20 @@ module Sisimai
         # https://gist.github.com/xtetsuji/b080e1f5551d17242f6415aba8a00239
         headermaps = { 'subject' => '' }
         receivedby = []
-        argv0.scan(/^([\w-]+):[ ]*(.*?)\n(?![\s\t])/m) { |e| headermaps[e[0].downcase] = e[1] }
+        argv0.scan(/^([\w-]+):[ ]*(.*?)\n(?!\s)/m) { |e| headermaps[e[0].downcase] = e[1] }
         headermaps.delete('received')
-        headermaps.each_key { |e| headermaps[e].gsub!(/\n[\s\t]+/, ' ') }
+        headermaps.each_key { |e| headermaps[e].gsub!(/\n\s+/, ' ') }
 
         if argv0.include?('Received:')
           # Capture values of each Received: header
-          re = argv0.scan(/^Received:[ ]*(.*?)\n(?![\s\t])/m).flatten
+          re = argv0.scan(/^Received:[ ]*(.*?)\n(?!\s)/m).flatten
           re.each do |e|
             # 1. Exclude the Received header including "(qmail ** invoked from network)".
             # 2. Convert all consecutive spaces and line breaks into a single space character.
             next if e.include?(' invoked by uid')
             next if e.include?(' invoked from network')
 
-            e.gsub!(/\n[\s\t]+/, ' ')
+            e.gsub!(/\n\s+/, ' ')
             e.squeeze!("\n\t ")
             receivedby << e
           end
@@ -252,93 +205,97 @@ module Sisimai
         return '' if argv0.empty?
 
         email = ''
-        argv0.split("\n").each do |e|
+        lines = argv0.split("\n")
+        index = -1
+        lines.each do |e|
           # Find and tidy up fields defined in RFC5322, RFC1894, and RFC5965
           # 1. Find a field label defined in RFC5322, RFC1894, or RFC5965 from this line
-          p0 = e.index(':') || 0
+          p0 = e.index(':') || -1
           cf = e.downcase[0, p0]
+          fn = FieldTable[cf] || ''
 
-          unless FieldTable.has_key?(cf)
+          index += 1
+          if fn == ''
+            # There is neither ":" character nor the field listed in $FieldTable
             email << e + "\n"
             next
           end
 
-          # 2. There is a field label defined in RFC5322, RFC1894, or RFC5965 from this line.
-          #    Code below replaces the field name with a valid name listed in @fieldindex when
-          #    the field name does not match with a valid name.
-          #    - Before: Message-id: <...>
-          #    - After:  Message-Id: <...>
-          fieldlabel = FieldTable[cf]
-          substring0 = e[0, p0]
-          e[0, p0] = fieldlabel unless substring0.empty?
-
-          # 3. There is no " " (space character) immediately after ":"
-          #    - before: Content-Type:text/plain
-          #    - After:  Content-Type: text/plain
-          substring0 = e[p0 + 1, 1]
-          e[p0, 1] = ': ' if substring0 != ' '
-
-          # 4. Remove redundant space characters after ":"
-          while true
-            # - Before: Message-Id:    <...>
-            # - After:  Message-Id: <...>
-            break unless p0 + 2 < e.size
-            break unless e[p0 + 2, 1] == ' '
-            e[p0 + 2, 1] = ''
-          end
-
-          # 5. Tidy up a sub type of each field defined in RFC1894 such as Reporting-MTA: DNS;...
-          p1 = e.index(';') || -1
+          # 2. Tidy up a sub type of each field defined in RFC1894 such as Reporting-MTA: DNS;...
+          ab = []
+          bf = e[p0 + 1, e.size - p0 - 1]
+          p1 = bf.index(';')
           while true
             # Such as Diagnostic-Code, Remote-MTA, and so on
             # - Before: Diagnostic-Code: SMTP;550 User unknown
             # - After:  Diagnostic-Code: smtp; 550 User unknown
-            break unless p1 > p0
-            break unless ['Content-Type'].concat(Fields1894).any? { |a| a.start_with?(fieldlabel) }
+            break unless ['Content-Type'].concat(Fields1894).any? { |a| a == fn }
 
-            substring0 = e[p0 + 2, p1 - p0 - 1]
-            e[p0 + 2, substring0.size] = substring0.downcase + ' '
+            if p1
+              # The field including one or more ";"
+              bf.split(';').each do |f|
+                # 2-1. Trim leading and trailing space characters from the current buffer
+                f.strip!
+                ps = ''
+
+                # 2-2. Convert some parameters to the lower-cased string
+                while true
+                  # For example,
+                  # - Content-Type: Message/delivery-status => message/delivery-status
+                  # - Content-Type: Charset=UTF8            => charset=utf8
+                  # - Reporting-MTA: DNS; ...               => dns
+                  # - Final-Recipient: RFC822; ...          => rfc822
+                  break if f.include?(' ')
+
+                  p2 = f.index('=')
+                  if p2
+                    # charset=, boundary=, and other pairs divided by "="
+                    ps = f[0, p2].downcase
+                    f[0, p2] = ps
+                  end
+                  f.downcase! unless ps == 'boundary'
+                  break
+                end
+                ab << f
+              end
+
+              while true
+                # Diagnostic-Code: x-unix;
+                #   /var/email/kijitora/Maildir/tmp/1000000000.A000000B00000.neko22:
+                #   Disk quota exceeded
+                break unless fn == 'Diagnostic-Code'
+                break unless ab.size == 1
+                break unless lines[index + 1].start_with?(' ')
+
+                ab << ''
+                break
+              end
+              bf = ab.join('; ') # Insert " " (space characer) immediately after ";"
+              ab = []
+
+            else
+              # There is no ";" in the field
+              break if fn.end_with?('-Date')        # Arrival-Date, Last-Attempt-Date
+              break if fn.end_with?('-Message-ID')  # X-Original-Message-ID
+              bf.downcase!
+            end
             break
           end
 
-          # 6. Remove redundant space characters after ";"
-          while true
-            # - Before: Diagnostic-Code: SMTP;      550 User unknown
-            # - After:  Diagnostic-Code: SMTP; 550 User unknown
-            break unless p1 + 2 < e.size
-            break unless e[p1 + 2, 1] == ' '
-            e[p1 + 2, 1] = ''
-          end
-
-          # 7. Tidy up a value, and a parameter of Content-Type: field
-          while true
+          # 3. Tidy up a value, and a parameter of Content-Type: field
+          if ReplacesAs.has_key?(fn)
             # Replace the value of "Content-Type" field
-            break unless ReplacesAs.has_key?(fieldlabel)
-            p2 = 0
-
-            ReplacesAs[fieldlabel].each do |f|
-              # Content-Type: message/xdelivery-status
-              p2 = e.index(f[0]) || -1
-              next unless p2 > 1
-
-              e[p2, f[0].size] = f[1]
-              p1 = e.index(';')
-              break
+            ReplacesAs[fn].each do |f|
+              # - Before: Content-Type: message/xdelivery-status; ...
+              # - After:  Content-Type: message/delivery-status; ...
+              p1 = bf.index(f[0]) || next
+              bf[p1, f[0].size] = f[1]
             end
-
-            # A parameter name of Content-Type field should be a lower-cased string
-            # - Before: Content-Type: text/plain; CharSet=ascii; Boundary=...
-            # - After:  Content-Type: text/plain; charset=ascii; boundary=...
-            break unless fieldlabel == 'Content-Type'
-            p2 = e.index('=') || -1
-            break unless p2 > 0
-            break unless p2 > p1
-
-            substring0 = e[p1 + 2, p2 - p1 - 2]
-            e[p1 + 2, p2 - p1 - 2] = substring0.downcase
-            break
           end
-          email << e + "\n"
+
+          # 4. Remove redundant space characters
+          bf = bf.squeeze(' ').strip
+          email << sprintf("%s: %s\n", fn, bf)
         end
 
         email << "\n" unless email.end_with?("\n\n")
@@ -354,7 +311,6 @@ module Sisimai
       # @param options mail  [Array]  ds     Delivery status list(decoded data)
       # @param options argvs [String] body   Email message body
       # @param options argvs [Array] tryonfirst  MTA module list to load on first
-      # @param options argvs [Array] tobeloaded  User defined MTA module list
       # @return              [Hash]          Decoded and structured bounce mails
       def sift(argvs)
         return nil unless argvs['mail']
@@ -416,21 +372,11 @@ module Sisimai
 
         catch :DECODER do
           while true
-            # 1. User-Defined Module
-            # 2. MTA Module Candidates to be tried on first
-            # 3. Sisimai::Lhost::*
-            # 4. Sisimai::RFC3464
-            # 5. Sisimai::ARF
-            # 6. Sisimai::RFC3834
-            while r = argvs['tobeloaded'].shift do
-              # Call user defined MTA modules
-              next if haveloaded[r]
-              havesifted = Module.const_get(r).inquire(mailheader, bodystring)
-              haveloaded[r] = true
-              modulename = r
-              throw :DECODER if havesifted
-            end
-
+            # 1. MTA Module Candidates to be tried on first
+            # 2. Sisimai::Lhost::*
+            # 3. Sisimai::RFC3464
+            # 4. Sisimai::ARF
+            # 5. Sisimai::RFC3834
             [argvs['tryonfirst'], DefaultSet].flatten.each do |r|
               # Try MTA module candidates
               next if haveloaded[r]
@@ -453,6 +399,7 @@ module Sisimai
               # Feedback Loop message
               require 'sisimai/arf'
               havesifted = Sisimai::ARF.inquire(mailheader, bodystring)
+              modulename = "ARF"
               throw :DECODER if havesifted
             end
 
@@ -472,8 +419,8 @@ module Sisimai
         havesifted['catch'] = havecaught
         modulename = modulename.sub(/\A.+::/, '')
         havesifted['ds'].each do |e|
-          e['agent'] = modulename unless e['agent']
-          e.each_key { |a| e[a] ||= '' }  # Replace nil with ""
+          e["agent"] = modulename if e["agent"].nil? || e["agent"].empty?
+          e.each_key { |a| e[a] = "" if e[a].nil? }  # Replace nil with ""
         end
         return havesifted
       end

data/lib/sisimai/order.rb

@@ -7,62 +7,42 @@ module Sisimai
       # There are another patterns in the value of "Subject:" header of a bounce mail generated by the
       # following MTA/ESP modules
       OrderE0 = [
-        'Sisimai::Lhost::MailRu',
-        'Sisimai::Lhost::Yandex',
         'Sisimai::Lhost::Exim',
         'Sisimai::Lhost::Sendmail',
-        'Sisimai::Lhost::Aol',
-        'Sisimai::Lhost::Office365',
         'Sisimai::Lhost::Exchange2007',
         'Sisimai::Lhost::Exchange2003',
-        'Sisimai::Lhost::AmazonWorkMail',
         'Sisimai::Lhost::AmazonSES',
-        'Sisimai::Lhost::Barracuda',
         'Sisimai::Lhost::InterScanMSS',
         'Sisimai::Lhost::KDDI',
-        'Sisimai::Lhost::SurfControl',
         'Sisimai::Lhost::Verizon',
         'Sisimai::Lhost::ApacheJames',
         'Sisimai::Lhost::X2',
-        'Sisimai::Lhost::X5',
         'Sisimai::Lhost::FML',
       ].freeze
 
       # Fallback list: The following MTA/ESP modules is not listed OrderE0
       OrderE1 = [
         'Sisimai::Lhost::Postfix',
-        'Sisimai::Lhost::GSuite',
-        'Sisimai::Lhost::Yahoo',
-        'Sisimai::Lhost::Outlook',
-        'Sisimai::Lhost::GMX',
+        'Sisimai::Lhost::OpenSMTPD',
+        'Sisimai::Lhost::Courier',
+        'Sisimai::Lhost::Qmail',
         'Sisimai::Lhost::MessagingServer',
-        'Sisimai::Lhost::EinsUndEins',
+        'Sisimai::Lhost::MailMarshalSMTP',
+        'Sisimai::Lhost::GoogleWorkspace',
         'Sisimai::Lhost::Domino',
         'Sisimai::Lhost::Notes',
-        'Sisimai::Lhost::Qmail',
-        'Sisimai::Lhost::Courier',
-        'Sisimai::Lhost::OpenSMTPD',
+        'Sisimai::Lhost::Gmail',
         'Sisimai::Lhost::Zoho',
-        'Sisimai::Lhost::MessageLabs',
-        'Sisimai::Lhost::MXLogic',
+        'Sisimai::Lhost::GMX',
+        'Sisimai::Lhost::GoogleGroups',
         'Sisimai::Lhost::MailFoundry',
-        'Sisimai::Lhost::McAfee',
         'Sisimai::Lhost::V5sendmail',
-        'Sisimai::Lhost::MFILTER',
-        'Sisimai::Lhost::SendGrid',
-        'Sisimai::Lhost::ReceivingSES',
-        'Sisimai::Lhost::Amavis',
-        'Sisimai::Lhost::PowerMTA',
-        'Sisimai::Lhost::GoogleGroups',
-        'Sisimai::Lhost::Gmail',
-        'Sisimai::Lhost::EZweb',
         'Sisimai::Lhost::IMailServer',
-        'Sisimai::Lhost::MailMarshalSMTP',
+        'Sisimai::Lhost::MFILTER',
         'Sisimai::Lhost::Activehunter',
-        'Sisimai::Lhost::Bigfoot',
+        'Sisimai::Lhost::EZweb',
         'Sisimai::Lhost::Biglobe',
-        'Sisimai::Lhost::Facebook',
-        'Sisimai::Lhost::X4',
+        'Sisimai::Lhost::EinsUndEins',
         'Sisimai::Lhost::X1',
         'Sisimai::Lhost::X3',
         'Sisimai::Lhost::X6',
@@ -78,17 +58,12 @@ module Sisimai
         'complaint-about'  => ['Sisimai::ARF'],
         'delivery-failure' => ['Sisimai::Lhost::Domino', 'Sisimai::Lhost::X2'],
         'delivery-notification' => ['Sisimai::Lhost::MessagingServer'],
-        'delivery-report'  => ['Sisimai::Lhost::PowerMTA'],
         'delivery-status'  => [
-          'Sisimai::Lhost::GSuite',
-          'Sisimai::Lhost::GoogleGroups',
-          'Sisimai::Lhost::Outlook',
-          'Sisimai::Lhost::McAfee',
           'Sisimai::Lhost::OpenSMTPD',
-          'Sisimai::Lhost::AmazonSES',
-          'Sisimai::Lhost::AmazonWorkMail',
-          'Sisimai::Lhost::ReceivingSES',
+          'Sisimai::Lhost::GoogleWorkspace',
           'Sisimai::Lhost::Gmail',
+          'Sisimai::Lhost::GoogleGroups',
+          'Sisimai::Lhost::AmazonSES',
           'Sisimai::Lhost::X3',
         ],
         'dmarc-ietf-dmarc' => ['Sisimai::ARF'],
@@ -96,66 +71,39 @@ module Sisimai
         'failed-delivery'  => ['Sisimai::Lhost::X2'],
         'failure-delivery' => ['Sisimai::Lhost::X2'],
         'failure-notice'   => [
-          'Sisimai::Lhost::Yahoo',
           'Sisimai::Lhost::Qmail',
           'Sisimai::Lhost::MFILTER',
           'Sisimai::Lhost::Activehunter',
-          'Sisimai::Lhost::X4',
         ],
         'loop-alert'    => ['Sisimai::Lhost::FML'],
         'mail-delivery' => [
           'Sisimai::Lhost::Exim',
           'Sisimai::Lhost::DragonFly',
-          'Sisimai::Lhost::MailRu',
           'Sisimai::Lhost::GMX',
-          'Sisimai::Lhost::EinsUndEins',
           'Sisimai::Lhost::Zoho',
-          'Sisimai::Lhost::MessageLabs',
-          'Sisimai::Lhost::MXLogic',
+          'Sisimai::Lhost::EinsUndEins',
         ],
         'mail-could'   => ['Sisimai::Lhost::InterScanMSS'],
         'mail-failure' => ['Sisimai::Lhost::Exim'],
-        'mail-not'     => ['Sisimai::Lhost::X4'],
         'mail-system'  => ['Sisimai::Lhost::EZweb'],
         'message-delivery' => ['Sisimai::Lhost::MailFoundry'],
         'message-frozen'   => ['Sisimai::Lhost::Exim'],
-        'message-you'      => ['Sisimai::Lhost::Barracuda'],
-        'não-entregue'     => ['Sisimai::Lhost::Office365'],
         'non-recapitabile' => ['Sisimai::Lhost::Exchange2007'],
         'non-remis' => ['Sisimai::Lhost::Exchange2007'],
         'notice'    => ['Sisimai::Lhost::Courier'],
-        'onbestelbaar'       => ['Sisimai::Lhost::Office365'],
-        'permanent-delivery' => ['Sisimai::Lhost::X4'],
         'postmaster-notify'  => ['Sisimai::Lhost::Sendmail'],
         'returned-mail' => [
           'Sisimai::Lhost::Sendmail',
-          'Sisimai::Lhost::Aol',
-          'Sisimai::Lhost::V5sendmail',
-          'Sisimai::Lhost::Bigfoot',
           'Sisimai::Lhost::Biglobe',
+          'Sisimai::Lhost::V5sendmail',
           'Sisimai::Lhost::X1',
         ],
-        'sorry-your' => ['Sisimai::Lhost::Facebook'],
-        'there-was'  => ['Sisimai::Lhost::X6'],
-        'undeliverable' => [
-          'Sisimai::Lhost::Office365',
-          'Sisimai::Lhost::Exchange2007',
-          'Sisimai::Lhost::Aol',
-          'Sisimai::Lhost::Exchange2003',
-        ],
-        'undeliverable-mail' => [
-          'Sisimai::Lhost::Amavis',
-          'Sisimai::Lhost::MailMarshalSMTP',
-          'Sisimai::Lhost::IMailServer',
-        ],
+        'there-was'          => ['Sisimai::Lhost::X6'],
+        'undeliverable'      => ['Sisimai::Lhost::Exchange2007', 'Sisimai::Lhost::Exchange2003'],
+        'undeliverable-mail' => ['Sisimai::Lhost::MailMarshalSMTP', 'Sisimai::Lhost::IMailServer'],
         'undeliverable-message' => ['Sisimai::Lhost::Notes', 'Sisimai::Lhost::Verizon'],
-        'undelivered-mail' => [
-          'Sisimai::Lhost::Postfix',
-          'Sisimai::Lhost::Aol',
-          'Sisimai::Lhost::SendGrid',
-          'Sisimai::Lhost::Zoho',
-        ],
-        'warning' => ['Sisimai::Lhost::Sendmail', 'Sisimai::Lhost::Exim'],
+        'undelivered-mail'      => ['Sisimai::Lhost::Postfix', 'Sisimai::Lhost::Zoho'],
+        'warning'               => ['Sisimai::Lhost::Sendmail', 'Sisimai::Lhost::Exim'],
       }.freeze
 
       # @abstract Returns an MTA Order decided by the first word of the "Subject": header
@@ -178,10 +126,6 @@ module Sisimai
         return Subject[first] || []
       end
 
-      # @abstract Make default order of MTA modules to be loaded
-      # @return   [Array] Default order list of MTA modules
-      def default; return Sisimai::Lhost.index.map { |e| 'Sisimai::Lhost::' << e }; end
-
       # @abstract Make MTA module list as a spare
       # @return   [Array] Ordered module list
       def another; return [OrderE0, OrderE1].flatten; end

data/lib/sisimai/reason/authfailure.rb

@@ -52,10 +52,7 @@ module Sisimai
           return nil  if argvs['deliverystatus'].empty?
           return true if argvs['reason'] == 'authfailure'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'authfailure'
-
-          # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/badreputation.rb

@@ -19,6 +19,7 @@ module Sisimai
           '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",
         ].freeze
@@ -42,8 +43,7 @@ module Sisimai
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs['reason'] == 'badreputation'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/blocked.rb

@@ -39,6 +39,7 @@ module Sisimai
           'host network not allowed',
           'hosts with dynamic ip',
           'invalid ip for sending mail of domain',
+          'is in a black list',
           'is not allowed to send mail from',
           'no access from mail server',
           'no matches to nameserver query',
@@ -59,6 +60,7 @@ module Sisimai
           'to submit messages to this e-mail system has been rejected',
           'too many spams from your ip',  # free.fr
           'too many unwanted messages have been sent from the following ip address above',
+          'was blocked by ',
           'we do not accept mail from dynamic ips',   # @mail.ru
           'you are not allowed to connect',
           'you are sending spam',
@@ -67,16 +69,19 @@ module Sisimai
           'your server requires confirmation',
         ].freeze
         Pairs = [
+          ['(', '@', ':blocked)'],
           ['access from ip address ', ' blocked'],
           ['client host ', ' blocked using'],
           ['connections will not be accepted from ', " because the ip is in spamhaus's list"],
           ['dnsbl:rbl ', '>_is_blocked'],
           ['email blocked by ', '.barracudacentral.org'],
           ['email blocked by ', 'spamhaus'],
+          ['host ', ' refused to talk to me: ', ' blocked'],
           ['ip ', ' is blocked by earthlink'],    # Earthlink
           ['is in an ', 'rbl on '],
           ['mail server at ', ' is blocked'],
           ['mail from ',' refused:'],
+          ["mail from "," refused, see ", "orbs"],
           ['message from ', ' rejected based on blacklist'],
           ['messages from ', ' temporarily deferred due to user complaints'], # Yahoo!
           ['server ip ', ' listed as abusive'],
@@ -86,15 +91,9 @@ module Sisimai
           ['the ip', ' is blacklisted'],
           ['veuillez essayer plus tard. service refused, please try later. ', '103'],
           ['veuillez essayer plus tard. service refused, please try later. ', '510'],
+          ["your access ip", " has been rejected"],
           ["your sender's ip address is listed at ", '.abuseat.org'],
         ].freeze
-        Regex = %r{(?>
-           [(][^ ]+[@][^ ]+:blocked[)]
-          |host[ ][^ ]+[ ]refused[ ]to[ ]talk[ ]to[ ]me:[ ]\d+[ ]blocked
-          |is[ ]in[ ]a[ ]black[ ]list(?:[ ]at[ ][^ ]+[.])?
-          |was[ ]blocked[ ]by[ ][^ ]+
-          )
-        }x.freeze
 
         def text; return 'blocked'; end
         def description; return 'Email rejected due to client IP address or a hostname'; end
@@ -107,7 +106,6 @@ module Sisimai
           return nil unless argv1
           return true if Index.any? { |a| argv1.include?(a) }
           return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
-          return true if argv1 =~ Regex
           return false
         end
 
@@ -119,8 +117,7 @@ module Sisimai
         def true(argvs)
           return true if argvs['reason'] == 'blocked'
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'blocked'
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end

data/lib/sisimai/reason/contenterror.rb

@@ -38,7 +38,13 @@ module Sisimai
         # @return   [True,False]            true: rejected due to content error
         #                                   false: is not content error
         # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs); return nil; end
+        def true(argvs)
+          require 'sisimai/reason/spamdetected'
+          return true  if argvs["reason"] == "blocked"
+          return false if Sisimai::Reason::SpamDetected.true(argvs)
+          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]).to_s == "contenterror"
+          return match(argvs["diagnosticcode"].downcase)
+        end
 
       end
     end

data/lib/sisimai/reason/exceedlimit.rb

@@ -38,10 +38,7 @@ module Sisimai
           # Status: 5.2.3
           # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
           return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'exceedlimit'
-
-          # Check the value of Diagnosic-Code: header with patterns
-          return true if match(argvs['diagnosticcode'].downcase)
-          return false
+          return match(argvs['diagnosticcode'].downcase)
         end
 
       end