sisimai 5.5.0-java → 5.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cce493bf6db19759e2159c36d40d5278493243187083b92f35c47aea14d52ca7
-  data.tar.gz: 75080d90011ad6813fa681dbc1f9ff02c604cc0653f03bb7b37791f7b21187fe
+  metadata.gz: 1f44c6b808f8cc77c1b201c98e3c62326c8d5bbd32010ed17a1665abefc02413
+  data.tar.gz: d3071f7eb259a1fe59a4d1b4a0cead24888ef3d5a3fe130e469dbc48e82d2117
 SHA512:
-  metadata.gz: 0d974c494297ca7f3200b30ca630cbd9d99f3536222fbe84a86746669da335295869c0811d017d61ad813e2be154ab5562b861bc3bdbbbe798309256ded62006
-  data.tar.gz: 85a40b4f2f0dda6e9bbdecee8027dcf71d81428b041d59a7522b5cf0defe701c4af1a343494b321d5fcf0399e155b4aa2116a50591d09b64851490a1d944fdaa
+  metadata.gz: 5f71bc52c7f17d6a2a506e97e52fbf30bf42b95bd85deb4349e5ffe6eec16b1336e0b14a31afa7cab2714f2842bcda1656be1589f7eab7b5dc7d430314b75f1a
+  data.tar.gz: 1fead139305581fcee22a5ea4bb906612fb5fcd5c214d07df34772d88f425b9dca474f48c5fb45c410110967b08249a506c615c711cf7b115b0c16a9d1e33488

data/ChangeLog.md

@@ -2,6 +2,27 @@ RELEASE NOTES for Ruby version of Sisimai
 ===================================================================================================
 - releases: "https://github.com/sisimai/rb-sisimai/releases"
 - download: "https://rubygems.org/gems/sisimai"
+- document: "https://libsisimai.org/"
+
+v5.6.0
+---------------------------------------------------------------------------------------------------
+- release: "Mon,  2 Feb 2026 18:30:22 +0900 (JST)"
+- version: "5.6.0"
+- changes:
+  - **Changes in Bounce Reason Categorization**
+    - Update bounce status mappings in `Sisimai::SMTP::Status`.
+    - #399 Consolidate four bounce reasons into two:
+      - Merge `TooManyConn` and `Speeding` into `RateLimited`.
+      - Merge `ExceedLimit` and `MesgTooBig` into `EmailTooLarge`.
+    - #406 Update assigned reasons in `rhost/for-*.go`.
+    - #408 Error message patterns improvement.
+      - Merge similar error message patterns and remove ambiguous ones.
+      - Attachment-related errors have been moved from `PolicyViolation` to `ContentError`.
+  - **Reorganize the internal status code** #403
+    - Temporary error `4.0.9**` has been changed to `4.9.***`.
+    - Permanent error `5.0.9**` has been changed to `5.9.***`.
+  - #401 `Sisimai::String.token` has been moved to `Sisimai::Fact.token()`.
+  - Happy Birthday to Suzu (formerly known as "Neko-dono" Michitsuna).
 
 v5.5.0
 ---------------------------------------------------------------------------------------------------

data/LICENSE

@@ -1,6 +1,6 @@
 THIS SOFTWARE IS DISTRIBUTED UNDER THE FOLLOWING BSD 2-CLAUSE LICENSE:
  
-Copyright (C) 2015-2017 azumakuniyuki, All rights reserved.
+Copyright (C) 2015-2026 azumakuniyuki, All rights reserved.
  
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

data/README-JA.md

@@ -115,10 +115,10 @@ Install
 ### From RubyGems.org
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-5.5.0.gem (100%)
-Successfully installed sisimai-5.5.0
-Parsing documentation for sisimai-5.5.0
-Installing ri documentation for sisimai-5.5.0
+Fetching: sisimai-5.6.0.gem (100%)
+Successfully installed sisimai-5.6.0
+Parsing documentation for sisimai-5.6.0
+Installing ri documentation for sisimai-5.6.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -146,13 +146,13 @@ if [ -d "/usr/local/jr" ]; then \
 ...
 3 gems installed
 /opt/local/bin/rake install
