sisimai 5.5.0-java → 5.6.0-java

data/lib/sisimai/rhost/yahooinc.rb

@@ -31,6 +31,13 @@ module Sisimai
             #   See https://postmaster.yahooinc.com/error-codes
             'not accepted for policy reasons',
           ],
+          'ratelimited' => [
+            # - 421 Max message per connection reached, closing transmission channel
+            'max message per connection reached',
+
+            # - 450 User is receiving mail too quickly
+            'user is receiving mail too quickly',
+          ],
           'rejected' => [
             # Observed the following error message since around March 2024:
             #
@@ -53,10 +60,6 @@ module Sisimai
             #   Retrying will NOT succeed. See https://postmaster.yahooinc.com/error-codes
             ' will be permanently deferred',
           ],
-          'speeding' => [
-            # - 450 User is receiving mail too quickly
-            'user is receiving mail too quickly',
-          ],
           'suspend' => [
             # - 554 delivery error: dd ****@yahoo.com is no longer valid.
             # - 554 30 Sorry, your message to *****@aol.jp cannot be delivered.
@@ -68,10 +71,6 @@ module Sisimai
             # - 501 Syntax error in parameters or arguments
             'syntax error in parameters or arguments',
           ],
-          'toomanyconn' => [
-            # - 421 Max message per connection reached, closing transmission channel
-            'max message per connection reached',
-          ],
           'userunknown' => [
             # - 554 delivery error: dd This user doesn't have a yahoo.com account (***@yahoo.com)
             # - 552 1 Requested mail action aborted, mailbox not found (in reply to end of DATA command)

data/lib/sisimai/smtp/command.rb

@@ -2,6 +2,8 @@ module Sisimai
   module SMTP
     # Sisimai::SMTP::Transcript is an SMTP Command related utilities
     module Command
+      ExceptDATA = ["CONN", "EHLO", "HELO", "MAIL", "RCPT"].freeze
+      BeforeRCPT = ["CONN", "EHLO", "EHLO", "MAIL", "AUTH", "STARTTLS"].freeze
       class << self
         Availables = [
           "HELO", "EHLO", "MAIL", "RCPT", "DATA", "QUIT", "RSET", "NOOP", "VRFY", "ETRN", "EXPN",

data/lib/sisimai/smtp/status.rb

@@ -494,10 +494,10 @@ module Sisimai
           '4.1.7'  => 'rejected',       # Bad sender's mailbox address syntax
           '4.1.8'  => 'rejected',       # Bad sender's system address
           '4.1.9'  => 'systemerror',    # Message relayed to non-compliant mailer
-          '4.2.1'  => 'blocked',        # Mailbox disabled, not accepting messages
+          '4.2.1'  => 'suspend',        # Mailbox disabled, not accepting messages
           '4.2.2'  => 'mailboxfull',    # Mailbox full
-          '4.2.3'  => 'exceedlimit',    # Message length exceeds administrative limit
-          '4.2.4'  => 'filtered',       # Mailing list expansion problem
+          '4.2.3'  => 'emailtoolarge',  # Message length exceeds administrative limit
+          '4.2.4'  => 'systemerror',    # Mailing list expansion problem
           # '4.3.0' => 'systemerror',    # Other or undefined mail system status
           '4.3.1'  => 'systemfull',     # Mail system full
           '4.3.2'  => 'notaccept',      # System not accepting network messages
@@ -513,20 +513,20 @@ module Sisimai
           '4.4.7'  => 'expired',        # Delivery time expired
           '4.4.8'  => 'networkerror',   # Retry on IPv4
 #         '4.5.0'  => 'networkerror',   # Other or undefined protocol status
-          '4.5.3'  => 'systemerror',    # Too many recipients
+          '4.5.3'  => 'ratelimited',    # Too many recipients
           '4.5.5'  => 'systemerror',    # Wrong protocol version
           '4.6.0'  => 'contenterror',   # Other or undefined media error
           '4.6.2'  => 'contenterror',   # Conversion required and prohibited
           '4.6.5'  => 'contenterror',   # Conversion Failed
           # :'4.7.0' => 'securityerror',  # Other or undefined security status
           '4.7.1'  => 'blocked',        # Delivery not authorized, message refused
-          '4.7.2'  => 'blocked',        # Mailing list expansion prohibited
+          '4.7.2'  => 'rejected',       # Mailing list expansion prohibited
           '4.7.5'  => 'securityerror',  # Cryptographic failure
           '4.7.6'  => 'securityerror',  # Cryptographic algorithm not supported
           '4.7.7'  => 'securityerror',  # Message integrity failure
           '4.7.12' => 'securityerror',  # A password transition is needed
           '4.7.15' => 'securityerror',  # Priority Level is too low
-          '4.7.16' => 'mesgtoobig',     # Message is too big for the specified priority
+          '4.7.16' => 'emailtoolarge',  # Message is too big for the specified priority
           '4.7.24' => 'authfailure ',   # SPF validation error
           '4.7.25' => 'requireptr',     # Reverse DNS validation failed
           # ---------------------------------------------------------------------------------------
@@ -543,19 +543,19 @@ module Sisimai
           '5.2.0'  => 'filtered',       # Other or undefined mailbox status
           '5.2.1'  => 'filtered',       # Mailbox disabled, not accepting messages
           '5.2.2'  => 'mailboxfull',    # Mailbox full
-          '5.2.3'  => 'exceedlimit',    # Message length exceeds administrative limit
-          '5.2.4'  => 'filtered',       # Mailing list expansion problem
+          '5.2.3'  => 'emailtoolarge',  # Message length exceeds administrative limit
+          '5.2.4'  => 'systemerror',    # Mailing list expansion problem
           '5.3.0'  => 'systemerror',    # Other or undefined mail system status
           '5.3.1'  => 'systemfull',     # Mail system full
           '5.3.2'  => 'notaccept',      # System not accepting network messages
           '5.3.3'  => 'systemerror',    # System not capable of selected features
-          '5.3.4'  => 'mesgtoobig',     # Message too big for system
+          '5.3.4'  => 'emailtoolarge',  # Message too big for system
           '5.3.5'  => 'systemerror',    # System incorrectly configured
           '5.4.0'  => 'networkerror',   # Other or undefined network or routing status
           '5.4.3'  => 'systemerror',    # Directory server failure
           '5.4.4'  => 'hostunknown',    # Unable to route
           '5.5.2'  => 'systemerror',    # If the server cannot BASE64 decode any client response (AUTH)
-          '5.5.3'  => 'toomanyconn',    # Too many recipients
+          '5.5.3'  => 'ratelimited',    # Too many recipients
           '5.5.4'  => 'systemerror',    # Invalid command arguments
           '5.5.5'  => 'systemerror',    # Wrong protocol version
           '5.5.6'  => 'syntaxerror',    # Authentication Exchange line is too long
@@ -565,7 +565,7 @@ module Sisimai
           '5.6.3'  => 'contenterror',   # Conversion required but not supported
           '5.6.5'  => 'contenterror',   # Conversion Failed
           '5.6.6'  => 'contenterror',   # Message content not available
-          '5.6.7'  => 'contenterror',   # Non-ASCII addresses not permitted for that sender/recipient
+          '5.6.7'  => 'rejected',       # Non-ASCII addresses not permitted for that sender/recipient
           '5.6.8'  => 'contenterror',   # UTF-8 string reply is required, but not permitted by the SMTP client
           '5.6.9'  => 'contenterror',   # UTF-8 header message cannot be transferred to one or more recipients
           '5.7.0'  => 'securityerror',  # Other or undefined security status
@@ -583,10 +583,10 @@ module Sisimai
           '5.7.13' => 'suspend',        # User Account Disabled
           '5.7.14' => 'securityerror',  # Trust relationship required
           '5.7.15' => 'securityerror',  # Priority Level is too low
-          '5.7.16' => 'mesgtoobig',     # Message is too big for the specified priority
+          '5.7.16' => 'emailtoolarge',  # Message is too big for the specified priority
           '5.7.17' => 'hasmoved',       # Mailbox owner has changed
           '5.7.18' => 'hasmoved',       # Domain owner has changed
-          '5.7.19' => 'securityerror',  # RRVS test cannot be completed
+          '5.7.19' => 'systemerror',    # RRVS test cannot be completed
           '5.7.20' => 'authfailure',    # No passing DKIM signature found
           '5.7.21' => 'authfailure',    # No acceptable DKIM signature found
           '5.7.22' => 'authfailure',    # No valid author-matched DKIM signature found
@@ -601,76 +601,37 @@ module Sisimai
         }.freeze
 
         InternalCode = {
-          :temporary => {
-            'authfailure'     => '4.0.926',
-            'badreputation'   => '4.0.975',
-            'blocked'         => '4.0.971',
-            'contenterror'    => '4.0.960',
-            'exceedlimit'     => '4.0.923',
-            'expired'         => '4.0.947',
-            'failedstarttls'  => '4.0.976',
-            'filtered'        => '4.0.924',
-            # 'hasmoved'      => '4.0.916',
-            # 'hostunknown'   => '4.0.912',
-            'mailboxfull'     => '4.0.922',
-            'mailererror'     => '4.0.939',
-            'mesgtoobig'      => '4.0.934',
-            'networkerror'    => '4.0.944',
-            'norelaying'      => '4.0.909',
-            'notaccept'       => '4.0.932',
-            'notcompliantrfc' => '4.0.974',
-            'onhold'          => '4.0.901',
-            'policyviolaton'  => '4.0.972',
-            'rejected'        => '4.0.918',
-            'requireptr'      => '4.0.973',
-            'securityerror'   => '4.0.970',
-            'spamdetected'    => '4.0.980',
-            'speeding'        => '4.0.946',
-            'suppressed'      => '4.0.903',
-            'suspend'         => '4.0.921',
-            'systemerror'     => '4.0.930',
-            'systemfull'      => '4.0.931',
-            'syntaxerror'     => '4.0.902',
-            'toomanyconn'     => '4.0.945',
-            # 'userunknown'   => '4.0.911',
-            'undefined'       => '4.0.900',
-            'virusdetected'   => '4.0.981',
-          },
-          :permanent => {
-            'authfailure'     => '5.0.926',
-            'badreputation'   => '5.0.975',
-            'blocked'         => '5.0.971',
-            'contenterror'    => '5.0.960',
-            'exceedlimit'     => '5.0.923',
-            'expired'         => '5.0.947',
-            'failedstarttls'  => '5.0.976',
-            'filtered'        => '5.0.910',
-            'hasmoved'        => '5.0.916',
-            'hostunknown'     => '5.0.912',
-            'mailboxfull'     => '5.0.922',
-            'mailererror'     => '5.0.939',
-            'mesgtoobig'      => '5.0.934',
-            'networkerror'    => '5.0.944',
-            'norelaying'      => '5.0.909',
-            'notaccept'       => '5.0.932',
-            'notcompliantrfc' => '5.0.974',
-            'onhold'          => '5.0.901',
-            'policyviolation' => '5.0.972',
-            'rejected'        => '5.0.918',
-            'requireptr'      => '5.0.973',
-            'securityerror'   => '5.0.970',
-            'spamdetected'    => '5.0.980',
-            'speeding'        => '5.0.946',
-            'suppressed'      => '5.0.903',
-            'suspend'         => '5.0.921',
-            'systemerror'     => '5.0.930',
-            'systemfull'      => '5.0.931',
-            'syntaxerror'     => '5.0.902',
-            'toomanyconn'     => '5.0.945',
-            'userunknown'     => '5.0.911',
-            'undefined'       => '5.0.900',
-            'virusdetected'   => '5.0.981',
-          },
+          'authfailure'     => ['5.9.130', '4.9.130'],
+          'badreputation'   => ['5.9.132', '4.9.132'],
+          'blocked'         => ['5.9.134', '4.9.134'],
+          'contenterror'    => ['5.9.160', '4.9.160'],
+          'emailtoolarge'   => ['5.9.161', '4.9.161'],
+          'expired'         => ['5.9.340', '4.9.340'],
+          'failedstarttls'  => ['5.9.350', '4.9.350'],
+          'filtered'        => ['5.9.210', '4.9.210'],
+          'hasmoved'        => ['5.9.211', ''],
+          'hostunknown'     => ['5.9.212', ''],
+          'mailboxfull'     => ['5.9.220', '4.9.220'],
+          'mailererror'     => ['5.9.230', '4.9.230'],
+          'networkerror'    => ['5.9.341', '4.9.341'],
+          'norelaying'      => ['5.9.214', '4.9.214'],
+          'notaccept'       => ['5.9.215', '4.9.215'],
+          'notcompliantrfc' => ['5.9.162', '4.9.162'],
+          'onhold'          => ['5.9.301', '4.9.301'],
+          'policyviolation' => ['5.9.371', '4.9.371'],
+          'ratelimited'     => ['5.9.131', '4.9.131'],
+          'rejected'        => ['5.9.110', '4.9.110'],
+          'requireptr'      => ['5.9.133', '4.9.133'],
+          'securityerror'   => ['5.9.370', '4.9.370'],
+          'spamdetected'    => ['5.9.164', '4.9.164'],
+          'suppressed'      => ['5.9.310', '4.9.310'],
+          'suspend'         => ['5.9.221', '4.9.221'],
+          'syntaxerror'     => ['5.9.351', '4.9.351'],
+          'systemerror'     => ['5.9.231', '4.9.231'],
+          'systemfull'      => ['5.9.232', '4.9.232'],
+          'undefined'       => ['5.9.300', '4.9.300'],
+          'userunknown'     => ['5.9.213', ''],
+          'virusdetected'   => ['5.9.165', '4.9.165'],
         }.freeze
 
         # Convert from the reason string to the internal status code
@@ -679,12 +640,11 @@ module Sisimai
         #                               true:  Temporary error
         # @return   [String]            DSN or an empty string if the 1st argument is missing
         # @see      name
-        def code(argv1 = nil, argv2 = false)
-          return "" if argv1.to_s.empty?
+        def code(argv1 = "", argv2 = false)
+          return "" if argv1.empty?
 
-          table = argv2 ? InternalCode[:temporary] : InternalCode[:permanent]
-          code0 = table[argv1] || InternalCode[:permanent][argv1] || nil
-          return code0
+          pairs = InternalCode[argv1]; return "" if pairs.nil?
+          return argv2 ? pairs[1] : pairs[0]
         end
 
         # Convert from the status code to the reason string
@@ -831,7 +791,7 @@ module Sisimai
           return argv0 if argv1.nil?; return argv0 if argv1.size < 5
 
           statuscode = argv0
-          codeinmesg = argv1
+          codeinmesg = argv1; return codeinmesg if statuscode.index(".9.") == 1
           esmtpreply = argv2 || '000'
           the1stchar = {
             'field' => statuscode[0, 1].to_i,
@@ -888,7 +848,7 @@ module Sisimai
         # @return   bool          false: The delivery status code is not explicit
         def is_explicit(argv1 = '')
           return false if argv1.nil? || argv1.empty?
-          return false if argv1.size == 7 && argv1.start_with?("5.0.9", "4.0.9")
+          return false if argv1.size == 7 && argv1.start_with?("5.9.", "4.9.")
           return true
         end
 

data/lib/sisimai/string.rb

@@ -7,21 +7,6 @@ module Sisimai
         body: %r|<head>.+</head>.*<body[ >].+</body>|im,
       }
 
-      # Create message token from addresser and recipient
-      # @param  [String]  addr1 Sender address
-      # @param  [String]  addr2 Recipient address
-      # @param  [Integer] epoch Machine time of the email bounce
-      # @return [String]        Message token(MD5 hex digest) or blank(failed to create token)
-      # @see    http://en.wikipedia.org/wiki/ASCII
-      def token(addr1, addr2, epoch)
-        return "" if addr1.is_a?(::String) == false || addr2.is_a?(::String) == false
-        return "" if addr1.empty? || addr2.empty? || epoch.is_a?(Integer) == false
-
-        # Format: STX(0x02) Sender-Address RS(0x1e) Recipient-Address ETX(0x03)
-        require 'digest/sha1'
-        return Digest::SHA1.hexdigest(sprintf("\x02%s\x1e%s\x1e%d\x03", addr1.downcase, addr2.downcase, epoch))
-      end
-
       # The argument is 8-bit text or not
       # @param    [String] argvs  Any string to be checked
       # @return   [Boolean]       false: ASCII Characters only, true: Including 8-bit character

data/lib/sisimai/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sisimai
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: java
 authors:
 - azumakuniyuki
 bindir: exe
 cert_chain: []
-date: 2025-12-05 00:00:00.000000000 Z
+date: 2026-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,7 @@ files:
 - lib/sisimai/reason/blocked.rb
 - lib/sisimai/reason/contenterror.rb
 - lib/sisimai/reason/delivered.rb
-- lib/sisimai/reason/exceedlimit.rb
+- lib/sisimai/reason/emailtoolarge.rb
 - lib/sisimai/reason/expired.rb
 - lib/sisimai/reason/failedstarttls.rb
 - lib/sisimai/reason/feedback.rb
@@ -166,24 +166,22 @@ files:
 - lib/sisimai/reason/hostunknown.rb
 - lib/sisimai/reason/mailboxfull.rb
 - lib/sisimai/reason/mailererror.rb
-- lib/sisimai/reason/mesgtoobig.rb
 - lib/sisimai/reason/networkerror.rb
 - lib/sisimai/reason/norelaying.rb
 - lib/sisimai/reason/notaccept.rb
 - lib/sisimai/reason/notcompliantrfc.rb
 - lib/sisimai/reason/onhold.rb
 - lib/sisimai/reason/policyviolation.rb
+- lib/sisimai/reason/ratelimited.rb
 - lib/sisimai/reason/rejected.rb
 - lib/sisimai/reason/requireptr.rb
 - lib/sisimai/reason/securityerror.rb
 - lib/sisimai/reason/spamdetected.rb
-- lib/sisimai/reason/speeding.rb
 - lib/sisimai/reason/suppressed.rb
 - lib/sisimai/reason/suspend.rb
 - lib/sisimai/reason/syntaxerror.rb
 - lib/sisimai/reason/systemerror.rb
 - lib/sisimai/reason/systemfull.rb
-- lib/sisimai/reason/toomanyconn.rb
 - lib/sisimai/reason/undefined.rb
 - lib/sisimai/reason/userunknown.rb
 - lib/sisimai/reason/vacation.rb

data/lib/sisimai/reason/exceedlimit.rb

@@ -1,47 +0,0 @@
-module Sisimai
-  module Reason
-    # Sisimai::Reason::ExceedLimit checks the bounce reason is "exceedlimit" or not. This class is
-    # called only Sisimai::Reason class.
-    #
-    # This is the error that a message was rejected due to an email exceeded the limit. The value
-    # of D.S.N. is 5.2.3. This reason is almost the same as "MesgTooBig", we think.
-    module ExceedLimit
-      class << self
-        Index = [
-          'message header size exceeds limit',
-          'message too large',
-        ].freeze
-
-        def text; return 'exceedlimit'; end
-        def description; return 'Email rejected due to an email exceeded the limit'; end
-
-        # Try to match that the given text and regular expressions
-        # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [Boolean]       false: Did not match, true: Matched
-        def match(argv1)
-          return false if argv1.nil? || argv1.empty?
-          return true  if Index.any? { |a| argv1.include?(a) }
-          return false
-        end
-
-        # Exceed limit or not
-        # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [Boolean]             true:  Exceeds the limit
-        #                                 false: Did not exceed the limit
-        # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(argvs)
-          return false if argvs['deliverystatus'].empty?
-          return true  if argvs['reason'] == 'exceedlimit'
-
-          # Delivery status code points exceedlimit.
-          # Status: 5.2.3
-          # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'exceedlimit'
-          return match(argvs['diagnosticcode'].downcase)
-        end
-
-      end
-    end
-  end
-end
-

data/lib/sisimai/reason/speeding.rb

@@ -1,47 +0,0 @@
-module Sisimai
-  module Reason
-    # Sisimai::Reason::Speeding checks the bounce reason is "speeding" or not. This class is called
-    # only Sisimai::Reason class. This is the error that a connection rejected due to exceeding a
-    # rate limit or sending too fast.
-    module Speeding
-      class << self
-        Index = [
-          'mail sent from your IP address has been temporarily rate limited',
-          'please try again slower',
-          'receiving mail at a rate that prevents additional messages from being delivered',
-        ].freeze
-
-        def text; return 'speeding'; end
-        def description; return 'Rejected due to exceeding a rate limit or sending too fast'; end
-
-        # Try to match that the given text and regular expressions
-        # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [Boolean]       false: Did not match, true: Matched
-        def match(argv1)
-          return false if argv1.nil? || argv1.empty?
-          return true  if Index.any? { |a| argv1.include?(a) }
-          return false
-        end
-
-        # Speeding or not
-        # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [Boolean]             true:  is speeding
-        #                                 false: is not speeding
-        # @see      http://www.ietf.org/rfc/rfc2822.txt
-        def true(argvs)
-          return false if argvs['deliverystatus'].empty?
-          return true  if argvs['reason'] == 'speeding'
-
-          # Action: failed
-          # Status: 4.7.1
-          # Remote-MTA: dns; smtp.example.jp
-          # Diagnostic-Code: smtp; 451 4.7.1 <mx.example.org[192.0.2.2]>: Client host rejected:
-          #                  Please try again slower
-          return match(argvs['diagnosticcode'].downcase)
-        end
-
-      end
-    end
-  end
-end
-

data/lib/sisimai/reason/toomanyconn.rb

@@ -1,59 +0,0 @@
-module Sisimai
-  module Reason
-    # Sisimai::Reason::TooManyConn checks the bounce reason is "toomanyconn" or not. This class is
-    # called only Sisimai::Reason class.
-    #
-    # This is the error that SMTP connection was rejected temporarily due to too many concurrency
-    # connections to the remote server. This reason has added in Sisimai 4.1.26.
-    #
-    #   <kijitora@example.ne.jp>: host mx02.example.ne.jp[192.0.1.20] said:
-    #     452 4.3.2 Connection rate limit exceeded. (in reply to MAIL FROM command)
-    module TooManyConn
-      class << self
-        Index = [
-          'all available ips are at maximum connection limit',    # SendGrid
-          'connection rate limit exceeded',
-          'exceeds per-domain connection limit for',
-          'has exceeded the max emails per hour ',
-          'throttling failure: daily message quota exceeded',
-          'throttling failure: maximum sending rate exceeded',
-          'too many connections',
-          'too many connections from your host.', # Microsoft
-          'too many concurrent smtp connections', # Microsoft
-          'too many errors from your ip',         # Free.fr
-          'too many recipients',                  # ntt docomo
-          'too many smtp sessions for this host', # Sendmail(daemon.c)
-          'trop de connexions, ',
-          'we have already made numerous attempts to deliver this message',
-        ].freeze
-
-        def text; return 'toomanyconn'; end
-        def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
-
-        # Try to match that the given text and regular expressions
-        # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [Boolean]       false: Did not match, true: Matched
-        def match(argv1)
-          return false if argv1.nil? || argv1.empty?
-          return true  if Index.any? { |a| argv1.include?(a) }
-          return false
-        end
-
-        # Rejected by domain or address filter ?
-        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [Boolean]               true:  is filtered
-        #                                   false: is not filtered
-        # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(argvs)
-          return true if argvs['reason'] == 'toomanyconn'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'toomanyconn'
-          return match(argvs['diagnosticcode'].downcase)
-        end
-
-      end
-    end
-  end
-end
-
-
-