sisimai 4.17.2-java → 4.18.0-java

data/lib/sisimai/mta/exim.rb

@@ -221,11 +221,7 @@ module Sisimai
               #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
               v = dscontents[-1]
 
-              if e =~ /[ \t]*This is a permanent error[.][ \t]*/
-                # deliver.c:6811|  "recipients. This is a permanent error. The following address(es) failed:\n");
-                v['softbounce'] = 0
-
-              elsif cv = e.match(/\A[ ][ ]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)(:.+)?\z/) || e.match(Re1[:alias])
+              if cv = e.match(/\A[ ][ ]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)(:.+)?\z/) || e.match(Re1[:alias])
                 #   kijitora@example.jp
                 #   sabineko@example.jp: forced freeze
                 #
@@ -497,33 +493,17 @@ module Sisimai
 
             if v1 > 0
               # Status or SMTP reply code exists
-              if v1 % 5 == 0
-                # Both "Status" and SMTP reply code indicate permanent error
-                e['softbounce'] = 0
-
-              elsif v1 % 4 == 0
-                # Both "Status" and SMTP reply code indicate temporary error
-                e['softbounce'] = 1
-
-              else
-                # Mismatch error type...?
-                if r1 > 0
-                  # Set pseudo DSN into the value of "status" accessor
-                  e['status'] = sv
-                  e['softbounce'] = r1 == 4 ? 1 : 0
-                end
-              end
+              # Set pseudo DSN into the value of "status" accessor
+              e['status'] = sv if r1 > 0
             else
               # Neither Status nor SMTP reply code exist
               if e['reason'] =~ /\A(?:expired|mailboxfull)/
                 # Set pseudo DSN (temporary error)
                 sv = Sisimai::SMTP::Status.code(e['reason'], true)
-                e['softbounce'] = 1
 
               else
                 # Set pseudo DSN (permanent error)
                 sv = Sisimai::SMTP::Status.code(e['reason'], false)
-                e['softbounce'] = 0
               end
             end
             e['status'] ||= sv

data/lib/sisimai/mta/mailfoundry.rb

@@ -110,15 +110,9 @@ module Sisimai
                   next if v['diagnosis'].nil? || v['diagnosis'].empty?
                   next if e =~ /\A[-]+/
 
-                  if e =~ /\AThis has been a permanent failure/
-                    # This has been a permanent failure.  No further delivery attempts will be made.
-                    v['softbounce'] = 0
-
-                  else
-                    # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
-                    v['diagnosis'] ||= ''
-                    v['diagnosis']  += ' ' + e
-                  end
+                  # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
+                  v['diagnosis'] ||= ''
+                  v['diagnosis']  += ' ' + e
                 end
               end
             end

data/lib/sisimai/mta/mxlogic.rb

@@ -152,11 +152,7 @@ module Sisimai
               #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
               v = dscontents[-1]
 
-              if e =~ /[ \t]*This is a permanent error[.][ \t]*/
-                # deliver.c:6811|  "recipients. This is a permanent error. The following address(es) failed:\n");
-                v['softbounce'] = 0
-
-              elsif cv = e.match(/\A[ \t]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
+              if cv = e.match(/\A[ \t]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
                 # A message that you have sent could not be delivered to one or more
                 # recipients.  This is a permanent error.  The following address failed:
                 #

data/lib/sisimai/mta/x4.rb

@@ -220,11 +220,7 @@ module Sisimai
               # Giving up on 192.0.2.153.
               v = dscontents[-1]
 
-              if cv = e.match(/\AThis is a permanent error;/)
-                # This is a permanent error; I've given up. Sorry it didn't work out.
-                v['softbounce'] = 0
-
-              elsif cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ ]*\z/)
+              if cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ ]*\z/)
                 # <kijitora@example.jp>:
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.

data/lib/sisimai/order.rb

@@ -12,11 +12,12 @@ module Sisimai
         # These modules have many subject patterns or have MIME encoded subjects
         # which is hard to code as regular expression
         'Sisimai::MTA::Exim',
-        'Sisimai::MTA::Exchange',
+        'Sisimai::MTA::Exchange2003',
       ]
       AnotherList2 = [
         # These modules have no MTA specific header and did not listed in the
         # following subject header based regular expressions.
+        'Sisimai::MTA::Exchange2007',
         'Sisimai::MSP::US::Facebook',
         'Sisimai::MSP::JP::KDDI',
       ]
