sisimai 4.17.1-java → 4.17.2-java

data/lib/sisimai/msp/us/office365.rb

@@ -9,8 +9,10 @@ module Sisimai
         require 'sisimai/rfc5322'
 
         Re0 = {
-          :subject  => %r/Undeliverable:/,
-          :received => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
+          :'subject'    => %r/Undeliverable:/,
+          :'received'   => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
+          :'message-id' => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
+          
         }
         Re1 = {
           :begin  => %r{\A(?:
@@ -24,14 +26,31 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         CodeTable = {
-          :'4.4.7'   => 'expired',
-          :'5.1.0'   => 'rejected',
-          :'5.1.1'   => 'userunknown',
-          :'5.1.10'  => 'filtered',
-          :'5.4.1'   => 'networkerror',
-          :'5.4.14'  => 'networkerror',
-          :'5.7.1'   => 'rejected',
-          :'5.7.133' => 'rejected',
+          # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
+          %r/\A4[.]4[.]7\z/        => 'expired',
+          %r/\A4[.]7[.]26\z/       => 'securityerror',
+          %r/\A4[.]7[.][56]\d\d\z/ => 'blocked',
+          %r/\A4[.]7[.]8[5-9]\d\z/ => 'blocked',
+          %r/\A5[.]1[.]0\z/        => 'rejected',
+          %r/\A5[.]4[.]1\z/        => 'norelaying',
+          %r/\A5[.]4[.]6\z/        => 'networkerror',
+          %r/\A5[.]6[.]11\z/       => 'contenterror',
+          %r/\A5[.]7[.]1\z/        => 'rejected',
+          %r/\A5[.]7[.]1[23]\z/    => 'rejected',
+          %r/\A5[.]7[.]124\z/      => 'rejected',
+          %r/\A5[.]7[.]13[3-6]\z/  => 'rejected',
+          %r/\A5[.]7[.]25\z/       => 'networkerror',
+          %r/\A5[.]7[.]50[1-3]\z/  => 'spamdetected',
+          %r/\A5[.]7[.]50[4-5]\z/  => 'filtered',
+          %r/\A5[.]7[.]50[6-7]\z/  => 'blocked',
+          %r/\A5[.]7[.]508\z/      => 'toomanyconn',
+          %r/\A5[.]7[.]509\z/      => 'securityerror',
+          %r/\A5[.]7[.]510\z/      => 'notaccept',
+          %r/\A5[.]7[.]511\z/      => 'rejected',
+          %r/\A5[.]7[.]512\z/      => 'securityerror',
+          %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
+          %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
+          %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
         }
         Indicators = Sisimai::MSP.INDICATORS
 
@@ -83,6 +102,10 @@ module Sisimai
           match += 1 if mhead['x-ms-exchange-crosstenant-fromentityheader']
           match += 1 if mhead['x-ms-exchange-transport-crosstenantheadersstamped']
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+          if mhead['message-id']
+            # Message-ID: <00000000-0000-0000-0000-000000000000@*.*.prod.outlook.com>
+            match += 1 if mhead['message-id'] =~ Re0[:'message-id']
+          end
           return nil if match < 2
 
           if mbody =~ /^Content-Transfer-Encoding: quoted-printable$/
@@ -233,7 +256,12 @@ module Sisimai
             end
 
             if e['status']
-              e['reason'] = CodeTable[e['status'].to_sym] || ''
+              CodeTable.each_key do |f|
+                # Try to match with each key as a regular expression
+                next unless e['status'] =~ f
+                e['reason'] = CodeTable[f]
+                last
+              end
             end
           end
 

data/lib/sisimai/reason/blocked.rb

@@ -40,6 +40,7 @@ module Sisimai
             |domain[ ]does[ ]not[ ]exist:
             |domain[ ].+[ ]mismatches[ ]client[ ]ip
             |dns[ ]lookup[ ]failure:[ ].+[ ]try[ ]again[ ]later
+            |DNSBL:ATTRBL
             |Go[ ]away
             |hosts[ ]with[ ]dynamic[ ]ip
             |IP[ ]\d{1,3}[.]\d{1,3}[.]\d{1,3}[.]\d{1,3}[ ]is[ ]blocked[ ]by[ ]EarthLink # Earthlink

data/lib/sisimai/rhost.rb

@@ -7,7 +7,8 @@ module Sisimai
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
-        'aspmx.l.google.com' => 'GoogleApps',
+        %r/\Aaspmx[.]l[.]google[.]com\z/ => 'GoogleApps',
+        %r/[.]protection[.]outlook[.]com\z/ => 'ExchangeOnline',
       }
 
       # Retrun the list of remote hosts Sisimai support
@@ -20,10 +21,20 @@ module Sisimai
       # @param    [String] argvs  Remote host name
       # @return   [True,False]    True: matched
       #                           False: did not match
-      def match(host)
-        return false unless host.is_a? ::String
-        return true  if RhostClass.key?(host.downcase)
-        return false
+      def match(rhost)
+        return false unless rhost.is_a? ::String
+        return false if rhost.empty?
+
+        host0 = rhost.downcase
+        match = false
+
+        RhostClass.each_key do |e|
+          # Try to match with each key of RhostClass
+          next unless host0 =~ e
+          match = true
+          break
+        end
+        return match
       end
 
       # Detect the bounce reason from certain remote hosts
@@ -35,10 +46,19 @@ module Sisimai
         return argvs.reason if argvs.reason.size > 0
 
         remotehost = argvs.rhost.downcase
-        modulename = 'Sisimai::Rhost::' + RhostClass[remotehost]
-        rhostclass = modulename.gsub('::', '/').downcase
-        require rhostclass
+        rhostclass = ''
+        reasontext = ''
+        modulename = ''
 
+        RhostClass.each_key do |e|
+          # Try to match with each key of $RhostClass
+          next unless remotehost =~ e
+          modulename = 'Sisimai::Rhost::' + RhostClass[e]
+          rhostclass = modulename.gsub('::', '/').downcase
+          break
+        end
+
+        require rhostclass
         reasontext = Module.const_get(modulename).get(argvs)
         return reasontext
       end

data/lib/sisimai/rhost/exchangeonline.rb

@@ -0,0 +1,268 @@
+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 "*.protection.outlook.com". This class is called only Sisimai::Data class.
+    module ExchangeOnline
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/ExchangeOnline.pm
+
+        # https://technet.microsoft.com/en-us/library/bb232118
+        CodeTable = {
+          %r/\A4[.]3[.]1\z/ => [
+            {
+              :reason => 'systemfull',
+              :regexp => %r/Insufficient system resources/,
+            },
+          ],
+          %r/\A4[.]3[.]2\z/ => [
+            {
+              :reason => 'notaccept',
+              :regexp => %r/System not accepting network messages/,
+            },
+          ],
+          %r/\A4[.]4[.][17]\z/ => [
+            {
+              :reason => 'expired',
+              :regexp => %r/(?:Connection[ ]timed[ ]out|Message[ ]expired)/x,
+            },
+          ],
+          %r/\A4[.]4[.]2\z/ => [
+            {
+                :reason => 'blocked',
+                :regexp => %r/Connection dropped/,
+            },
+          ],
+          %r/\A4[.]7[.]26\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/Access denied, a message sent over IPv6 .+ must pass either SPF or DKIM validation, this message is not signed/,
+            },
+          ],
+          %r/\A4[.]7[.][568]\d{2}\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/Access denied, please try again later/,
+            },
+          ],
+          %r/\A5[.]0[.]0\z/ => [
+            {
+              :reason => 'blocked',
+              :regexp => %r|HELO / EHLO requires domain address|,
+            },
+          ],
+          %r/\A5[.]1[.][07]\z/ => [
+            {
+              :reason => 'rejected',
+              :regexp => %r/(?:Sender[ ]denied|Invalid[ ]address)/x,
+            },
+          ],
+          %r/\A5[.]1[.][123]\z/ => [
+            {
+              :reason => 'userunknown',
+              :regexp => %r{(?:
+                 Bad[ ]destination[ ]mailbox[ ]address
+                |Invalid[ ]X[.]400[ ]address
+                |Invalid[ ]recipient[ ]address
+                )
+              }x,
+            },
+          ],
+          %r/\A5[.]1[.]4\z/ => [
+            {
+              :reason => 'systemerror',
+              :regexp => %r/Destination mailbox address ambiguous/,
+            },
+          ],
+          %r/\A5[.]2[.]1\z/ => [
+            {
+              :reason => 'suspend',
+              :regexp => %r/Mailbox cannot be accessed/,
+            },
+          ],
+          %r/\A5[.]2[.]2\z/ => [
+            {
+              :reason => 'mailboxfull',
+              :regexp => %r/Mailbox full/,
+            },
+          ],
+          %r/\A5[.]2[.]3\z/ => [
+            {
+              :reason => 'exceedlimit',
+              :regexp => %r/Message too large/,
+            },
+          ],
+          %r/\A5[.]2[.]4\z/ => [
+            {
+              :reason => 'systemerror',
+              :regexp => %r/Mailing list expansion problem/,
+            },
+          ],
+          %r/\A5[.]3[.]3\z/ => [
+            {
+              :reason => 'systemfull',
+              :regexp => %r/Unrecognized command/,
+            },
+          ],
+          %r/\A5[.]3[.]4\z/ => [
+            {
+              :reason => 'mesgtoobig',
+              :regexp => %r/Message too big for system/,
+            },
+          ],
+          %r/\A5[.]3[.]5\z/ => [
+            {
+              :reason => 'systemerror',
+              :regexp => %r/System incorrectly configured/,
+            },
+          ],
+          %r/\A5[.]4[.][46]\z/ => [
+            {
+              :reason => 'networkerror',
+              :regexp => %r/(?:Invalid[ ]arguments|Routing[ ]loop[ ]detected)/x,
+            },
+          ],
+          %r/\A5[.]5[.]2\z/ => [
+            {
+              :reason => 'syntaxerror',
+              :regexp => %r/Send hello first/,
+            },
+          ],
+          %r/\A5[.]5[.]3\z/ => [
+            {
+              :reason => 'syntaxerror',
+              :regexp => %r/Too many recipients/,
+            },
+          ],
+          %r/\A5[.]5[.]4\z/ => [
+            {
+              :reason => 'filtered',
+              :regexp => %r/Invalid domain name/,
+            },
+          ],
+          %r/\A5[.]5[.]6\z/ => [
+            {
+              :reason => 'contenterror',
+              :regexp => %r/Invalid message content/,
+            },
+          ],
+          %r/\A5[.]7[.][13]\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/(?:Delivery[ ]not[ ]authorized|Not[ ]Authorized)/x,
+            },
+          ],
+          %r/\A5[.]7[.]1\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/(?:Delivery[ ]not[ ]authorized|Client[ ]was[ ]not[ ]authenticated)/x,
+            },
+            {
+              :reason => 'norelaying',
+              :regexp => %r/Unable to relay/,
+            },
+          ],
+          %r/\A5[.]7[.]25\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/Access denied, the sending IPv6 address .+ must have a reverse DNS record/,
+            },
+          ],
+          %r/\A5[.]7[.]50[1-3]\z/ => [
+            {
+              :reason => 'spamdetected',
+              :regexp => %r/Access[ ]denied,[ ](?:spam[ ]abuse[ ]detected|banned[ ]sender)/x,
+            },
+          ],
+          %r/\A5[.]7[.]50[457]\z/ => [
+            {
+              :reason => 'filtered',
+              :regexp => %r{(?>
+                 Recipient[ ]address[ ]rejected:[ ]Access[ ]denied
+                |Access[ ]denied,[ ](?:banned[ ]recipient|rejected[ ]by[ ]recipient)
+                )
+              },
+            },
+          ],
+          %r/\A5[.]7[.]506\z/ => [
+            {
+              :reason => 'blocked',
+              :regexp => %r/Access Denied, Bad HELO/,
+            },
+          ],
+          %r/\A5[.]7[.]508\z/ => [
+            {
+              :reason => 'toomanyconn',
+              :regexp => %r/Access denied, .+ has exceeded permitted limits within .+ range/,
+            },
+          ],
+          %r/\A5[.]7[.]509\z/ => [
+            {
+              :reason => 'securityerror',
+              :regexp => %r/Access denied, sending domain .+ does not pass DMARC verification/,
+            },
+          ],
+          %r/\A5[.]7[.]510\z/ => [
+            {
+              :reason => 'notaccept',
+              :regexp => %r/Access denied, .+ does not accept email over IPv6/,
+            },
+          ],
+          %r/\A5[.]7[.]511\z/ => [
+            {
+              :reason => 'blocked',
+              :regexp => %r/Access denied, banned sender/,
+            },
+          ],
+          %r/\A5[.]7[.]512\z/ => [
+            {
+              :reason => 'contenterror',
+              :regexp => %r/Access denied, message must be RFC 5322 section 3[.]6[.]2 compliant/,
+            },
+          ],
+          %r/\A5[.]7[.]6\d{2}\z/ => [
+            {
+              :reason => 'blocked',
+              :regexp => %r/Access[ ]denied,[ ]banned[ ]sending[ ]IP[ ].+/,
+            },
+          ],
+          %r/\A5[.]7[.]7\d{2}\z/ => [
+            {
+              :reason => 'toomanyconn',
+              :regexp => %r/Access denied, tenant has exceeded threshold/,
+            },
+          ],
+        }
+
+        # Detect bounce reason from Google Apps
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String]                The bounce reason for Exchange Online
+        # @see      https://support.google.com/a/answer/3726730?hl=en
+        def get(argvs)
+          return nil unless argvs
+          return nil unless argvs.is_a? Sisimai::Data
+          return argvs.reason if argvs.reason.size > 0
+
+          statuscode = argvs.deliverystatus.sub(/\A\d[.](\d+[.]\d+)\z/, 'X.\1')
+          statusmesg = argvs.diagnosticcode
+          reasontext = ''
+
+          CodeTable.each_key do |e|
+            # Try to match with each regular expression of delivery status codes
+            next unless statuscode =~ e
+            Codetable[e].each do |f|
+              # Try to match with each regular expression of error messages
+              next unless statusmesg =~ f[:regexp]
+              reasontext = f[:reason]
+              break
+            end
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/googleapps.rb

