sisimai 4.22.5 → 4.22.6

data/lib/sisimai/reason/filtered.rb

@@ -21,29 +21,22 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             because[ ]the[ ]recipient[ ]is[ ]only[ ]accepting[ ]mail[ ]from[ ]
-              specific[ ]email[ ]addresses    # AOL Phoenix
-            |bounced[ ]address  # SendGrid|a message to an address has previously been Bounced.
-            |due[ ]to[ ]extended[ ]inactivity[ ]new[ ]mail[ ]is[ ]not[ ]currently[ ]
-              being[ ]accepted[ ]for[ ]this[ ]mailbox
-            |has[ ]restricted[ ]sms[ ]e-mail    # AT&T
-            |http://postmaster[.]facebook[.]com/.+refused[ ]due[ ]to[ ]recipient[ ]preferences # Facebook
-            |is[ ]not[ ]accepting[ ]any[ ]mail
-            |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
-            |resolver[.]rst[.]notauthorized # Microsoft Exchange
-            |this[ ]account[ ]is[ ]protected[ ]by
-            |user[ ](?:
-              not[ ]found  # Filter on MAIL.RU
-             |reject
-             )
-            |we[ ]failed[ ]to[ ]deliver[ ]mail[ ]because[ ]the[ ]following[ ]address
-                [ ]recipient[ ]id[ ]refuse[ ]to[ ]receive[ ]mail    # Willcom
-            )
-            |you[ ]have[ ]been[ ]blocked[ ]by[ ]the[ ]recipient
-          }x
+          index = [
+            'because the recipient is only accepting mail from specific email addresses',   # AOL Phoenix
+            'bounced address',  # SendGrid|a message to an address has previously been Bounced.
+            'due to extended inactivity new mail is not currently being accepted for this mailbox',
+            'has restricted sms e-mail',    # AT&T
+            'is not accepting any mail',
+            'refused due to recipient preferences', # Facebook
+            'resolver.rst.notauthorized',   # Microsoft Exchange
+            'this account is protected by',
+            'user not found',   # Filter on MAIL.RU
+            'user reject',
+            'we failed to deliver mail because the following address recipient id refuse to receive mail',  # Willcom
+            'you have been blocked by the recipient',
+          ]
 
-          return true if argv1 =~ regex
+          return true if index.find { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -23,7 +23,9 @@ module Sisimai
 
           # Destination mail server does not accept any message
           index = [
+            'host/domain does not accept mail', # iCloud
             'name server: .: host not found',   # Sendmail
+            'no mx record found for domain=',   # Oath(Yahoo!)
             'smtp protocol returned a permanent error',
           ]
 

data/lib/sisimai/reason/spamdetected.rb

@@ -74,6 +74,7 @@ module Sisimai
               |filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
               |system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
               )
+            |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
             |probable[ ]spam
             |reject[ ]bulk[.]advertising
             |reject,.+[ ][-][ ]spam[.][ ]

data/lib/sisimai/rhost.rb

@@ -14,6 +14,8 @@ module Sisimai
         'mailstore1.secureserver.net' => 'GoDaddy',
         'laposte.net'                 => 'FrancePTT',
         'orange.fr'                   => 'FrancePTT',
+        'lsean.ezweb.ne.jp'           => 'KDDI',
+        'msmx.au.com'                 => 'KDDI',
       }.freeze
 
       # Retrun the list of remote hosts Sisimai support
@@ -48,7 +50,6 @@ module Sisimai
       def get(argvs)
         return nil unless argvs
         return nil unless argvs.is_a? Sisimai::Data
-        return argvs.reason if argvs.reason.size > 0
 
         remotehost = argvs.rhost.downcase
         rhostclass = ''

data/lib/sisimai/rhost/kddi.rb