@@ -121,7 +122,8 @@ module Sisimai
           ],
           %r/undeliver/i => [
             'Sisimai::MTA::Postfix',
-            'Sisimai::MTA::Exchange',
+            'Sisimai::MTA::Exchange2007',
+            'Sisimai::MTA::Exchange2003',
             'Sisimai::MTA::Notes',
             'Sisimai::MSP::US::Office365',
             'Sisimai::MSP::US::Verizon',

data/lib/sisimai/smtp.rb

@@ -10,6 +10,7 @@ module Sisimai
       #                             false: Hard bounce
       #                             nil: May not be bounce ?
       def is_softbounce(argv1 = '')
+        warn sprintf(" ***warning: Obsoleted method, use Sisimai::SMTP::Error.soft_or_hard() instead.");
         return nil unless argv1
         return nil unless argv1.size > 0
 

data/lib/sisimai/smtp/error.rb

@@ -0,0 +1,149 @@
+module Sisimai
+  module SMTP
+    # Sisimai::SMTP::Error is utilities for checking SMTP Errors from error
+    # message text.
+    module Error
+      # Imported from p5-Sisimail/lib/Sisimai/SMTP/Error.pm
+      class << self
+        require 'sisimai/smtp/reply'
+        require 'sisimai/smtp/status'
+
+        SoftOrHard = {
+          :soft => [
+            'blocked', 'contenterror', 'exceedlimit', 'expired', 'filtered',
+            'mailboxfull', 'mailererror', 'mesgtoobig', 'networkerror', 'norelaying',
+            'rejected', 'securityerror', 'spamdetected', 'suspend', 'syntaxerror',
+            'systemerror', 'systemfull', 'toomanyconn',
+          ],
+          :hard => ['hasmoved', 'hostunknown', 'userunknown']
+        }
+
+        # Permanent error or not
+        # @param    [String] argv1  String including SMTP Status code
+        # @return   [Boolean]       true:  Permanet error
+        #                           false: Temporary error
+        #                           nil:   is not an error
+        # @since v4.17.3
+        def is_permanent(argv1 = '')
+          return nil unless argv1
+          return nil unless argv1.size > 0
+
+          statuscode = nil
+          classvalue = nil
+          getchecked = nil
+
+          statuscode = Sisimai::SMTP::Status.find(argv1)
+          statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
+          classvalue = statuscode[0, 1].to_i
+
+          if classvalue > 0
+            # 2, 4, or 5
+            if classvalue == 5
+              # Permanent error
+              getchecked = true
+
+            elsif classvalue == 4
+              # Temporary error
+              getchecked = false
+
+            elsif classvalue == 2
+              # Succeeded
+              getchecked = nil
+            end
+          else
+            # Check with regular expression
+            if argv1 =~ /(?:temporar|persistent)/i
+              # Temporary failure
+              getchecked = false
+
+            elsif argv1 =~ /permanent/i
+              # Permanently failure
+              getchecked = true
+
+            else
+              # did not find information to decide that it is a soft bounce
+              # or a hard bounce.
+              getchecked = nil
+            end
+          end
+
+          return getchecked
+        end
+
+        # Check softbounce or not
+        # @param    [String] argv1  Detected bounce reason
+        # @param    [String] argv2  String including SMTP Status code
+        # @return   [String]        'soft': Soft bounce
+        #                           'hard': Hard bounce
+        #                           '':     May not be bounce ?
+        # @since v4.17.3
+        def soft_or_hard(argv1 = '', argv2 = '')
+          return '' if argv1.empty?
+
+          getchecked = nil
+          statuscode = nil
+          classvalue = nil
+          softorhard = nil
+
+          if argv1 =~ /\A(?:delivered|feedback|vacation)\z/
+            # These are not dealt as a bounce reason
+            softorhard = ''
+
+          elsif argv1 == 'onhold' || argv1 == 'undefined'
+            # Check with the value of D.S.N. in $argv2
+            getchecked = Sisimai::SMTP::Error.is_permanent(argv2)
+
+            if getchecked.nil?
+              # The value is not defined (returned undef)
+              softorhard = ''
+            else
+              # The value is 0 or 1
+              softorhard = getchecked == 1 ? 'hard' : 'soft'
+            end
+          elsif argv1 == 'notaccept'
+            # NotAccept: 5xx => hard bounce, 4xx => soft bounce
+            if argv2.size > 0
+              # Get D.S.N. or SMTP reply code from The 2nd argument string
+              statuscode = Sisimai::SMTP::Status.find(argv2)
+              statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
+              classvalue = statuscode[0, 1].to_i
+
+              if classvalue == 4
+                # Deal as a "soft bounce"
+                softorhard = 'soft'
+              else
+                # 5 or 0, deal as a "hard bounce"
+                softorhard = 'hard'
+              end
+            else
+              # "notaccept" is a hard bounce
+              softorhard = 'hard'
+            end
+          else
+            # Check all the reasons defined at the above
+            catch :SOFT_OR_HARD do
+              loop do
+                [:hard, :soft].each do |e|
+                  # Soft or Hard?
+                  SoftOrHard[e].each do |f|
+                    # Hard bounce?
+                    next unless argv1 == f
+                    softorhard = e.to_s
+                    throw :SOFT_OR_HARD
+                  end
+                end
+
+                break
+              end
+            end
+          end
+
+          sortorhard = '' if softorhard.nil?
+          return softorhard
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/smtp/reply.rb

@@ -70,6 +70,20 @@ module Sisimai
           return '' unless argv1.size > 0
           return '' if argv1 =~ /X-Unix;/i
 
+          ip4re = %r{\b
+            (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
+            (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
+            (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
+            (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])
+          \b}x;
+
+          if argv1 =~ ip4re
+            # Convert found IPv4 addresses to '***.***.***.***' to avoid that
+            # the following code detects an octet of the IPv4 adress as an SMTP
+            # reply code.
+            argv1 = argv1.gsub(/#{ip4re}/, '***.***.***.***')
+          end
+
           if cv = argv1.match(/\b([45][0-5][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
             # 550, 447, or 250
             return cv[1]

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.17.2'
+  VERSION = '4.18.0'
 end

data/set-of-emails/maildir/bsd/README.md

@@ -11,12 +11,18 @@ Sisimai::ARF
   * [fbl-hotmail.txt](https://github.com/prasad83/node-bounce-handler/blob/master/eml/fbl-hotmail.txt)
   * Copyright (c) 2014 prasad83 | The MIT License
 
-Sisimai::MTA::Exchange
-----------------------
+Sisimai::MTA::Exchange2003
+--------------------------
 * exchange-06.eml
   * mailman-2.1.15/tests/bounces/groupwise_01.txt
   * Copyright (C) 1989, 1991 Free Software Foundation, Inc. | GPLv2
 
+Sisimai::MTA::Exchange2007
+--------------------------
+* exchange2007-02.eml
+  * [message-too-large.msg](https://github.com/rjbs/Mail-DeliveryStatus-BounceParser/blob/master/t/corpus/message-too-large.msg)
+  * Copyright (C) 2003-2006 IC Group, Inc. | GPLv2
+
 Sisimai::MTA::Exim
 ------------------
 * exim-09.eml

data/set-of-emails/maildir/bsd/exchange2007-01.eml

@@ -0,0 +1,151 @@
+Return-Path: <>
+X-Original-To: kijitora@example.jp
+Delivered-To: kijitora@example.jp
+Received: from localhost (localhost [127.0.0.1])
+	by example.jp.localdomain (Postfix) with ESMTP id FFFF0000FFFF
+	for <kijitora@example.jp>; Thu, 22 Feb 2011 23:34:45 +0900 (JST)
+Received: from example.jp.localdomain ([127.0.0.1])
+	by localhost (example.jp [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id ffff00ee for <kijitora@example.jp>;
+	Thu, 22 Feb 2011 23:34:45 +0900 (JST)
+MIME-Version: 1.0
+From: mailer-daemon@example.com
+To: kijitora@example.jp
+Date: Thu, 22 Feb 2011 23:34:45 +0900
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="0000ffff-0000-0000-0000-0000"
+Content-Language: en-US
+Message-ID: <000000000000000000000000000000000000000000000000@example.com>
+Subject: Undeliverable: Nyaan
+
+--0000ffff-0000-0000-0000-0000
+Content-Type: multipart/alternative; differences=Content-Type;
+	boundary="eeee0000-0022-2200-2220"
+
+--eeee0000-0022-2200-2220
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+Delivery has failed to these recipients or distribution lists:
+
+Neko<mailto:mikeneko@example.co.jp>
+The recipient's e-mail address was not found in the recipient's e-mail syst=
+em. Microsoft Exchange will not try to redeliver this message for you. Plea=
+se check the e-mail address and try resending this message, or provide the =
+following diagnostic text to your system administrator.
+
+________________________________
+Sent by Microsoft Exchange Server 2007
+
+
+
+
+
+
+Diagnostic information for administrators:
+
+Generating server: mta4.example.org
+
+mikeneko@example.co.jp
+#550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##
+
+Original message headers:
+
+Received: from mx9.example.net (172.21.25.141) by SMTP2.TCAABUDHABI.AE
+ (172.21.24.13) with Microsoft SMTP Server id 8.2.234.1; Thu, 22 Feb 2011
+ 23:34:45 +0900
+Date: Thu, 22 Feb 2011 23:34:45 +0900
+Subject: Nyaan
+From: Kijitora <kijitora@example.jp>
+To: Neko <mikeneko@example.co.jp>
+MIME-Version: 1.0
+Content-Type: text/plain;
+
+--eeee0000-0022-2200-2220
+Content-Type: text/html; charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+<html>
+<Head></head><body>
+<p><b><font color=3D"#000066" size=3D"3" face=3D"Arial">Delivery has failed=
+ to these recipients or distribution lists:</font></b></p>
+<font color=3D"#000000" size=3D"2" face=3D"Tahoma"><p><a href=3D"mailto:mik=
+eneko@example.co.jp">Neko</a><br>
+The recipient's e-mail address was not found in the recipient's e-mail syst=
+em. Microsoft Exchange will not try to redeliver this message for you. Plea=
+se check the e-mail address and try resending this message, or provide the =
+following diagnostic text to your system administrator.</p>
+</font>
+<HR/><font color=3D"#808080" size=3D"1" face=3D"Arial">Sent by Microsoft Ex=
+change Server 2007</font>
+<br><br><br><br><br><br>
+<font color=3D"#808080" size=3D"2" face=3D"Tahoma"><p><b>Diagnostic informa=
+tion for administrators:</b></p>
+<p>Generating server: mx4.example.org</p>
+<p>mikeneko@example.co.jp<br>
+ #550 5.1.1 RESOLVER.ADR.RecipNotFound; not found ##</p>
+<p>Original message headers:</p>
+<pre>Received: from mx9.example.net (192.0.2.229) by mx5.example.net
+ (192.0.2.225) with Microsoft SMTP Server id 8.2.222.2; Thu, 22 Feb 2011
+ 23:34:45 +0900
+Date: Thu, 22 Feb 2011 23:34:45 +0900
+Subject: Nyaan
+From: Kijitora &lt;kijitora@example.jp&gt;
+To: Neko &lt;mikeneko@example.co.jp&gt;
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary=3D&quot;_=3Dneko00022222002202020=3D_&quot;
+</pre>
+</font>
+</body>
+</html>=
+
+--eeee0000-0022-2200-2220--
+
+--0000ffff-0000-0000-0000-0000
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns;mx4.example.org
+Received-From-MTA: dns;mx9.example.net
+Arrival-Date: Thu, 22 Feb 2011 23:34:45 +0900
+
+Final-Recipient: rfc822;mikeneko@example.co.jp
+Action: failed
+Status: 5.1.1
+Diagnostic-Code: smtp;550 5.1.1 RESOLVER.ADR.RecipNotFound; not found
+X-Display-Name: Neko
+
+
+--0000ffff-0000-0000-0000-0000
+Content-Type: message/rfc822
+
+Received: from mx9.example.net (192.0.2.229) by mx8.example.net
+ (192.0.2.228) with Microsoft SMTP Server id 8.2.222.2; Thu, 22 Feb 2011
+ 23:34:45 +0900
+Date: Thu, 22 Feb 2011 23:34:45 +0900
+Subject: Nyaan
+From: Kijitora <kijitora@example.jp>
+To: Neko <mikeneko@example.co.jp>
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="_=neko00022222002202020=_"
+
+--_=neko00022222002202020=_
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+Nyaan
+
+--_=neko00022222002202020=_
+Content-Type: text/html; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+<html><body><head></head>
+Nyaan
+</body>
+</html>
+
+--_=neko00022222002202020=_--
+
+--0000ffff-0000-0000-0000-0000--
+