sisimai 4.25.2-java → 4.25.8-java

data/lib/sisimai/rhost/godaddy.rb

@@ -31,7 +31,7 @@ module Sisimai
           'IB705' => 'virusdetected', # 552 Virus infected message rejected. IB705
         }.freeze
         MessagesOf = {
-            'blocked'     => ['553 http://www.spamhaus.org/query/bl?ip=', '554 RBL Reject.'],
+            'blocked'     => ['www.spamhaus.org/query/bl?ip=', '554 RBL Reject.'],
             'expired'     => ['Delivery timeout', "451 Sorry, I wasn't able to establish an SMTP connection."],
             'suspend'     => ['Account disabled'],
             'mailboxfull' => ['Account storage limit'],

data/lib/sisimai/rhost/googleapps.rb

@@ -11,8 +11,8 @@ module Sisimai
           'X.1.1' => [{ reason: 'userunknown', string: ['The email account that you tried to reach does not exist.'] }],
           'X.1.2' => [{ reason: 'hostunknown', string: ["We weren't able to find the recipient domain."] }],
           'X.2.1' => [
-            { reason: 'suspend',   string: ['The email account that you tried to reach is disabled.'] },
-            { reason: 'undefined', string: ['The user you are trying to contact is receiving mail ']  },
+            { reason: 'suspend',     string: ['The email account that you tried to reach is disabled.'] },
+            { reason: 'exceedlimit', string: ['The user you are trying to contact is receiving mail ']  },
           ],
           'X.2.2' => [{ reason: 'mailboxfull', string: ['The email account that you tried to reach is over quota.'] }],
           'X.2.3' => [{ reason: 'exceedlimit', string: ["Your message exceeded Google's message size limits."] }],

data/lib/sisimai/rhost/iua.rb

@@ -0,0 +1,39 @@
+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 "*.email.ua". This class is called only Sisimai::Data class.
+    module IUA
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/IUA.pm
+        ErrorCodes = {
+          # http://mail.i.ua/err/$(CODE)
+          '1'  => 'norelaying',  # The use of SMTP as mail gate is forbidden.
+          '2'  => 'userunknown', # User is not found.
+          '3'  => 'suspend',     # Mailbox was not used for more than 3 months
+          '4'  => 'mailboxfull', # Mailbox is full.
+          '5'  => 'toomanyconn', # Letter sending limit is exceeded.
+          '6'  => 'norelaying',  # Use SMTP of your provider to send mail.
+          '7'  => 'blocked',     # Wrong value if command HELO/EHLO parameter.
+          '8'  => 'rejected',    # Couldn't check sender address.
+          '9'  => 'blocked',     # IP-address of the sender is blacklisted.
+          '10' => 'filtered',    # Not in the list Mail address management.
+        }.freeze
+
+        # Detect bounce reason from https://www.i.ua/
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String]                The bounce reason at https://www.i.ua/
+        def get(argvs)
+          return argvs.reason unless argvs.reason.empty?
+
+          if cv = argvs.diagnosticcode.downcase.match(%r|[.]i[.]ua/err/(\d+)|)
+            return ErrorCodes[cv[1]] || ''
+          end
+          return ''
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost/spectrum.rb

