sisimai 4.22.1 → 4.22.2

data/lib/sisimai/rfc5322.rb

@@ -16,7 +16,7 @@ module Sisimai
           'To', 'Delivered-To', 'Forward-Path', 'Envelope-To',
           'X-Envelope-To', 'Resent-To', 'Apparently-To'
         ],
-      }
+      }.freeze
 
       build_regular_expressions = lambda do
         # See http://www.ietf.org/rfc/rfc5322.txt
@@ -164,7 +164,7 @@ module Sisimai
 
             else
               # hostname
-              e = e.delete('[]()')
+              e = e.delete('()')
               namelist << e
             end
           end

data/lib/sisimai/rhost.rb

@@ -7,9 +7,10 @@ module Sisimai
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
-        %r/\Aaspmx[.]l[.]google[.]com\z/ => 'GoogleApps',
-        %r/[.]protection[.]outlook[.]com\z/ => 'ExchangeOnline',
-      }
+        %r/\Aaspmx[.]l[.]google[.]com\z/                 => 'GoogleApps',
+        %r/[.]protection[.]outlook[.]com\z/              => 'ExchangeOnline',
+        %r/\A(?:smtp|mailstore1)[.]secureserver[.]net\z/ => 'GoDaddy',
+      }.freeze
 
       # Retrun the list of remote hosts Sisimai support
       # @return   [Array] Remote host list
@@ -17,7 +18,7 @@ module Sisimai
         return RhostClass.keys
       end
 
-      # The value of "rhost" is listed in $RhostClass or not
+      # The value of "rhost" is listed in RhostClass or not
       # @param    [String] argvs  Remote host name
       # @return   [True,False]    True: matched
       #                           False: did not match
@@ -50,7 +51,7 @@ module Sisimai
         modulename = ''
 
         RhostClass.each_key do |e|
-          # Try to match with each key of $RhostClass
+          # Try to match with each key of RhostClass
           next unless remotehost =~ e
           modulename = 'Sisimai::Rhost::' + RhostClass[e]
           rhostclass = modulename.gsub('::', '/').downcase

data/lib/sisimai/rhost/exchangeonline.rb

@@ -238,7 +238,7 @@ module Sisimai
               :regexp => %r/Access denied, tenant has exceeded threshold/,
             },
           ],
-        }
+        }.freeze
 
         # Detect bounce reason from Exchange Online
         # @param    [Sisimai::Data] argvs   Parsed email object

data/lib/sisimai/rhost/godaddy.rb

