sisimai 4.25.5 → 4.25.6

data/lib/sisimai/reason.rb

@@ -5,6 +5,27 @@ module Sisimai
   module Reason
     # Imported from p5-Sisimail/lib/Sisimai/Reason.pm
     class << self
+      # All the error reason list Sisimai support
+      # @return   [Array] Reason list
+      def index
+        return %w[
+          Blocked ContentError ExceedLimit Expired Filtered HasMoved HostUnknown
+          MailboxFull MailerError MesgTooBig NetworkError NotAccept OnHold
+          Rejected NoRelaying SpamDetected VirusDetected PolicyViolation SecurityError
+          Suspend SystemError SystemFull TooManyConn UserUnknown SyntaxError
+        ]
+      end
+
+      # @abstract Returns Sisimai::Reason::* module path table
+      # @return   [Hash] Module path table
+      # @since    v4.25.6
+      def path
+        index = Sisimai::Reason.index
+        table = {}
+        index.each { |e| table['Sisimai::Reason::' << e] = 'sisimai/reason/' << e.downcase }
+        return table
+      end
+
       # Reason list better to retry detecting an error reason
       # @return   [Array] Reason list
       def retry
@@ -13,6 +34,7 @@ module Sisimai
           'networkerror' => 1, 'hostunknown' => 1, 'userunknown' => 1
         }.freeze
       end
+      ModulePath = Sisimai::Reason.path
       GetRetried = Sisimai::Reason.retry
       ClassOrder = [
         %w[
@@ -32,17 +54,6 @@ module Sisimai
         ]
       ]
 
-      # All the error reason list Sisimai support
-      # @return   [Array] Reason list
-      def index
-        return %w[
-          Blocked ContentError ExceedLimit Expired Filtered HasMoved HostUnknown
-          MailboxFull MailerError MesgTooBig NetworkError NotAccept OnHold
-          Rejected NoRelaying SpamDetected VirusDetected PolicyViolation SecurityError
-          Suspend SystemError SystemFull TooManyConn UserUnknown SyntaxError
-        ]
-      end
-
       # Detect the bounce reason
       # @param    [Sisimai::Data] argvs   Parsed email object
       # @return   [String, Nil]           Bounce reason or Nil if the argument
@@ -68,7 +79,7 @@ module Sisimai
             p = 'Sisimai::Reason::' << e
             r = nil
             begin
-              require p.downcase.gsub('::', '/')
+              require ModulePath[p]
               r = Module.const_get(p)
             rescue
               warn ' ***warning: Failed to load ' << p
@@ -127,7 +138,7 @@ module Sisimai
               p = 'Sisimai::Reason::' << e
               r = nil
               begin
-                require p.downcase.gsub('::', '/')
+                require ModulePath[p]
                 r = Module.const_get(p)
               rescue
                 warn ' ***warning: Failed to load ' << p
@@ -191,7 +202,7 @@ module Sisimai
           p = 'Sisimai::Reason::' << e
           r = nil
           begin
-            require p.downcase.gsub('::', '/')
+            require ModulePath[p]
             r = Module.const_get(p)
           rescue
             warn ' ***warning: Failed to load ' << p

data/lib/sisimai/reason/rejected.rb

@@ -36,6 +36,7 @@ module Sisimai
           'domain of sender address ',
           'emetteur invalide',
           'empty envelope senders not allowed',
+          'envelope blocked – ',
           'error: no third-party dsns',   # SpamWall - block empty sender
           'from: domain is invalid. please provide a valid from:',
           'fully qualified email address required',   # McAfee

data/lib/sisimai/reason/userunknown.rb

@@ -16,6 +16,14 @@ module Sisimai
     module UserUnknown
       # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