-sisimai 5.5.0 built to pkg/sisimai-5.5.0.gem.
-sisimai (5.5.0) installed.
+sisimai 5.6.0 built to pkg/sisimai-5.6.0.gem.
+sisimai (5.6.0) installed.
 if [ -d "/usr/local/jr" ]; then \
 		PATH="/usr/local/jr/bin:$PATH" /usr/local/jr/bin/rake install; \
 	fi
-sisimai 5.5.0 built to pkg/sisimai-5.5.0-java.gem.
-sisimai (5.5.0) installed.
+sisimai 5.6.0 built to pkg/sisimai-5.6.0-java.gem.
+sisimai (5.6.0) installed.
 ```
 
 Usage
@@ -358,9 +358,9 @@ Sisimai 5.5.0から**Ruby 2.5以上**が必要になります。
 | 動作環境(JRuby)                                      | 9.0.4.0 - 9.1.17.0 | **9.2** or later    |
 | 元メールファイルを操作可能なコールバック機能         | なし               | あり[^3]            |
 | 解析エンジン(MTA/ESPモジュール)の数                  | 68                 | 60                  |
-| 検出可能なバウンス理由の数                           | 29                 | 36                  |
+| 検出可能なバウンス理由の数                           | 29                 | 34                  |
 | 依存Gem数(Ruby Standard Gemsを除く)                  | 1 Gem              | 1 Gem               |
-| ソースコードの行数                                   | 10,800 行          | 9,970 行            |
+| ソースコードの行数                                   | 10,800 行          | 9,700 行            |
 | テストフレームワーク                                 | rspec              | minitest            |
 | テスト件数(spec/またはtest/ディレクトリ)             | 311,000 件         | 240,000 件          |
 | 1秒間に解析できるバウンスメール数[^4]                | 620 通             | 620 通              |
@@ -417,8 +417,11 @@ Sisimai 5では新たに5個のバウンス理由が増えました。検出可
 | 送信者のドメイン・IPアドレスの低いレピュテーション   | `Blocked`          | `BadReputation`     |
 | PTRレコードが未設定または無効なPTRレコード           | `Blocked`          | `RequirePTR`        |
 | RFCに準拠していないメール[^7]                        | `SecurityError`    | `NotCompliantRFC`   |
-| 単位時間の流量制限・送信速度が速すぎる               | `SecurityError`    | `Speeding`          |
 | STARTTLS関連のエラー (added at v5.2.0)               | `SecurityError`    | `FailedSTARTTLS`    |
+| 単位時間の流量制限・送信速度が速すぎる               | `SecurityError`    | `RateLimited`       |
+| セッションあたりの受信者数制限や接続数を超過         | `TooManyConn`      | `RateLimited`       |
+| メールが大きすぎる(ExceedLimit)                      | `ExceedLimit`      | `EmailTooLarge`     |
+| メールが大きすぎる(MesgTooBig)                       | `MesgTooBig`       | `EmailTooLarge`     |
 | 宛先がサプレッションリストに一致 (added at v5.2.0)   | `OnHold`           | `Suppressed`        |
 
 [^7]: RFC5322など
@@ -463,7 +466,7 @@ Author
 
 Copyright
 ===================================================================================================
-Copyright (C) 2015-2025 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2015-2026 azumakuniyuki, All Rights Reserved.
 
 License
 ===================================================================================================

data/README.md

@@ -87,7 +87,7 @@ The key features of Sisimai
   * __High Precision of Analysis__
     * Support [60 MTAs/MDAs/ESPs](https://libsisimai.org/en/engine/)
     * Support Feedback Loop Message(ARF)
-    * Can detect [36 bounce reasons](https://libsisimai.org/en/reason/)
+    * Can detect [34 bounce reasons](https://libsisimai.org/en/reason/)
 
 [^2]: The callback function allows you to add your own data under the `catch` accessor.
 
@@ -114,10 +114,10 @@ Install
 ### From RubyGems
 ```shell
 $ sudo gem install sisimai