@@ -0,0 +1,87 @@
+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 "*.secureserver.net". This class is called only Sisimai::Data class.
+    module GoDaddy
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoDaddy.pm
+        # https://www.godaddy.com/help/what-does-my-email-bounceback-mean-3568
+        CodeTable = {
+          :IB103 => 'blocked',       # 554 Connection refused. This IP has a poor reputation on Cloudmark Sender Intelligence (CSI). IB103
+          :IB104 => 'blocked',       # 554 Connection refused. This IP is listed on the Spamhaus Block List (SBL). IB104
+          :IB105 => 'blocked',       # 554 Connection refused. This IP is listed on the Exploits Block List (XBL). IB105
+          :IB106 => 'blocked',       # 554 Connection refused. This IP is listed on the Policy Block List (PBL). IB106
+          :IB007 => 'toomanyconn',   # 421 Connection refused, too many sessions from This IP. Please lower the number of concurrent sessions. IB007
+          :IB101 => 'expired',       # 421 Server temporarily unavailable. Try again later. IB101
+          :IB108 => 'blocked',       # 421 Temporarily rejected. Reverse DNS for this IP failed. IB108
+          :IB110 => 'blocked',       # 554 This IP has been temporarily blocked for attempting to send too many messages containing content judged to be spam by the Internet community. IB110
+          :IB111 => 'blocked',       # 554 This IP has been blocked for the day, for attempting to send too many messages containing content judged to be spam by the Internet community. IB111
+          :IB112 => 'blocked',       # 554 This IP has been temporarily blocked for attempting to mail too many invalid recipients. IB112
+          :IB113 => 'blocked',       # 554 This IP has been blocked for the day, for attempting to mail too many invalid recipients. IB113
+          :IB212 => 'spamdetected',  # 552 This message has been rejected due to content judged to be spam by the Internet community. IB212
+          :IB401 => 'securityerror', # 535 Authentication not allowed on IBSMTP Servers. IB401
+          :IB501 => 'rejected',      # 550 holly@coolexample.com Blank From: addresses are not allowed. Please provide a valid From. IB501
+          :IB502 => 'rejected',      # 550 holly@coolexample.com IP addresses are not allowed as a From: Address. Please provide a valid From. IB502
+          :IB504 => 'toomanyconn',   # 550 This IP has sent too many messages this hour. IB504
+          :IB506 => 'rejected',      # 550 coolexample.com From: Domain is invalid. Please provide a valid From: IB506
+          :IB508 => 'rejected',      # 550 holly@coolexample.com Invalid SPF record. Please inspect your SPF settings, and try again. IB508
+          :IB510 => 'toomanyconn',   # 550 This message has exceeded the max number of messages per session. Please open a new session and try again. IB510
+          :IB607 => 'toomanyconn',   # 550 This IP has sent too many to too many recipients this hour. IB607
+          :IB705 => 'virusdetected', # 552 Virus infected message rejected. IB705
+        }.freeze
+
+        MesgTable = {
+          :blocked => [
+              %r{\A553 http://www[.]spamhaus[.]org/query/bl[?]ip=.+},
+              %r/\A554 RBL Reject[.]/,
+          ],
+          :expired => [
+              %r/Delivery timeout/,
+              %r/451 Sorry, I wasn't able to establish an SMTP connection[.]/,
+          ],
+          :mailboxfull => [
+              %r/Account storage limit/,
+          ],
+          :userunknown => [
+              %r/Account does not exist/,
+              %r/550 Recipient not found[.]/,
+          ],
+          :suspend => [
+              %r/Account disabled/,
+          ],
+        }.freeze
+
+        # Detect bounce reason from GoDaddy
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String]                The bounce reason for GoDaddy
+        # @see      https://www.godaddy.com/help/what-does-my-email-bounceback-mean-3568
+        def get(argvs)
+          return nil unless argvs
+          return nil unless argvs.is_a? Sisimai::Data
+          return argvs.reason if argvs.reason.size > 0
+
+          statusmesg = argvs.diagnosticcode
+          reasontext = ''
+
+          if cv = statusmesg.match(/\s(IB\d{3})\b/)
+            # 192.0.2.22 has sent to too many recipients this hour. IB607 ...
+            reasontext = CodeTable[cv[1].to_sym]
+          else
+            # 553 http://www.spamhaus.org/query/bl?ip=192.0.0.222
+            MesgTable.each_key do |e|
+              MesgTable[e].each do |f|
+                next unless statusmesg =~ f
+                reasontext = e.to_s
+                break
+              end
+            end
+          end
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/googleapps.rb

@@ -206,7 +206,7 @@ module Sisimai
               :regexp => [%r/Unrecognized Authentication Type[.]/],
             },
           ],
-        }
+        }.freeze
 
         # Detect bounce reason from Google Apps
         # @param    [Sisimai::Data] argvs   Parsed email object

data/lib/sisimai/smtp/error.rb

@@ -16,7 +16,7 @@ module Sisimai
             systemfull toomanyconn virusdetected
           |,
           :hard => %w|hasmoved hostunknown userunknown|
-        }
+        }.freeze
 
         # Permanent error or not
         # @param    [String] argv1  String including SMTP Status code
@@ -49,19 +49,13 @@ module Sisimai
             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
+            getchecked = if argv1 =~ /(?:temporar|persistent)/i
+                           # Temporary failure
+                           false
+                         elsif argv1 =~ /permanent/i
+                           # Permanently failure
+                           true
+                         end
           end
 
           return getchecked
@@ -85,15 +79,17 @@ module Sisimai
             softorhard = ''
 
           elsif argv1 == 'onhold' || argv1 == 'undefined'
-            # Check with the value of D.S.N. in $argv2
+            # 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'
+              softorhard = if getchecked
+                             'hard'
+                           else
+                             'soft'
+                           end
             end
 
           elsif argv1 == 'notaccept'