@@ -6,7 +6,7 @@ module Sisimai
     module GoogleApps
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoogleApps.pm
-        SMTPErrorSet = {
+        CodeTable = {
           :'X.1.1' => [
             {
               :reason => 'userunknown',
@@ -220,7 +220,7 @@ module Sisimai
           statuscode = argvs.deliverystatus.sub(/\A\d[.](\d+[.]\d+)\z/, 'X.\1')
           statusmesg = argvs.diagnosticcode
           reasontext = ''
-          errortable = SMTPErrorSet[statuscode.to_sym] || []
+          errortable = CodeTable[statuscode.to_sym] || []
 
           errortable.each do |e|
             # Try to match

data/lib/sisimai/smtp/status.rb

@@ -561,7 +561,7 @@ module Sisimai
           :'4.4.2'  => 'networkerror',   # Bad connection
           # :'4.4.3' => 'systemerror',    # Directory server failure
           :'4.4.4'  => 'networkerror',   # Unable to route
-          :'4.4.5'  => 'toomanyconn',    # Mail system congestion
+          :'4.4.5'  => 'systemfull',     # Mail system congestion
           :'4.4.6'  => 'networkerror',   # Routing loop detected
           :'4.4.7'  => 'expired',        # Delivery time expired
           # :'4.5.0' => 'networkerror',   # Other or undefined protocol status

data/lib/sisimai/version.rb

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

data/set-of-emails/maildir/bsd/exchange-online-01.eml

@@ -0,0 +1,73 @@
+Return-Path: <>
+Received: from nyaan.example.ed.jp (nyaan.example.ed.jp [198.51.100.222])
+	by aneyakoji.neko.example.co.jp (V8/cf) with ESMTP id t3BB0AAA00000
+	for <postmaster@neko.example.co.jp>; Thu, 29 Apr 2015 20:00:00 +0900
+X-SenderID: Sendmail Sender-ID Filter v1.0.0 aneyakoji.neko.example.co.jp t3BB0AAA00000
+Authentication-Results: aneyakoji.neko.example.co.jp; sender-id=none header.from=MAILER-DAEMON@nyaan.example.ed.jp
+Received: from localhost (localhost)
+	by nyaan.example.ed.jp (V8/cf) id t3BB0AAA11111;
+	Thu, 29 Apr 2015 20:00:00 +0900
+Date: Thu, 29 Apr 2015 20:00:00 +0900
+From: Mail Delivery Subsystem <MAILER-DAEMON@nyaan.example.ed.jp>
+Message-Id: <201505111100.t3BB0AAA11111@nyaan.example.ed.jp>
+To: postmaster@nyaan.example.ed.jp
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="t3BB0AAA11111.1400000000/nyaan.example.ed.jp"
+Subject: Postmaster notify: see transcript for details
+Auto-Submitted: auto-generated (postmaster-notification)
+
+This is a MIME-encapsulated message
+
+--t3BB0AAA11111.1400000000/nyaan.example.ed.jp
+
+The original message was received at Thu, 29 Apr 2015 20:00:00 +0900
+from localhost [127.0.0.1]
+with id t3BB0AAA22222
+
+   ----- The following addresses had permanent fatal errors -----
+<kijitora@example.com>
+    (reason: 550 5.7.606 Access denied, banned sending IP [198.51.100.222]. To request removal from this list plea...tions. For more information please go to  http://go.microsoft.com/fwlink/?LinkID=526655 (AS16012609))
+
+   ----- Transcript of session follows -----
+... while talking to example.com.mail.protection.outlook.com.:
+>>> DATA
+<<< 550 5.7.606 Access denied, banned sending IP [198.51.100.222]. To request removal from this list please visit https://sender.office.com/ and follow the directions. For more information please go to  http://go.microsoft.com/fwlink/?LinkID=526655 (AS16012609)
+550 5.1.1 <kijitora@example.com>... User unknown
+<<< 503 5.5.2 Need rcpt command
+
+--t3BB0AAA11111.1400000000/nyaan.example.ed.jp
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; nyaan.example.ed.jp
+Received-From-MTA: DNS; localhost
+Arrival-Date: Thu, 29 Apr 2015 20:00:00 +0900
+
+Final-Recipient: RFC822; kijitora@example.com
+Action: failed
+Status: 5.7.606
+Remote-MTA: DNS; example.com.mail.protection.outlook.com
+Diagnostic-Code: SMTP; 550 5.7.606 Access denied, banned sending IP [198.51.100.222]. To request removal from this list please visit https://sender.office.com/ and follow the directions. For more information please go to  http://go.microsoft.com/fwlink/?LinkID=526655 (AS16012609)
+Last-Attempt-Date: Thu, 29 Apr 2015 20:00:00 +0900
+
+--t3BB0AAA11111.1400000000/nyaan.example.ed.jp
+Content-Type: text/rfc822-headers
+
+Return-Path: <root@nyaan.example.ed.jp>
+Received: from nyaan.example.ed.jp (localhost [127.0.0.1])
+	by nyaan.example.ed.jp (V8/cf) with ESMTP id t3BB0AAA22222
+	for <kijitora@example.com>; Thu, 29 Apr 2015 20:00:00 +0900
+Received: (from root@localhost)
+	by nyaan.example.ed.jp (8.15.2/8.15.2/Submit) id t3BB0AAA23232;
+	Thu, 29 Apr 2015 20:00:00 +0900
+Date: Thu, 29 Apr 2015 20:00:00 +0900
+To: kijitora@example.com
+Subject: Nyaan
+From: Shironeko <shironeko@example.org>
+Message-Id: <00000000000000000000000000000000000000000000000@example.net>
+Content-Type: text/plain; charset="iso-2022-jp"
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+
+--t3BB0AAA11111.1400000000/nyaan.example.ed.jp--
+