+        PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected]
+        ModulePath = {
+          'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
+          'Sisimai::Reason::Blocked'     => 'sisimai/reason/blocked',
+          'Sisimai::Reason::MailboxFull' => 'sisimai/reason/mailboxfull',
+          'Sisimai::Reason::HasMoved'    => 'sisimai/reason/hasmoved',
+          'Sisimai::Reason::Rejected'    => 'sisimai/reason/rejected',
+        }
         Regex = %r{(?>
            .+[ ]user[ ]unknown
           |[#]5[.]1[.]1[ ]bad[ ]address
@@ -47,6 +55,7 @@ module Sisimai
           |mailbox[ ](?:
              .+[ ]does[ ]not[ ]exist
             |.+[@].+[ ]unavailable
+            |does[ ]not[ ]exist
             |invalid
             |is[ ](?:inactive|unavailable)
             |not[ ](?:present|found)
@@ -74,7 +83,7 @@ module Sisimai
             )
           |non[- ]?existent[ ]user
           |not[ ](?:
-             a[ ]valid[ ]user[ ]here
+             a[ ]valid[ ](?:recipient|user[ ]here)
             |a[ ]local[ ]address
             |email[ ]addresses
             )
@@ -165,15 +174,13 @@ module Sisimai
             #   Status: 5.1.1
             #   Diagnostic-Code: SMTP; 550 5.1.1 <***@example.jp>:
             #     Recipient address rejected: User unknown in local recipient table
-            prematches = %w[NoRelaying Blocked MailboxFull HasMoved Blocked Rejected]
             matchother = false
-
-            while e = prematches.shift do
+            PreMatches.each do |e|
               # Check the value of "Diagnostic-Code" with other error patterns.
               p = 'Sisimai::Reason::' << e
               r = nil
               begin
-                require p.downcase.gsub('::', '/')
+                require ModulePath[p]
                 r = Module.const_get(p)
               rescue
                 warn '***warning: Failed to load ' << p

data/lib/sisimai/rfc3464.rb

@@ -92,21 +92,11 @@ module Sisimai
         ['"]?[<]?([^\s\n\r@=<>]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
       }xi.freeze
 
-
-      def description; 'Fallback Module for MTAs'; end
-      def smtpagent;   'RFC3464'; end
-      def headerlist;  return []; end
-
       # Detect an error for RFC3464
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or nil if it failed to parse or the
+      # @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 parse or the arguments are missing
       def make(mhead, mbody)
         require 'sisimai/mda'
 
@@ -384,7 +374,6 @@ module Sisimai
           bodyslices = mbody.split("\n")
           while e = bodyslices.shift do
             # Get the recipient's email address and error messages.
-            break if e.start_with?('__END_OF_EMAIL_MESSAGE__')
             d = e.downcase
             break if d =~ MarkingsOf[:rfc822]
             break if d =~ ReStop
@@ -405,7 +394,6 @@ module Sisimai
                 b = dscontents[-1]
               end
               b['recipient'] = y
-              b['agent'] = self.smtpagent + '::Fallback'
               recipients += 1
               itisbounce ||= true
 
@@ -428,7 +416,6 @@ module Sisimai
             dscontents << Sisimai::Lhost.DELIVERYSTATUS if dscontents.size == recipients
             b = dscontents[-1]
             b['recipient'] = r[0][:address]
-            b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
             recipients += 1
           end
         end
@@ -453,13 +440,10 @@ module Sisimai
 
           if mdabounced
             # Make bounce data by the values returned from Sisimai::MDA.make()
-            e['agent']     = mdabounced['mda'] || self.smtpagent
+            e['agent']     = mdabounced['mda'] || 'RFC3464'
             e['reason']    = mdabounced['reason'] || 'undefined'
             e['diagnosis'] = mdabounced['message'] unless mdabounced['message'].empty?
             e['command']   = ''
-          else
-            # Set the value of smtpagent
-            e['agent'] = self.smtpagent
           end
 
           e['status'] ||= Sisimai::SMTP::Status.find(e['diagnosis']) || ''
@@ -467,12 +451,11 @@ module Sisimai
             e['command'] = cv[1]
           end
           e['date'] ||= mhead['date']
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => rfc822text }
       end
-
+      def description; 'Fallback Module for MTAs'; end
     end
   end
 end

data/lib/sisimai/rfc3834.rb

@@ -38,21 +38,11 @@ module Sisimai
         [ ]*(.+)\z
       }xi.freeze
 
-      def description; 'Detector for auto replied message'; end
-      def smtpagent;   'RFC3834'; end
-      def headerlist;  return %w[auto-submitted precedence x-auto-response-suppress x-apple-action]; end
-
       # Detect auto reply message as RFC3834
-      # @param         [Hash] mhead       Message header of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or nil if it failed to parse or the
-      #                                   arguments are missing
+      # @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 parse or the arguments are missing
       def make(mhead, mbody)
         leave = 0
         match = 0
@@ -136,19 +126,16 @@ module Sisimai
         v['diagnosis'] ||= mhead['subject']
         v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
         v['reason']    = 'vacation'
-        v['agent']     = self.smtpagent
         v['date']      = mhead['date']
         v['status']    = ''
 
-        v.each_key { |a| v[a] ||= '' }
-
         if cv = mhead['subject'].match(SubjectSet)
           # Get the Subject header from the original message
           rfc822part = 'Subject: ' << cv[1] + "\n"
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end
-
+      def description; 'Detector for auto replied message'; end
     end
   end
 end

data/lib/sisimai/rhost/exchangeonline.rb

@@ -9,35 +9,38 @@ module Sisimai
 
         # https://technet.microsoft.com/en-us/library/bb232118
         StatusList = {
-          '4.3.1'  => [{ reason: 'systemfull', string: 'Insufficient system resources' }],
-          '4.3.2'  => [{ reason: 'notaccept',  string: 'System not accepting network messages' }],
-          '4.4.2'  => [{ reason: 'blocked',    string: 'Connection dropped' }],
-          '4.7.26' => [{
+          '4.3.1'   => [{ reason: 'systemfull', string: 'Insufficient system resources' }],
+          '4.3.2'   => [{ reason: 'notaccept',  string: 'System not accepting network messages' }],
+          '4.4.2'   => [{ reason: 'blocked',    string: 'Connection dropped' }],
+          '4.7.26'  => [{
               reason: 'securityerror',
               string: 'must pass either SPF or DKIM validation, this message is not signed'
           }],
-          '5.0.0'  => [{ reason: 'blocked',     string: 'HELO / EHLO requires domain address' }],
-          '5.1.4'  => [{ reason: 'systemerror', string: 'Destination mailbox address ambiguous' }],
-          '5.2.1'  => [{ reason: 'suspend',     string: 'Mailbox cannot be accessed' }],
-          '5.2.2'  => [{ reason: 'mailboxfull', string: 'Mailbox full' }],
-          '5.2.3'  => [{ reason: 'exceedlimit', string: 'Message too large' }],
-          '5.2.4'  => [{ reason: 'systemerror', string: 'Mailing list expansion problem' }],
-          '5.3.3'  => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
-          '5.3.4'  => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
-          '5.3.5'  => [{ reason: 'systemerror', string: 'System incorrectly configured' }],
-          '5.4.1'  => [{ reason: 'rejected',    string: 'Recipient address rejected: Access denied' }],
-          '5.4.14' => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
-          '5.5.2'  => [{ reason: 'syntaxerror', string: 'Send hello first' }],
-          '5.5.3'  => [{ reason: 'syntaxerror', string: 'Too many recipients' }],
-          '5.5.4'  => [{ reason: 'filtered',    string: 'Invalid domain name' }],
-          '5.5.6'  => [{ reason: 'contenterror',string: 'Invalid message content' }],
-          '5.7.1'  => [
+          '5.0.0'   => [{ reason: 'blocked',     string: 'HELO / EHLO requires domain address' }],
+          '5.1.4'   => [{ reason: 'systemerror', string: 'Destination mailbox address ambiguous' }],
+          '5.2.1'   => [{ reason: 'suspend',     string: 'Mailbox cannot be accessed' }],
+          '5.2.2'   => [{ reason: 'mailboxfull', string: 'Mailbox full' }],
+          '5.2.3'   => [{ reason: 'exceedlimit', string: 'Message too large' }],
+          '5.2.4'   => [{ reason: 'systemerror', string: 'Mailing list expansion problem' }],
+          '5.2.122' => [{ reason: 'toomanyconn' ,string: 'The recipient has exceeded their limit for' }],
+          '5.3.3'   => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
+          '5.3.4'   => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
+          '5.3.5'   => [{ reason: 'systemerror', string: 'System incorrectly configured' }],
+          '5.4.1'   => [{ reason: 'rejected',    string: 'Recipient address rejected: Access denied' }],
+          '5.4.11'  => [{ reason: 'contenterror',string: 'Agent generated message depth exceeded' }],
+          '5.4.14'  => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
+          '5.5.2'   => [{ reason: 'syntaxerror', string: 'Send hello first' }],
+          '5.5.3'   => [{ reason: 'syntaxerror', string: 'Too many recipients' }],
+          '5.5.4'   => [{ reason: 'filtered',    string: 'Invalid domain name' }],
+          '5.5.6'   => [{ reason: 'contenterror',string: 'Invalid message content' }],
+          '5.7.1'   => [
               { reason: 'securityerror', string: 'Delivery not authorized' },
               { reason: 'securityerror', string: 'Client was not authenticated' },
               { reason: 'norelaying',    string: 'Unable to relay' },
           ],
-          '5.7.25'  => [{ reason: 'blocked',      string: 'must have a reverse DNS record' }],
-          '5.7.506' => [{ reason: 'blocked',      string: 'Bad HELO' }],
+          '5.7.25'  => [{ reason: 'blocked', string: 'must have a reverse DNS record' }],
+          '5.7.51'  => [{ reason: 'blocked', string: 'RestrictDomainsToIPAddresses or RestrictDomainsToCertificate' }],
+          '5.7.506' => [{ reason: 'blocked', string: 'Bad HELO' }],
           '5.7.508' => [{ reason: 'toomanyconn',  string: 'has exceeded permitted limits within ' }],
           '5.7.509' => [{ reason: 'rejected',     string: 'does not pass DMARC verification' }],
           '5.7.510' => [{ reason: 'notaccept',    string: 'does not accept email over IPv6' }],

data/lib/sisimai/smtp.rb

@@ -3,19 +3,6 @@ module Sisimai
   module SMTP
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/SMTP.pm
-
-      # Detector for SMTP commands in a bounce mail message
-      # @private
-      # @return   [Hash] SMTP command regular expressions
-      def command
-        return {
-          helo: %r/\b(?:HELO|EHLO)\b/,
-          mail: %r/\bMAIL F(?:ROM|rom)\b/,
-          rcpt: %r/\bRCPT T[Oo]\b/,
-          data: %r/\bDATA\b/,
-        }
-      end
-
     end
   end
 end

data/lib/sisimai/string.rb

@@ -8,11 +8,6 @@ module Sisimai
         body: %r|<head>.+</head>.*<body[ >].+</body>|im,
       }
 
-      # End of email message as a sentinel for parsing bounce messages
-      # @private
-      # @return   [String] Fixed length string like a constant
-      def EOM; return '__END_OF_EMAIL_MESSAGE__'; end
-
       # Create message token from addresser and recipient
       # @param  [String]  addr1 Sender address
       # @param  [String]  addr2 Recipient address
@@ -40,8 +35,8 @@ module Sisimai
       #                           true:  Including 8-bit character
       def is_8bit(argvs)
         v = argvs.to_s
-        return nil   if v.empty?
-        return true  unless v =~ /\A[\x00-\x7f]*\z/
+        return nil  if v.empty?
+        return true unless v =~ /\A[\x00-\x7f]*\z/
         return false
       end
 
@@ -65,7 +60,6 @@ module Sisimai
         return nil if argv1.empty?
 
         plain = argv1
-
         if loose || plain =~ Match[:html] || plain =~ Match[:body]
           # 1. Remove <head>...</head>
           # 2. Remove <style>...</style>
@@ -114,9 +108,7 @@ module Sisimai
           # Unknown encoding name or failed to encode
           getencoded = argv1.force_encoding('UTF-8')
         end
-        getencoded = getencoded.scrub('?')
-
-        return getencoded
+        return getencoded.scrub('?')
       end
 
     end

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.25.5'.freeze
+  VERSION = '4.25.6'.freeze
 end

data/set-of-emails/maildir/bsd/arf-24.eml

@@ -0,0 +1,50 @@
+Delivered-To: abuse-report@example.com
+Received: by 192.0.2.25 with SMTP id fffffffff000000;
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+X-Received: by 192.0.2.2 with SMTP id eeeeeeeee0000001.222.1500000000000;
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+Return-Path: <neko@example.org>
+Received: from CAT000-NEKO2.example.com (cat000-neko2.example.com. [203.0.113.25])
+    by mx.example.com with ESMTPS id fffffffff11111.222.2016.04.29.23.34.45
+    for <abuse-report@example.com>
+    (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+    Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
+Received: from CAT000-NEKO-022.r.example.org ([198.51.100.1]) by CAT004-R.example.com
+    with Microsoft SMTPSVC(7.5.7601.22751); Thu, 29 Apr 2016 23:34:45 +0000
+Date: Thu, 29 Apr 2016 23:34:45 +0000
+From: staff@hotmail.com
+Subject:  complaint about message from 192.0.2.222
+To: abuse-report@example.com
+MIME-Version: 1.0 
+Content-Type: multipart/mixed; boundary="F0000EEE2-0000-2111-AAB0-000000000000"
+Message-ID: <CAT0-NNE-000000000000000022@CAT0-RRR.example.org>
+X-OriginalArrivalTime: 29 Apr 2016 23:34:45.0000 (UTC) FILETIME=[FFFFFFFF:00000000]
+Return-Path: neko@example.org
+
+--F0000EEE2-0000-2111-AAB0-000000000000
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+X-HmXmrOriginalRecipient: kijitora@example.com
+X-Reporter-IP: 192.0.2.22
+Authentication-Results: example.com; spf=pass (sender IP is 203.0.113.245; identity alignment result is pass and alignment mode is relaxed) smtp.mailfrom=sironeko@example.com; dkim=pass (identity alignment result is pass and alignment mode is relaxed) header.d=example.com; x-hmca=pass header.id=sironeko@example.com
+X-SID-PRA: sironeko@example.com
+X-AUTH-Result: PASS
+X-SID-Result: PASS
+Received: from smtp.example.com ([203.0.113.245]) by R7038-AA.example.com over TLS
+    secured channel with Microsoft SMTPSVC(7.5.7601.23008);
+    Thu, 29 Apr 2016 23:34:45 +0000
+Date: Thu, 29 Apr 2016 23:34:45 +0200
+To: kijitora@example.com
+From: name-part-looks-like-an-email-address@kyoto-japan
+    <sironeko@example.com>
+Subject: Nyaan
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset="utf-8"
+Message-ID: <0000000000fffffffff0000000000000@example.com>
+X-OriginalArrivalTime: 29 Apr 2016 23:34:45.0000 (UTC) FILETIME=[00000000:FFFFFFFF]
+
+Nyaan
+
+--F0000EEE2-0000-2111-AAB0-000000000000--