@@ -0,0 +1,73 @@
+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 "destination" of
+    # the object is "charter.net". This class is called only Sisimai::Data class.
+    module Spectrum
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/Spectrum.pm
+        ErrorCodes = {
+          # https://www.spectrumbusiness.net/support/internet/understanding-email-error-codes
+          #   Error codes are placed in one of two categories: incoming or outgoing.
+          #   1. If you’re trying to send an email to a Charter email address from
+          #      a non-Charter email address (such as Gmail, Yahoo, Hotmail, etc.),
+          #      you may receive an error that begins with AUP#I, followed by four numbers.
+          #
+          #   2. If you are trying to send an email from a Charter email address
+          #      to an outgoing recipient, you may get an error code beginning with
+          #      AUP#O, also followed by four numbers.
+          #
+          1000 => 'blocked',         # Your IP address has been blocked due to suspicious activity. 
+          1010 => 'rejected',        # This email account has been blocked from sending emails due to suspicious activity.
+          1090 => 'systemerror',     # The email you're trying to send can't be processed. Try sending again at a later time.
+          1260 => 'networkerror',    # Spectrum doesn't process IPV6 addresses. Connect with an IPv4 address and try again.
+          1500 => 'rejected',        # Your email was rejected for attempting to send as a different email address than you signed in under.
+          1520 => 'rejected',        # Your email was rejected for attempting to send as a different email address than a domain that we host.
+          1530 => 'mesgtoobig',      # Your email was rejected because it's larger than the maximum size of 20MB.
+          1540 => 'toomanyconn',     # Your emails were deferred for attempting to send too many in a single session.
+          1550 => 'toomanyconn',     # Your email was rejected for having too many recipients in one message.
+          1560 => 'policyviolation', # Your email was rejected for having too many invalid recipients.
+        }.freeze
+        CodeRanges = [
+          [1020, 1080, 'rejected'],        # This email account has limited access to send emails based on suspicious activity.
+          [1100, 1150, 'blocked'],         # The IP address you're trying to connect from has an issue with the Domain Name System.
+          [1160, 1190, 'policyviolation'], # The email you tried to send goes against your domain's security policies.
+          [1200, 1210, 'blocked'],         # The IP address you're trying to send from has been flagged by Cloudmark CSI as potential spam.
+          [1220, 1250, 'blokced'],         # Your IP address has been blacklisted by Spamhaus.
+          [1300, 1340, 'toomanyconn'],     # Spectrum limits the number of concurrent connections from a sender
+          [1350, 1490, 'toomanyconn'],     # Spectrum limits emails by the number of messages sent, amount of recipients,...
+        ].freeze
+
+        # Detect bounce reason from https://www.spectrum.com/
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String, Nil]           The bounce reason at Spectrum
+        # @since v4.25.8
+        def get(argvs)
+          statusmesg = argvs.diagnosticcode
+          codenumber = 0
+
+          if cv = statusmesg.match(/AUP#[-A-Za-z]*(\d{4})/)
+            # Capture the numeric part of the error code
+            codenumber = cv[1].to_i
+          end
+          reasontext = ErrorCodes[codenumber] || ''
+
+          if reasontext.empty?
+            # The error code was not found in ErrorCodes
+            CodeRanges.each do |e|
+              # Check the code range
+              next if codenumber < e[0]
+              next if codenumber > e[1]
+              reasontext = e[2]
+              break
+            end
+          end
+
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+

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/smtp/error.rb

@@ -80,13 +80,13 @@ module Sisimai
             if argv2.size > 0
               # Get D.S.N. or SMTP reply code from The 2nd argument string
               statuscode = Sisimai::SMTP::Status.find(argv2) || Sisimai::SMTP::Reply.find(argv2) || '0'
-              value = if statuscode[0, 1].to_i == 4
-                             # Deal as a "soft bounce"
-                             'soft'
-                           else
-                             # 5 or 0, deal as a "hard bounce"
-                             'hard'
-                           end
+              value = if statuscode.start_with?('4')
+                        # Deal as a "soft bounce"
+                        'soft'
+                      else
+                        # 5 or 0, deal as a "hard bounce"
+                        'hard'
+                      end
             else
               # "notaccept" is a hard bounce
               value = 'hard'

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.2'.freeze
+  VERSION = '4.25.8'.freeze
 end

data/set-of-emails/README.md

@@ -1,12 +1,11 @@
 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.
+in this repository are read from `make test` at p5-sisimai and rb-sisimai.
 
 
 | Directory                     | Description                                  |
 |-------------------------------|----------------------------------------------|
-| jsonobj/                      | JSON files include bounce objects            |
 | mailbox/                      | Unix mbox files                              |
 | maildir/                      | Email files                                  |
 |  - bsd/                       | A newline is LF                              |
@@ -25,16 +24,17 @@ 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)
+* __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
 ===============================================================================