-Fetching: sisimai-5.5.0.gem (100%)
-Successfully installed sisimai-5.5.0
-Parsing documentation for sisimai-5.5.0
-Installing ri documentation for sisimai-5.5.0
+Fetching: sisimai-5.6.0.gem (100%)
+Successfully installed sisimai-5.6.0
+Parsing documentation for sisimai-5.6.0
+Installing ri documentation for sisimai-5.6.0
 Done installing documentation for sisimai after 6 seconds
 1 gem installed
 ```
@@ -145,13 +145,13 @@ if [ -d "/usr/local/jr" ]; then \
 ...
 3 gems installed
 /opt/local/bin/rake install
-sisimai 5.5.0 built to pkg/sisimai-5.5.0.gem.
-sisimai (5.5.0) installed.
+sisimai 5.6.0 built to pkg/sisimai-5.6.0.gem.
+sisimai (5.6.0) installed.
 if [ -d "/usr/local/jr" ]; then \
 		PATH="/usr/local/jr/bin:$PATH" /usr/local/jr/bin/rake install; \
 	fi
-sisimai 5.5.0 built to pkg/sisimai-5.5.0-java.gem.
-sisimai (5.5.0) installed.
+sisimai 5.6.0 built to pkg/sisimai-5.6.0-java.gem.
+sisimai (5.6.0) installed.
 ```
 
 Usage
@@ -357,9 +357,9 @@ Beginning with v5.5.0, Sisimai requires **Ruby 2.5.0 or later.**
 | System requirements (JRuby)                          | 9.0.4.0 - 9.1.17.0 | **9.2** or later    |
 | Callback feature for the original email file         | N/A                | Available[^3]       |
 | The number of MTA/ESP modules                        | 68                 | 60                  |
-| The number of detectable bounce reasons              | 29                 | 36                  |
+| The number of detectable bounce reasons              | 29                 | 34                  |
 | Dependencies (Except Ruby Standard Gems)             | 1 gem              | 1 gem               |
-| Source lines of code                                 | 10,300 lines       | 9,970 lines         |
+| Source lines of code                                 | 10,300 lines       | 9,700 lines         |
 | Test frameworks                                      | rspec              | minitest            |
 | The number of tests in spec/ or test/ directory      | 311,000 tests      | 240,000 tests       | 
 | The number of bounce emails decoded/sec (CRuby)[^4]  | 620 emails         | 620 emails          |
@@ -418,8 +418,11 @@ detect is available at [LIBSISIMAI.ORG/EN/REASON](https://libsisimai.org/en/reas
 | low/bad reputation of the sender hostname/IP addr.   | `Blocked`          | `BadReputation`     |
 | missing PTR/having invalid PTR                       | `Blocked`          | `RequirePTR`        |
 | non-compliance with RFC[^7]                          | `SecurityError`    | `NotCompliantRFC`   |
-| exceeding a rate limit or sending too fast           | `SecurityError`    | `Speeding`          |
 | STARTTLS-related errors (added at v5.2.0)            | `SecurityError`    | `FailedSTARTTLS`    |
+| exceeding a rate limit or sending too fast           | `SecurityError`    | `RateLimited`       |
+| too many concurrency connections or recipients       | `TooManyConn`      | `RateLimited`       |
+| Email size is too large for the remote host          | `ExceedLimit`      | `EmailTooLarge`     |
+| Email size is too large for the remote host          | `MesgTooBig`       | `EmailTooLarge`     |
 | Recipient in the suppression list (added at v5.2.0)  | `OnHold`           | `Suppressed`        |
 
 [^7]: RFC5322 and related RFCs
@@ -466,7 +469,7 @@ Author
 
 Copyright
 ===================================================================================================
-Copyright (C) 2015-2025 azumakuniyuki, All Rights Reserved.
+Copyright (C) 2015-2026 azumakuniyuki, All Rights Reserved.
 
 License
 ===================================================================================================

data/lib/sisimai/fact.rb

@@ -374,7 +374,7 @@ module Sisimai
           'senderdomain' => as.host,
           'destination'  => ar.host,
           'alias'        => piece['alias'] || ar.alias,
-          'token'        => Sisimai::String.token(as.address, ar.address, piece['timestamp']),
+          'token'        => Sisimai::Fact.token(as.address, ar.address, piece['timestamp']),
         }
         ea.each { |q| thing[q] = piece[q] if thing[q].nil? || thing[q].empty? }
 
@@ -506,7 +506,7 @@ module Sisimai
         # 2. Several softbounces: MailboxFull, Filtered, NoRelaying
         #   2-1. The SMTP command is "RCPT" except "MailboxFull".
         #   2-2. The SMTP reply code begins with "5" such as "550".
-        #   2-3. The SMTP status code is explicit code (not empty, not 5.0.9XX).
+        #   2-3. The SMTP status code is explicit code (not empty, not 5.9.***).
         #   2-4. The SMTP status code begins with "5." such as "5.1.1".
         return true  if cr != 'mailboxfull' && thing['command'] == "RCPT"
         return true  if cv.start_with?('5')