@@ -0,0 +1,40 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Data
+    # object as an argument of get() method when the value of "rhost" of the object
+    # is "lsean.ezweb.ne.jp" or "msmx.au.com".
+    # This class is called only Sisimai::Data class.
+    module KDDI
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/KDDI.pm
+        MessagesOf = {
+          filtered:    '550 : User unknown',  # The response was: 550 : User unknown
+          userunknown: '>: User unknown',     # The response was: 550 <...>: User unknown
+        }.freeze
+
+        # Detect bounce reason from au (KDDI)
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String]                The bounce reason for au.com or ezweb.ne.jp
+        def get(argvs)
+          return nil unless argvs
+          return nil unless argvs.is_a? Sisimai::Data
+
+          statusmesg = argvs.diagnosticcode
+          reasontext = ''
+
+          MessagesOf.each_key do |e|
+            # Try to match the error message with message patterns defined in $MessagesOf
+            next unless statusmesg.end_with?(MessagesOf[e])
+            reasontext = e.to_s
+            break
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+
+

data/lib/sisimai/smtp/error.rb

@@ -79,18 +79,8 @@ module Sisimai
             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?
-              softorhard = ''
-            else
-              softorhard = if getchecked
-                             'hard'
-                           else
-                             'soft'
-                           end
-            end
+            # It should be "soft" when a reason is "onhold" or "undefined"
+            softorhard = 'soft'
 
           elsif argv1 == 'notaccept'
             # NotAccept: 5xx => hard bounce, 4xx => soft bounce

data/lib/sisimai/version.rb

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

data/set-of-emails/README.md