@@ -104,13 +100,13 @@ module Sisimai
               statuscode = Sisimai::SMTP::Reply.find(argv2) 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
+              softorhard = if classvalue == 4
+                             # Deal as a "soft bounce"
+                             'soft'
+                           else
+                             # 5 or 0, deal as a "hard bounce"
+                             'hard'
+                           end
             else
               # "notaccept" is a hard bounce
               softorhard = 'hard'
@@ -135,7 +131,6 @@ module Sisimai
             end
           end
 
-          sortorhard = '' if softorhard.nil?
           return softorhard
         end
 
@@ -143,4 +138,3 @@ module Sisimai
     end
   end
 end
-

data/lib/sisimai/smtp/status.rb

@@ -644,7 +644,7 @@ module Sisimai
           :'5.7.25' => 'blocked',        # Reverse DNS validation failed
           :'5.7.26' => 'securityerror',  # Multiple authentication checks failed
           :'5.7.27' => 'rejected',       # Sender address has null MX
-        }
+        }.freeze
 
         InternalCode = {
           :temporary => {
@@ -700,7 +700,7 @@ module Sisimai
             :undefined       => '5.0.900',
             :virusdetected   => '5.0.971',
           },
-        }
+        }.freeze
 
         # Convert from the reason string to the internal status code
         # @param    [String]     argv1  Reason name

data/lib/sisimai/string.rb

@@ -110,13 +110,13 @@ module Sisimai
 
         begin
           # Try to convert the string to UTF-8
-          if encodefrom
-            # String#encode('UTF-8', <FROM>)
-            getencoded = argv1.encode('UTF-8', encodefrom)
-          else
-            # Force encoding to UTF-8
-            getencoded = argv1.force_encoding('UTF-8')
-          end
+          getencoded = if encodefrom
+                         # String#encode('UTF-8', <FROM>)
+                         argv1.encode('UTF-8', encodefrom)
+                       else
+                         # Force encoding to UTF-8
+                         argv1.force_encoding('UTF-8')
+                       end
         rescue
           # Unknown encoding name or failed to encode
           getencoded = argv1.force_encoding('UTF-8')

data/lib/sisimai/version.rb

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

data/set-of-emails/jsonobj/json-sendgrid-12.json

@@ -0,0 +1 @@
+[{"ip":"192.0.2.22","status":"5.2.2","sg_event_id":"S4wr46YHS0qr3BKhawTQjQ","reason":"550 5.2.2 <mailboxfull@example.jp>... Mailbox Full ","sg_message_id":"03_Wof6nRbqqzxRvLpZbfw.filter0017p3mdw1-11399-59ADB335-16.0","tls":0,"event":"bounce","email":"mailboxfull@example.jp","timestamp":1504555832,"smtp-id":"<201709042010.v84KAQ5T032530@example.nyaan.jp>","type":"blocked"}]

data/set-of-emails/jsonobj/json-sendgrid-13.json

@@ -0,0 +1 @@
+[{"ip":"192.0.2.22","response":"250 2.0.0 OK 1504548007 y202si6984453itc.115 - gsmtp ","sg_event_id":"9DQrtMYCQcqhzCcaM1dDcA","sg_message_id":"xOljzpupQQWM0kNVSTWCJw.filter0022p3mdw1-18488-59AD94A6-1C.0","tls":1,"event":"delivered","email":"kijitora@example.com","timestamp":1504548007,"smtp-id":"<9454cba873d4ff07@localhost>"}]

data/set-of-emails/jsonobj/json-sendgrid-14.json

@@ -0,0 +1 @@
+[{"ip":"192.0.2.22","status":"5.7.13","sg_event_id":"G9n4tny6SbOd2OOIwR4WWQ","reason":"525 5.7.13 Disabled recipient address ","sg_message_id":"1WmUfrSfRTK-rqq2dbmjbg.filter0005p3mdw1-16436-59ADC425-15.0","tls":0,"event":"bounce","email":"kijitora@example.jp","timestamp":1504560168,"smtp-id":"<201709042122.v84LMhK6032741@example.nyaan.jp>","type":"blocked"}]

data/set-of-emails/jsonobj/json-sendgrid-15.json