+[@libsisimai](https://twitter.com/libsisimai)
 [@azumakuniyuki](https://twitter.com/azumakuniyuki)
 
 Copyright
 ===============================================================================
-Copyright (C) 2018-2019 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2018-2020 azumakuniyuki, All Rights Reserved.
 
 License
 ===============================================================================

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--

data/set-of-emails/maildir/bsd/lhost-amavis-03.eml

@@ -0,0 +1,90 @@
+Received: from localhost (localhost [127.0.0.1])
+	by smtp-2.example.com (Postfix) with ESMTP id C9C14E203A18
+	for <error+1826111378@example.com>; Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+Content-Type: multipart/report; report-type=delivery-status;
+ boundary="----------=_1600738576-220-2"
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+Subject: Considered UNSOLICITED BULK EMAIL, apparently from you
+Message-ID: <hjY5PsYJ019501@example.com>
+From: "Content-filter at example.com" <postmaster@example.com>
+To: <error+1826111378@example.com>
+Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+
+This is a multi-part message in MIME format...
+
+------------=_1600738576-220-2
+Content-Type: text/plain; charset="iso-8859-1"
+Content-Disposition: inline
+Content-Transfer-Encoding: 7bit
+
+A message from <error+1826111378@example.com> to:
+-> kijitora@example.com
+
+was considered unsolicited bulk e-mail (UBE).
+
+Our internal reference code for your message is 20002-22/sHZwCRYD091907
+
+The message carried your return address, so it was either a genuine mail
+from you, or a sender address was faked and your e-mail address abused
+by third party, in which case we apologize for undesired notification.
+
+We do try to minimize backscatter for more prominent cases of UBE and
+for infected mail, but for less obvious cases of UBE some balance
+between losing genuine mail and sending undesired backscatter is sought,
+and there can be some collateral damage on both sides.
+
+First upstream SMTP client IP address: [127.0.0.1] localhost
+According to a 'Received:' trace, the message originated at: [127.0.0.1],
+  example.com localhost [127.0.0.1]
+
+Return-Path: <error+1826111378@example.com>
+From: error+1826111378@example.com
+Subject: Nyaan
+
+Duplicate header field: "From"
+
+
+Delivery of the email was stopped!
+
+------------=_1600738576-220-2
+Content-Type: message/delivery-status; name="dsn_status"
+Content-Disposition: inline; filename="dsn_status"
+Content-Transfer-Encoding: 7bit
+Content-Description: Delivery error report
+
+Reporting-MTA: dns; example.com
+Received-From-MTA: smtp; smtp-2.example.com ([127.0.0.1])
+Arrival-Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+
+Final-Recipient: rfc822;kijitora@example.com
+Action: failed
+Status: 5.7.0
+Diagnostic-Code: smtp; 554 5.7.0 Reject, id=20025-09 - SPAM
+Last-Attempt-Date: Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+Final-Log-ID: 20025-09/wliEaM27090469
+
+------------=_1600738576-220-2
+Content-Type: text/rfc822-headers; name="header"
+Content-Disposition: inline; filename="header"
+Content-Transfer-Encoding: 7bit
+Content-Description: Message header section
+
+Return-Path: <error+1826111378@example.com>
+Received: esmtp-2.example.com (localhost [127.0.0.1])
+	by smtp-2.example.com (Postfix) with ESMTPS
+	for <kijitora@example.com>; Thu, 29 Apr 2013 23:34:45 -0800 (PST)
+From: kijitora@example.com
+Date: Thu, 29 Apr 2013 23:34:45 GMT
+From: error+1826111378@example.com
+To: kijitora@example.com
+Subject: Nyaan
+MIME-Version: 1.0
+Content-Type: text/plain
+
+------------=_1600738576-220-2--
+
+ ============ 
+ recipient: error+1826111378@example.com
+ ============ 
+ sender: MAILER-DAEMON