@@ -1,18 +1,15 @@
-         ____       _      ___   __   _____                 _ _     
-        / ___|  ___| |_   / _ \ / _| | ____|_ __ ___   __ _(_) |___ 
-        \___ \ / _ \ __| | | | | |_  |  _| | '_ ` _ \ / _` | | / __|
-         ___) |  __/ |_  | |_| |  _| | |___| | | | | | (_| | | \__ \
-        |____/ \___|\__|  \___/|_|   |_____|_| |_| |_|\__,_|_|_|___/
-                                                                    
+<p align="center"><img src="logo/horizontalversions.png" alt="set-of-emails" height="180px"></p>
+
+  
 About "set-of-emails" repository
-================================
+================================================================================
 This repository hold bounce mail collections for developing Sisimai. Email files
 in this repository are read from `make test` at p5-Sisimai and rb-Sisimai.
 
 
 | Directory                     | Description                                  |
 |-------------------------------|----------------------------------------------|
-| jsonobj/                      | JSON formatted bounce objects                |
+| jsonobj/                      | JSON files include bounce objects            |
 | mailbox/                      | Unix mbox files                              |
 | maildir/                      | Email files                                  |
 |  - bsd/                       | A newline is LF                              |
@@ -28,9 +25,22 @@ in this repository are read from `make test` at p5-Sisimai and rb-Sisimai.
 | to-be-parsed-for-test/        | Email files to be parsed for test            |
 
 See Also
-========
+================================================================================
 * __Sisimai Project__ | [github.com/sisimai](https://github.com/sisimai)
 * __libsisimai.org__ | [Sisimai — A successor to bounceHammer, Library to parse error mails](https://libsisimai.org/)
 * __Perl Verson__ | [Perl version of Sisimai(Stable)](https://github.com/sisimai/p5-Sisimai)
 * __Ruby verson__ | [Ruby version of Sisimai(Under the development)](https://github.com/sisimai/rb-Sisimai)
 
+Author
+===============================================================================
+[@azumakuniyuki](https://twitter.com/azumakuniyuki)
+
+Copyright
+===============================================================================
+Copyright (C) 2018 azumakuniyuki, All Rights Reserved.
+
+License
+===============================================================================
+This software is distributed under The BSD 2-Clause License.
+Files in logo/ created by @batarian71 are distributed under CC BY 4.0
+

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

@@ -0,0 +1,57 @@
+Received: from fbl-01.returnpath.example.net (fbl-01.returnpath.example.net [192.0.2.178])
+	by mta3.eu.example.net (Postfix) with ESMTP id 000000000000000
+	for <sironeko@example.com>; Thu, 29 Apr 2015 23:34:45 +0000 (UTC)
+Received: from fbl-02.r.returnpath.example.net (fbl-02.r.returnpath.example.net [192.0.2.110])
+	by fbl-01.returnpath.example.net (Postfix) with ESMTP id 2222222222
+	for <sironeko@example.com>; Thu, 29 Apr 2015 23:34:45 +0000 (UTC)
+Received: by fbl-02.r.returnpath.example.net (Postfix, from userid 333333)
+	id AAAAAAAAAA; Thu, 29 Apr 2015 23:34:45 +0000 (UTC)
+Content-Transfer-Encoding: binary
+Content-Type: multipart/report; boundary="_----------=_15000000000000000000";
+    report-type="feedback-report"
+MIME-Version: 1.0
+Date: Thu, 29 Apr 2015 23:34:45 +0000
+Subject: Abuse Report
+To: sironeko@example.com
+From: feedbackloop@feedback.example.org
+Message-Id: <20150429000000.00000000FF@fbl-02.r.returnpath.example.net>
+
+This is a multi-part message in MIME format.
+
+--_----------=_15000000000000000000
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain
+
+This is a Example email abuse report for an email message received from IP 192.0.2.222 on Thu, 29 Apr 2015 23:34:45 +0000
+
+
+--_----------=_15000000000000000000
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+Content-Type: message/feedback-report
+
+User-Agent: ReturnPathFBL/1.0
+Abuse-Type: complaint
+Arrival-Date: Thu, 29 Apr 2015 23:34:45 +0000
+Feedback-Type: abuse
+Version: 1
+Source-IP: 192.0.2.222
+Original-Mail-From: kijitora@example.net
+
+--_----------=_15000000000000000000
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: message/rfc822
+
+Return-Path: <kijitora@example.net>
+Received: from [192.0.2.22] by mta2.r.example.org (LMTP);
+  Thu, 29 Apr 2015 23:34:45 +0000 (UTC)
+Date: Thu, 29 Apr 2015 23:34:45 +0000
+To: "undisclosed"
+From: Kijitora <kijitora@example.net>
+Subject: Nyaan
+Message-ID: <ffffffffffffffffffffffff00000000@example.net>
+
+Nyaan
+

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

@@ -0,0 +1,68 @@
+Return-Path: <fbl@senderscore.example.net>
+Received: from fbl-02.r.returnpath.example.net (unknown [192.0.2.222])
+	by fbl-01.returnpath.example.net (Postfix) with ESMTP id 0000000000
+	for <fbl@example.com>; Thu, 29 Apr 2015 23:34:45 +0900 (JST)
+Received: by fbl-02.r.returnpath.example.net (Postfix, from userid 106706)
+	id EEEEEEEEEE; Thu, 29 Apr 2015 23:34:45 +0900 (JST)
+Content-Transfer-Encoding: binary
+Content-Type: multipart/report; boundary="_----------=_20000000000000000222";
+    report-type="feedback-report"
+MIME-Version: 1.0
+Date: Thu, 29 Apr 2015 23:34:45 +0900
+Subject: Abuse Report
+To: postmaster@example.jp
+From: feedbackloop@feedback.example.com
+Message-Id: <20150429233445.0000000000@fbl-02.r.returnpath.example.net>
+
+This is a multi-part message in MIME format.
+
+--_----------=_20000000000000000222
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain
+
+This is a Example email abuse report for an email message received from IP 192.0.2.1 on Thu, 29 Apr 2015 23:34:45 +0000
+
+
+--_----------=_20000000000000000222
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+Content-Type: message/feedback-report
+
+User-Agent: ReturnPathFBL/1.0
+Abuse-Type: complaint
+Arrival-Date: Thu, 29 Apr 2015 23:34:45 +0000
+Feedback-Type: abuse
+Version: 1
+Source-IP: 192.0.2.1
+Original-Rcpt-To: kijitora@example.com
+Original-Rcpt-To: sironeko@example.com
+Original-Rcpt-To: mikeneko@example.com
+Original-Rcpt-To: sabatora@example.com
+Original-Rcpt-To: sirokiji@example.org
+Original-Rcpt-To: kuroneko@example.com
+Original-Rcpt-To: sabineko@example.com
+Original-Mail-From: neko@example.jp
+Reported-Domain: example.com
+Reported-Domain: example.org
+
+--_----------=_20000000000000000222
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: message/rfc822
+
+Received: from mta-002.rr.example.com (mta-002.rr.example.com
+  [192.0.2.22]) by mxg.senderscore.example.net (Postfix) with ESMTP id FFFFFFFFFF0
+  for <fbl@senderscore.example.net>; Thu, 29 Apr 2015 23:34:45 +0900 (JST)
+Received: from mail.example.net ([192.0.1.3]) (authenticated bits=0)
+  by mail.example.net (8.13.1/8.13.1) with ESMTP id t3P00000000000
+  (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 29
+  Apr 2015 23:34:45 GMT
+Subject: Nyaan
+From: Neko <neko@example.jp>
+Message-Id: <ffffffffffffffffffffffff0000000@example.jp>
+Date: Sun, 29 Apr 2015 23:34:45 +0000
+Content-Transfer-Encoding: 7bit
+
+Nyaan
+

data/set-of-emails/maildir/bsd/{arf-05.eml → arf-17.eml}

@@ -1,16 +1,16 @@
-Received: from sling-02.abusix.local (localhost [127.0.0.1])
-	by feed.abusix.org (Postfix) with ESMTP id 03720F173DD53
-	for <abuse@example.com>; Thu,  1 Jan 2015 15:06:26 +0000 (UTC)
+Received: from mta-02.abusix.example.org (localhost [127.0.0.1])
+	by f0.abusix.example.org (Postfix) with ESMTP id 2222222222EEE
+	for <abuse@example.com>; Thu, 29 Apr 2016 23:34:45 +0000 (UTC)
 MIME-Version: 1.0
 Content-Type: multipart/report; report-type="feedback-report";
-  boundary="==a2c8e6e5b5f94c488ef3e98dee8d49e2=="
-From: no-reply@abusix.org
-To: no-reply@abusix.org
-Subject: Spamtraphit by 192.0.2.45 Thu, 01 Jan 2015 15:06:25 +0000 [no-reply]
-Message-ID: 1y6Hkr-3SHLw0-L0-ARF
+  boundary="==f000000000111111111110000000eee=="
+From: no-reply@example.org
+To: postmaster@example.org
+Subject: Spamtraphit by 192.0.2.3 Thu, 29 Apr 2016 23:34:45 +0000 [no-reply]
+Message-ID: 000000-FFFFFF-22-ARF
 Auto-Submitted: auto-generated
 
---==a2c8e6e5b5f94c488ef3e98dee8d49e2==
+--==f000000000111111111110000000eee==
 Content-Type: text/plain; charset="us-ascii"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -40,43 +40,38 @@ Your abusix Team
 
 P.S.: You receive this mail because we identified you as the
 responsible POC for this type of incident. Anyhow, please let us know if
-our information is outdated: http://abusix.org/contact
+our information is outdated: http://example.org/contact
 
---==a2c8e6e5b5f94c488ef3e98dee8d49e2==
+--==f000000000111111111110000000eee==
 Content-Type: message/feedback-report
 MIME-Version: 1.0
 
-Original-Envelope-Id: 1y6Hkr-3SHLw0-L0
+Original-Envelope-Id: 000000-FFFFFF-22
 Feedback-Type: abuse
-Original-Mail-From: test
+Original-Mail-From: sironeko@example.jp
 User-Agent: abusix-py/0.1
 Version: 1
-Original-Rcpt-To: fake.rcpt@example.com
-Original-Rcpt-To: fake.rcpt2@example.net
-Arrival-Date: Thu, 01 Jan 2015 15:06:25 +0000
-Source-IP: 192.0.2.45
+Original-Rcpt-To: kijitora@example.com
+Original-Rcpt-To: sabatora@example.net
+Arrival-Date: Thu, 29 Apr 2016 23:34:45 +0000
+Source-IP: 192.0.2.3
 
---==a2c8e6e5b5f94c488ef3e98dee8d49e2==
+--==f000000000111111111110000000eee==
 Content-Type: message/rfc822
 MIME-Version: 1.0
 
-Received: from [10.61.255.234] ([192.0.2.45])
-  by abusix.org (trap) with ESMTP (betamax) id 1y6Hkr-3SHLw0-L0;
-  Thu, 01 Jan 2015 15:06:25 +0000
-Subject:  
-From: "Natie Marlow" <test>
-Content-Type: text/plain;
-	charset=us-ascii
-X-Mailer: iPhone Mail 16.4.3522.110
-Message-Id: <8A025E63-47F5-CDA0-78D2-C0E5A944FB10@example.net>
-Date: Thu, 1 Jan 2015 05:52:13 -0700
-To: "fake.rcpt@example.org" <fake.rcpt@example.org>
+Received: from [192.0.2.3] ([192.0.2.3])
+  by example.org (trap) with ESMTP (betamax) id 000000-FFFFFF-22;
+  Thu, 29 Apr 2016 23:34:45 +0000
+Subject: Nyaan 
+From: "Sironeko" <sironeko@example.jp>
+Content-Type: text/plain; charset=us-ascii
+Message-Id: <EEEEEEEE-0000-0000-0000-EEEEEEEE2222@example.net>
+Date: Thu, 29 Apr 2016 23:34:45 -0700
+To: kijitora@example.org
 Content-Transfer-Encoding: quoted-printable
 Mime-Version: 1.0 (1.0)
 
-http://sevacontrols.cz/inf.htm
+Nyaan
 
-Sent from my iPhone
-
-
---==a2c8e6e5b5f94c488ef3e98dee8d49e2==--
+--==f000000000111111111110000000eee==--

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

@@ -0,0 +1,59 @@
+Received: from [127.0.0.1] ([localhost])
+	by neko.example.org (envelope-from <dmarc-noreply@example.com>)
+	(ecelerity 3.6.5.1 r(Core:3.6.5.0)) with UNKNOWN
+	id 22/22-00000-00000225; Thu, 29 Apr 2015 23:34:45 +0000
+Date: Thu, 29 Apr 2015 23:34:45 +0000
+Message-ID: <22.220000.0000.00000200@example.org>
+Subject: DMARC Forensic report for example.net Mail-From:sironeko@example.org IP:192.0.2.222
+To: dmarc-noreply@example.com
+From: dmarc-noreply@example.com
+Content-Type: multipart/report; report-type=feedback-report;
+    boundary="_----NekoNyaan/222nnn300===_22/00-22002-00000225"
+
+--_----NekoNyaan/222nnn300===_22/00-22002-00000225
+Content-Type: text/plain; charset="US-ASCII"
+Content-Transfer-Encoding: 7bit
+
+This is an email abuse report for an email message received from IP 192.0.2.222 on Thu, 29 Apr 2015 23:34:45 +0000.
+The message below did not meet the sending domain's dmarc policy.
+For more information about this format please see http://tools.ietf.org/html/rfc6591 .
+
+--_----NekoNyaan/222nnn300===_22/00-22002-00000225
+Content-Type: message/feedback-report
+
+Feedback-Type: auth-failure
+User-Agent: Lua/1.0
+Version: 1.0
+Original-Mail-From: sironeko@example.org
+Original-Rcpt-To: kijitora@example.com
+Arrival-Date: Thu, 29 Apr 2015 23:34:45 +0000
+Message-ID: <000000000.2222222.1500000000222@example.net>
+Authentication-Results: dmarc=fail (p=none; dis=none) header.from=example.org
+Source-IP: 192.0.2.222
+Delivery-Result: delivered
+Auth-Failure: dmarc
+Reported-Domain: example.net
+
+--_----NekoNyaan/222nnn300===_22/00-22002-00000225
+Content-Type: message/rfc822
+Content-Disposition: inline
+
+Received: from [192.0.2.222] ([192.0.2.222:222] helo=mta-2.example.org)
+	by example.org (envelope-from <sironeko@example.org>)
+	(ecelerity 3.6.5.1 r(Core:3.6.5.0)) with ESMTPS (cipher=AES256-GCM-SHA384
+	id 22/00-00000-EEEEEEEE; Thu, 29 Apr 2015 23:34:45 +0000
+Received: from neko (localhost [127.0.0.1])
+	by mta-2.example.org (Postfix) with ESMTP id EEEEEEEEE22;
+	Thu, 29 Apr 2015 23:34:45 +0000 (UTC)
+Date: Thu, 29 Apr 2015 23:34:45 +0900 (JST)
+From: Sironeko <sironeko@example.org>
+To: kijitora@example.org
+Message-ID: <000000002.2222222.1500000000022@example.net>
+Subject: Nyaan
+MIME-Version: 1.0
+Content-Type: text/plain
+
+Nyaaaaaaaaaaaaaaaan
+
+--_----NekoNyaan/222nnn300===_22/00-22002-00000225--
+