@@ -0,0 +1 @@
+[{"email":"kijitora@example.com","timestamp":1504837383,"sg_message_id":"6_hrAeKvTDaB5ynBI2nbnQ.filter0002p3las1-27574-59B1FDA3-19.0","sg_event_id":"o70uHqbMSXOaaoveMZIjjg","event":"spamreport"}]

data/set-of-emails/jsonobj/json-sendgrid-16.json

@@ -0,0 +1 @@
+[{"email":"kijitora@outlook.example.com","timestamp":1504887024,"sg_message_id":"X4B3sZa5RVGb40R5f6xvXw.filter0022p3las1-25394-59B1FDA9-F.0","sg_event_id":"odvDkblzSzmMErbelzZiDQ","event":"spamreport"}]

data/set-of-emails/jsonobj/json-sendgrid-17.json

@@ -0,0 +1 @@
+[{"email":"kijitora@mail.example.ru","timestamp":1504888615,"sg_message_id":"XFF5SV20RXGJQFfQCB6Pfg.filter0021p3las1-20183-59B2C682-2C.0","sg_event_id":"5zlPaGPlRyy6bdJc3vKTpQ","event":"spamreport"}]

data/set-of-emails/maildir/bsd/rhost-godaddy-01.eml

@@ -0,0 +1,83 @@
+From MAILER-DAEMON  Tue Sep 19 12:00:02 2017
+Return-Path: <>
+X-Original-To: postmaster@sender.com
+Delivered-To: postmaster@sender.com
+Received: from mx.sender.com (mx.sender.com [192.0.2.1])
+	by mail.sender.com (Postfix) with ESMTP id 084521680B5A
+	for <postmaster@sender.com>; Tue, 19 Sep 2017 12:00:02 -0700 (PDT)
+Received: by mx.sender.com (Postfix)
+	id F1F29402F2229; Tue, 19 Sep 2017 12:00:01 -0700 (PDT)
+Date: Tue, 19 Sep 2017 12:00:01 -0700 (PDT)
+From: MAILER-DAEMON@mx.sender.com (Mail Delivery System)
+Subject: Undelivered Mail Returned to Sender
+To: postmaster@sender.com
+Auto-Submitted: auto-replied
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="DA209402F1B99.1505847601/mx.sender.com"
+Content-Transfer-Encoding: 8bit
+Message-Id: <20170919190001.F1F29402F2229@mx.sender.com>
+
+This is a MIME-encapsulated message.
+
+--DA209402F1B99.1505847601/mx.sender.com
+Content-Description: Notification
+Content-Type: text/plain; charset=us-ascii
+
+This is the mail system at host mx.sender.com.
+
+I'm sorry to have to inform you that your message could not
+be delivered to one or more recipients. It's attached below.
+
+For further assistance, please send mail to postmaster.
+
+If you do so, please include this problem report. You can
+delete your own text from the attached returned message.
+
+                   The mail system
+
+<original-recipient@example.com>: host smtp.secureserver.net[72.167.238.29] said: 550
+    5.1.1 <original-recipient@example.com>  - 192.0.2.0 has sent to too many
+    recipients this hour. IB607  <http://x.co/rlbounce> (in reply to RCPT TO
+    command)
+
+--DA209402F1B99.1505847601/mx.sender.com
+Content-Description: Delivery report
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; mx.sender.com
+X-Postfix-Queue-ID: DA209402F1B99
+X-Postfix-Sender: rfc822; postmaster@sender.com
+Arrival-Date: Tue, 19 Sep 2017 11:59:55 -0700 (PDT)
+
+Final-Recipient: rfc822; original-recipient@example.com
+Original-Recipient: rfc822;original-recipient@example.com
+Action: failed
+Status: 5.1.1
+Remote-MTA: dns; smtp.secureserver.net
+Diagnostic-Code: smtp; 550 5.1.1 <original-recipient@example.com>  - 192.0.2.1 has
+    sent to too many recipients this hour. IB607  <http://x.co/rlbounce>
+
+--DA209402F1B99.1505847601/mx.sender.com
+Content-Description: Undelivered Message
+Content-Type: message/rfc822
+Content-Transfer-Encoding: 8bit
+
+Return-Path: <postmaster@sender.com>
+Received: from localhost.localdomain (mx1.sender.com [192.0.2.2])
+	by mx.sender.com (Postfix) with ESMTP id DA209402F1B99
+	for <original-recipient@example.com>; Tue, 19 Sep 2017 11:59:55 -0700 (PDT)
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+Content-Type: text/html
+MIME-Version: 1.0
+X-Mailer: MIME::Lite 3.030 (F2.84; T2.13; A2.12; B3.13; Q3.13)
+Date: Tue, 19 Sep 2017 11:59:55 -0700
+X-Report-Abuse-To: abuse@fastemailflyers.com
+From: "Original Sender" <original-sender@example.com>
+To: "Original Recipient" <original-recipient@example.com>
+Subject: Test
+
+<html><body>Test</body></html>
+
+--DA209402F1B99.1505847601/mx.sender.com--