@@ -521,6 +521,21 @@ module Sisimai
       return false
     end
 
+    # 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 self.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
+
     # Convert from Sisimai::Fact object to a Hash
     # @return   [Hash] Hashed data
     def damn

data/lib/sisimai/lhost/amazonses.rb

@@ -49,7 +49,7 @@ module Sisimai::Lhost
         "OnAccountSuppressionList" => "suppressed",
         "General"                  => "onhold",
         "MailboxFull"              => "mailboxfull",
-        "MessageTooLarge"          => "mesgtoobig",
+        "MessageTooLarge"          => "emailtoolarge",
         "ContentRejected"          => "contenterror",
         "AttachmentRejected"       => "securityerror",
       }.freeze

data/lib/sisimai/lhost/einsundeins.rb

@@ -11,7 +11,7 @@ module Sisimai::Lhost
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
       }.freeze
-      MessagesOf = {'mesgtoobig' => ['Mail size limit exceeded']}.freeze
+      MessagesOf = {'emailtoolarge' => ['Mail size limit exceeded']}.freeze
 
       # @abstract Decode the bounce message from 1&1
       # @param  [Hash] mhead    Message headers of a bounce email

data/lib/sisimai/lhost/exchange2007.rb

@@ -38,12 +38,12 @@ module Sisimai::Lhost
         "RESOLVER.ADR.RecipNotFound"     => "userunknown",   # 550 5.1.1 RESOLVER.ADR.RecipNotFound
         "RESOLVER.ADR.RecipientNotFound" => "userunknown",   # 550 5.1.1 RESOLVER.ADR.RecipientNotFound
         "RESOLVER.ADR.ExRecipNotFound"   => "userunknown",   # 550 5.1.1 RESOLVER.ADR.ExRecipNotFound
-        "RESOLVER.ADR.RecipLimit"        => "toomanyconn",   # 550 5.5.3 RESOLVER.ADR.RecipLimit
+        "RESOLVER.ADR.RecipLimit"        => "ratelimited",   # 550 5.5.3 RESOLVER.ADR.RecipLimit
         "RESOLVER.ADR.InvalidInSmtp"     => "systemerror",   # 550 5.1.0 RESOLVER.ADR.InvalidInSmtp
         "RESOLVER.ADR.Ambiguous"         => "systemerror",   # 550 5.1.4 RESOLVER.ADR.Ambiguous, 420 4.2.0 RESOLVER.ADR.Ambiguous
         "RESOLVER.RST.AuthRequired"      => "securityerror", # 550 5.7.1 RESOLVER.RST.AuthRequired
         "RESOLVER.RST.NotAuthorized"     => "rejected",      # 550 5.7.1 RESOLVER.RST.NotAuthorized
-        "RESOLVER.RST.RecipSizeLimit"    => "exceedlimit",   # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
+        "RESOLVER.RST.RecipSizeLimit"    => "emailtoolarge", # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
         "QUEUE.Expired"                  => "expired",       # 550 4.4.7 QUEUE.Expired
       }.freeze
       MailSender = ["postmaster@outlook.com", ".onmicrosoft.com"].freeze

data/lib/sisimai/lhost/exim.rb

@@ -164,9 +164,11 @@ module Sisimai::Lhost
         end
         return nil if proceedsto < 2 && thirdparty == false
 
+        require "sisimai/reason"
         require "sisimai/address"
         require "sisimai/rfc2045"
         require "sisimai/smtp/command"
+        require "sisimai/smtp/failure"
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -461,21 +463,17 @@ module Sisimai::Lhost
           #
           # The value of "Status:" indicates permanent error but the value of SMTP reply code in
           # Diagnostic-Code: field is "TEMPERROR"!!!!
-          re = e["reason"]
           cr = Sisimai::SMTP::Reply.find(e["diagnosis"], e["status"])
           cs = Sisimai::SMTP::Status.find(e["diagnosis"], cr)
+          re = e["reason"]
           cv = ""
 
-          if cr[0,1] == "4" || re == "expired" || re == "mailboxfull"
+          if Sisimai::SMTP::Failure.is_temporary(cr) || re == "expired" || re == "mailboxfull"
             # Set the pseudo status code as a temporary error