data/set-of-emails/maildir/bsd/rhost-godaddy-02.eml

@@ -0,0 +1,69 @@
+From MAILER-DAEMON@mta1.example.net  Wed Apr  1 01:52:21 2009
+Return-Path: <MAILER-DAEMON@mta1.example.net>
+Received: from localhost (localhost)
+	by mta1.example.net (8.13.8/8.13.8) id n315qKUv008579;
+	Wed, 1 Apr 2009 01:52:20 -0400
+Date: Wed, 1 Apr 2009 01:52:20 -0400
+From: Mail Delivery Subsystem <MAILER-DAEMON@mta1.example.net>
+Message-Id: <200904010552.n315qKUv008579@mta1.example.net>
+To: <sironeko@mta1.example.net>
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="n315qKUv008579.1238565140/mta1.example.net"
+Subject: Returned mail: see transcript for details
+Auto-Submitted: auto-generated (failure)
+
+This is a MIME-encapsulated message
+
+--n315qKUv008579.1238565140/mta1.example.net
+
+The original message was received at Wed, 1 Apr 2009 01:49:21 -0400
+from localhost.localdomain [127.0.0.1]
+
+   ----- The following addresses had permanent fatal errors -----
+<kijitora@example.com>
+    (reason: 553 http://www.spamhaus.org/query/bl?ip=192.0.2.222)
+
+   ----- Transcript of session follows -----
+... while talking to smtp.secureserver.net.:
+>>> RCPT To:<kijitora@example.com>
+<<< 553 http://www.spamhaus.org/query/bl?ip=192.0.2.222
+550 5.1.1 <kijitora@example.com>... User unknown
+
+--n315qKUv008579.1238565140/mta1.example.net
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; mta1.example.net
+Received-From-MTA: DNS; localhost.localdomain
+Arrival-Date: Wed, 1 Apr 2009 01:49:21 -0400
+
+Final-Recipient: RFC822; kijitora@example.com
+Action: failed
+Status: 5.1.3
+Remote-MTA: DNS; smtp.secureserver.net
+Diagnostic-Code: SMTP; 553 http://www.spamhaus.org/query/bl?ip=192.0.2.222
+Last-Attempt-Date: Wed, 1 Apr 2009 01:52:20 -0400
+
+--n315qKUv008579.1238565140/mta1.example.net
+Content-Type: message/rfc822
+
+Return-Path: <sironeko@mta1.example.net>
+Received: from mta1.example.net (localhost.localdomain [127.0.0.1])
+	by mta1.example.net (8.13.8/8.13.8) with ESMTP id n315nLUv008575
+	for <kijitora@example.com>; Wed, 1 Apr 2009 01:49:21 -0400
+Received: (from sironeko@localhost)
+	by mta1.example.net (8.13.8/8.13.8/Submit) id n315nLUx008574;
+	Wed, 1 Apr 2009 01:49:21 -0400
+Date: Wed, 1 Apr 2009 01:49:21 -0400
+Message-Id: <200904010549.n315nLUx008574@mta1.example.net>
+To: kijitora@example.com
+From: "Sironeko, Cat" <sironeko@example.org>
+Subject: Nyaan
+Reply-to: sironeko@example.org
+MIME-Version: 1.0
+Content-type: text/plain; charset=us-ascii
+
+Nyaan
+
+--n315qKUv008579.1238565140/mta1.example.net--
+