-            cv = Sisimai::SMTP::Status.code(re, true)
-
-          else
-            # Set the pseudo status code as a permanent error
-            cv = Sisimai::SMTP::Status.code(re, false)
+            cv = Sisimai::SMTP::Status.code(re, true) if Sisimai::Reason.is_explicit(re)
           end
           e["replycode"] = cr if e["replycode"].empty?
-          e["status"]    = Sisimai::SMTP::Status.prefer(cs, cv, cr) if e["status"].empty?
+          e["status"]    = Sisimai::SMTP::Status.prefer(cv, cs, cr) if e["status"].empty?
         end
 
         return { "ds" => dscontents, "rfc822" => emailparts[1] }

data/lib/sisimai/lhost/qmail.rb

@@ -72,9 +72,9 @@ module Sisimai::Lhost
       OnHoldPair = [" does not like recipient.", "this message has been in the queue too long."].freeze
       FailOnLDAP = {
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
-        "exceedlimit" => ["The message exeeded the maximum size the user accepts"], # 5.2.3
-        "userunknown" => ["Sorry, no mailbox here by that name"],           # 5.1.1
-        "suspend"     => [ # 5.2.1
+        "emailtoolarge" => ["The message exeeded the maximum size the user accepts"], # 5.2.3
+        "userunknown"   => ["Sorry, no mailbox here by that name"], # 5.1.1
+        "suspend"       => [ # 5.2.1
           "Mailaddress is administrativly disabled",
           "Mailaddress is administrativley disabled",
           "Mailaddress is administratively disabled",
@@ -102,8 +102,8 @@ module Sisimai::Lhost
         "mailboxfull" => ["disk quota exceeded"],
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        "mesgtoobig"  => ["Message size exceeds fixed maximum message size:"],
-        "networkerror"=> [
+        "emailtoolarge" => ["Message size exceeds fixed maximum message size:"],
+        "networkerror"  => [
             "Sorry, I wasn't able to establish an SMTP connection",
             "Sorry. Although I'm listed as a best-preference MX or A for that host",
         ],

data/lib/sisimai/message.rb

@@ -297,6 +297,8 @@ module Sisimai
           email += sprintf("%s: %s\n", fn, bf)
         end
 
+        # 5. Convert the lower-cased SMTP command to the upper-cased.
+        email  = email.gsub("after end of data:", "after end of DATA:")
         email += "\n" if email.end_with?("\n\n") == false
         return email
       end

data/lib/sisimai/reason/authfailure.rb

@@ -12,23 +12,19 @@ module Sisimai
     # Diagnostic-Code: smtp; 550 5.7.1 Email rejected per DMARC policy for example.org
     module AuthFailure
       class << self
-        require 'sisimai/string'
-
         Index = [
-          '//spf.pobox.com',
-          'bad spf records for',
-          'dmarc policy',
+          "//spf.pobox.com",
+          "5322.From address doesn't meet the authentication requirements",
+          "bad spf records for",
+          "dmarc policy",
           "doesn't meet the required authentication level",
-          'please inspect your spf settings',
-          'sender policy framework (spf) fail',
-          'sender policy framework violation',
-          'spf (sender policy framework) domain authentication fail',
-          'spf check: fail',
-          "the 5322.From address doesn't meet the authentication requirements defined for the sender",
+          "please inspect your spf settings",
+          "sender policy framework",
+          "spf check: fail",
         ].freeze
         Pairs = [
-          [' is not allowed to send mail.', '_401'],
-          ['is not allowed to send from <', " per it's spf record"],
+          [" is not allowed to send mail.", "_401"],
+          ["is not allowed to send from <", " per it's spf record"],
         ].freeze
 
         def text; return 'authfailure'; end

data/lib/sisimai/reason/badreputation.rb

@@ -15,13 +15,13 @@ module Sisimai
     module BadReputation
       class << self
         Index = [
-          'a poor email reputation score',
-          'has been temporarily rate limited due to ip reputation',
-          'ip/domain reputation problems',
-          'likely suspicious due to the very low reputation',
-          'none/bad reputation', # t-online.de
-          'temporarily deferred due to unexpected volume or user complaints', # Yahoo Inc.
-          "the sending mta's poor reputation",
+          "has been temporarily rate limited due to ip reputation",
+          "ip/domain reputation problems",
+          "likely suspicious due to the very low reputation",
+          "none/bad reputation", # t-online.de
+          "poor email reputation score",
+          "sending mta's poor reputation",
+          "temporarily deferred due to unexpected volume or user complaints", # Yahoo Inc.
         ].freeze
         def text; return 'badreputation'; end
         def description; return 'Email rejected due to an IP address reputation'; end

data/lib/sisimai/reason/blocked.rb

@@ -7,93 +7,67 @@ module Sisimai
     # or the parameter of "HELO/EHLO" command. This reason has added in Sisimai 4.0.0.
     module Blocked
       class << self
-        require 'sisimai/string'
-
         Index = [
-          ' said: 550 blocked',
-          '//www.spamcop.net/bl.',
-          'bad sender ip address',
-          'banned sending ip',    # Office365
-          'blacklisted by',
-          'blocked using ',
-          'blocked - see http',
-          'dnsbl:attrbl',
-          'client host rejected: abus detecte gu_eib_02',     # SFR
-          'client host rejected: abus detecte gu_eib_04',     # SFR
-          'client host rejected: may not be mail exchanger',
-          'client host rejected: was not authenticated',      # Microsoft
-          'confirm this mail server',
-          'connection dropped',
-          'connection refused by',
-          'connection reset by peer',
-          'connection was dropped by remote host',
-          'connections not accepted from ip addresses on spamhaus xbl',
-          'currently sending spam see: ',
-          'domain does not exist:',
-          'dynamic/zombied/spam ips blocked',
-          'error: no valid recipients from ',
-          'esmtp not accepting connections',  # icloud.com
-          'extreme bad ip profile',
-          'go away',
-          'helo command rejected:',
-          'host network not allowed',
-          'hosts with dynamic ip',
-          'invalid ip for sending mail of domain',
-          'is in a black list',
-          'is not allowed to send mail from',
-          'mailfrom domain is listed in spamhaus',
-          'no access from mail server',
-          'no matches to nameserver query',
-          'not currently accepting mail from your ip',    # Microsoft
-          'part of their network is on our block list',
-          'please use the smtp server of your isp',
-          'refused - see http',
-          'rejected - multi-blacklist', # junkemailfilter.com
-          'rejected because the sending mta or the sender has not passed validation',
-          'rejecting open proxy', # Sendmail(srvrsmtp.c)
-          'sender ip address rejected',
-          'server access forbidden by your ip ',
-          'service not available, closing transmission channel',
-          'smtp error from remote mail server after initial connection:', # Exim
-          "sorry, that domain isn't in my list of allowed rcpthosts",
-          'sorry, your remotehost looks suspiciously like spammer',
-          'temporarily deferred due to unexpected volume or user complaints',
-          'to submit messages to this e-mail system has been rejected',
-          'too many spams from your ip',  # free.fr
-          'too many unwanted messages have been sent from the following ip address above',
-          'was blocked by ',
-          'we do not accept mail from dynamic ips',   # @mail.ru
-          'you are not allowed to connect',
-          'you are sending spam',
-          'your ip address is listed in the rbl',
-          'your network is temporary blacklisted',
-          'your server requires confirmation',
+          "bad sender ip address",
+          "banned sending ip", # Office365
+          "blacklisted by",
+          "dnsbl:attrbl",
+          "client host rejected: abus detecte gu_eib_02", # SFR
+          "client host rejected: abus detecte gu_eib_04", # SFR
+          "client host rejected: may not be mail exchanger",
+          "connection refused by",
+          "currently sending spam see: ",
+          "domain does not exist:",
+          "domain isn't in my list of allowed rcpthosts",
+          "error: no valid recipients from ",
+          "esmtp not accepting connections", # icloud.com
+          "extreme bad ip profile",
+          "helo command rejected:",
+          "host network not allowed",
+          "invalid ip for sending mail of domain",
+          "is in a black list",
+          "is not allowed to send mail from",
+          "no access from mail server",
+          "part of their network is on our block list",
+          "please use the smtp server of your isp",
+          "rejected because the sending mta or the sender has not passed validation",
+          "rejecting open proxy", # Sendmail(srvrsmtp.c)
+          "sender ip address rejected",
+          "server access forbidden by your ip ",
+          "smtp error from remote mail server after initial connection:", # Exim
+          "you are not allowed to connect",
+          "your ip address is listed in the rbl",
+          "your network is temporary blacklisted",
+          "your remotehost looks suspiciously like spammer",
+          "your server requires confirmation",
         ].freeze
         Pairs = [
-          ['(', '@', ':blocked)'],
-          ['access from ip address ', ' blocked'],
-          ['client host ', ' blocked using'],
-          ['connections will not be accepted from ', " because the ip is in spamhaus's list"],
-          ['dnsbl:rbl ', '>_is_blocked'],
-          ['email blocked by ', '.barracudacentral.org'],
-          ['email blocked by ', 'spamhaus'],
-          ['host ', ' refused to talk to me: ', ' blocked'],
-          ['ip ', ' is blocked by earthlink'],    # Earthlink
-          ['is in an ', 'rbl on '],
-          ['mail server at ', ' is blocked'],
-          ['mail from ',' refused:'],
-          ["mail from "," refused, see ", "orbs"],
-          ['message from ', ' rejected based on blacklist'],
-          ['messages from ', ' temporarily deferred due to user complaints'], # Yahoo!
-          ['server ip ', ' listed as abusive'],
-          ['sorry! your ip address', ' is blocked by rbl'], # junkemailfilter.com
-          ['the domain ', ' is blacklisted'],
-          ['the email ', ' is blacklisted'],
-          ['the ip', ' is blacklisted'],
-          ['veuillez essayer plus tard. service refused, please try later. ', '103'],
-          ['veuillez essayer plus tard. service refused, please try later. ', '510'],
+          ["(", "@", ":blocked)"],
+          ["access from ip address ", " blocked"],
+          ["blocked by ", " dnsbl"],
+          ["client ", " blocked using"],
+          ["connection ", "dropped"],
+          ["client host ", " blocked using"],
+          ["connections will not be accepted from ", " because the ip is in spamhaus's list"],
+          ["dynamic", " ip"],
+          ["email blocked by ", ".barracudacentral.org"],
+          ["email blocked by ", "spamhaus"],
+          ["from ", " ip address"],
+          ["host ", " said: ", "550 blocked"],
+          ["host ", " refused to talk to me: ", " blocked"],
+          ["ip ", " is blocked by earthlink"], # Earthlink
+          ["is in an ", "rbl on "],
+          ["mail server at ", " is blocked"],
+          ["mail from "," refused"],
+          ["message from ", " rejected based on blacklist"],
+          ["messages from ", " temporarily deferred due to user complaints"], # Yahoo!
+          ["server ip ", " listed as abusive"],
+          ["sorry! your ip address", " is blocked by rbl"], # junkemailfilter.com
+          ["the ", " is blacklisted"], # the email, the domain, the ip
+          ["veuillez essayer plus tard. service refused, please try later. ", "103"],
+          ["veuillez essayer plus tard. service refused, please try later. ", "510"],
           ["your access ip", " has been rejected"],
-          ["your sender's ip address is listed at ", '.abuseat.org'],
+          ["your sender's ip address is listed at ", ".abuseat.org"],
         ].freeze
 
         def text; return 'blocked'; end

data/lib/sisimai/reason/contenterror.rb

@@ -9,14 +9,20 @@ module Sisimai
     module ContentError
       class << self
         Index = [
-          'header size exceeds maximum permitted',
-          'improper use of 8-bit data in message header',
-          'message header size, or recipient list, exceeds policy limit',
-          'message mime complexity exceeds the policy maximum',
-          'routing loop detected -- too many received: headers',
-          'this message contain invalid mime headers',
-          'this message contain improperly-formatted binary content',
-          'this message contain text that uses unnecessary base64 encoding',
+          "executable files are not allowed in compressed files",
+          "header error",
+          "header size exceeds maximum permitted",
+          "illegal attachment on your message",
+          "improper use of 8-bit data in message header",
+          "it has a potentially executable attachment",
+          "message contain invalid mime headers",
+          "message contain improperly-formatted binary content",
+          "message contain text that uses unnecessary base64 encoding",
+          "message header size, or recipient list, exceeds policy limit",
+          "message mime complexity exceeds the policy maximum",
+          "message was blocked because its content presents a potential", # https://support.google.com/mail/answer/6590
+          "routing loop detected -- too many received: headers",
+          "we do not accept messages containing images or other attachments",
         ].freeze
 
         def text; return 'contenterror'; end