sisimai 5.5.0 → 5.7.0

data/lib/sisimai/reason.rb

@@ -7,10 +7,10 @@ module Sisimai
       # @return   [Array] Reason list
       def index
         return %w[
-          AuthFailure BadReputation Blocked ContentError ExceedLimit Expired FailedSTARTTLS Filtered
-          HasMoved HostUnknown MailboxFull MailerError MesgTooBig NetworkError NotAccept NotCompliantRFC
-          OnHold Rejected NoRelaying Speeding SpamDetected VirusDetected PolicyViolation SecurityError
-          Suspend RequirePTR SystemError SystemFull TooManyConn Suppressed UserUnknown SyntaxError
+          AuthFailure BadReputation Blocked ContentError EmailTooLarge Expired FailedSTARTTLS Filtered
+          HasMoved HostUnknown MailboxFull MailerError NetworkError NotAccept NotCompliantRFC RateLimited
+          OnHold Rejected NoRelaying SpamDetected VirusDetected PolicyViolation SecurityError Suspend
+          RequirePTR SystemError SystemFull Suppressed UserUnknown SyntaxError
         ]
       end
 
@@ -45,21 +45,21 @@ module Sisimai
       ModulePath = Sisimai::Reason.path
       GetRetried = Sisimai::Reason.retry
       ClassOrder = [
-        %w[
-          MailboxFull MesgTooBig ExceedLimit Suspend HasMoved NoRelaying AuthFailure UserUnknown
-          Filtered RequirePTR NotCompliantRFC BadReputation ContentError Rejected HostUnknown
-          SpamDetected Speeding TooManyConn Blocked
+        # 0. true() meethod in the following reasons are called from Reason->find()
+        %w[MailboxFull EmailTooLarge Suspend HasMoved NoRelaying AuthFailure UserUnknown Filtered RequirePTR
+           NotCompliantRFC BadReputation ContentError Rejected HostUnknown SpamDetected RateLimited Blocked
+           FailedSTARTTLS NotAccept VirusDetected PolicyViolation
         ],
+        # 1. match() method in the following reasons are called from Reason->find()
         %w[
-          MailboxFull AuthFailure BadReputation Speeding SpamDetected VirusDetected PolicyViolation 
-          NoRelaying SystemError NetworkError Suspend ContentError SystemFull NotAccept Expired
-          FailedSTARTTLS SecurityError Suppressed MailerError
+          MailboxFull SpamDetected VirusDetected NoRelaying SystemError NetworkError Suspend SystemFull
+          Suppressed MailerError SecurityError PolicyViolation SyntaxError Expired
         ],
         %w[
-          MailboxFull MesgTooBig ExceedLimit Suspend UserUnknown Filtered Rejected HostUnknown
-          SpamDetected Speeding TooManyConn Blocked SpamDetected AuthFailure FailedSTARTTLS
-          SecurityError SystemError NetworkError Suspend Expired ContentError HasMoved SystemFull
-          NotAccept MailerError NoRelaying Suppressed SyntaxError OnHold
+          MailboxFull EmailTooLarge Suspend UserUnknown Filtered Rejected HostUnknown SpamDetected
+          RateLimited Blocked SpamDetected AuthFailure FailedSTARTTLS SecurityError SystemError
+          NetworkError Suspend Expired ContentError HasMoved SystemFull NotAccept MailerError
+          NoRelaying Suppressed SyntaxError OnHold
         ]
       ]
 

data/lib/sisimai/rfc1123.rb

@@ -125,7 +125,7 @@ module Sisimai
         sourcetext = sourcetext.gsub("[", " [").gsub("(", " (").gsub("<", " <") # Prefix a space character before each bracket
         sourcetext = sourcetext.gsub("]", "] ").gsub(")", ") ").gsub(">", "> ") # Suffix a space character behind each bracket
         sourcetext = sourcetext.gsub(":", ": ").gsub(";", "; ")                 # Suffix a space character behind : and ;
-        sourcetext = Sisimai::String.sweep(sourcetext)
+        sourcetext = sourcetext.split.join(" ")
 
         catch :MAKELIST do
           Sandwiched.each do |e|

data/lib/sisimai/rfc1894.rb

@@ -146,7 +146,7 @@ module Sisimai
         return nil if argv0.empty?
         label = Sisimai::RFC1894.label(argv0)
         group = FieldGroup[label] || ''
-        parts = argv0.split(":", 2); parts[1] = parts[1].nil? ? "" : Sisimai::String.sweep(parts[1])
+        parts = argv0.split(":", 2); parts[1] = parts[1].nil? ? "" : parts[1].split.join(" ")
         return nil if group.empty? || CapturesOn[group].nil?
 
         # Try to match with each pattern of Per-Message field, Per-Recipient field
@@ -157,24 +157,25 @@ module Sisimai
         #   - 4: Comment
         table = [label, "", "", group, ""]
 
-        if group == 'addr' || group == 'code' || group == 'host'
+        case group
+        when "addr", "code", "host"
           # - Final-Recipient: RFC822; kijitora@nyaan.jp
           # - Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
           # - Remote-MTA: DNS; mx.example.jp
           if parts[1].include?(";")
             # There is a valid sub type (including ";")
             v = parts[1].split(";", 2)
-            table[1] = Sisimai::String.sweep(v[0]).upcase if v.size > 0
-            table[2] = Sisimai::String.sweep(v[1])        if v.size > 1
+            table[1] = v[0].split.join(" ").upcase if v.size > 0
+            table[2] = v[1].split.join(" ")        if v.size > 1
           else
             # There is no sub type like "Diagnostic-Code: 550 5.1.1 <kijitora@example.jp>..."
-            table[2] = Sisimai::String.sweep(parts[1])
+            table[2] = parts[1]
             table[1] = SubtypeSet[group] || ""
           end
           table[2] = table[2].downcase if group == "host"
           table[2] = "" if table[2] =~ /\A\s+\z/
 
-        elsif group == "list"
+        when "list"
           # Action: failed
           # Check that the value is an available value defined in "ActionList" or not.
           # When the value is invalid, convert to an available value defined in "Correction"

data/lib/sisimai/rfc2045.rb

@@ -146,7 +146,7 @@ module Sisimai
         return nil if block.empty?
 
         (upperchunk, lowerchunk) = block.split("\n\n", 2)
-        return ['', ''] if upperchunk.nil? || upperchunk.empty?
+        return ['', ''] if upperchunk.nil? || upperchunk.empty? || lowerchunk.nil?
         return ['', ''] if upperchunk.index('Content-Type').nil?
 
         headerpart = ['', ''] # ["text/plain; charset=iso-2022-jp; ...", "quoted-printable"]
@@ -263,7 +263,7 @@ module Sisimai
       # @return   [String]        Message body
       def makeflat(argv0 = '', argv1 = '')
         return "" if argv0.nil? || argv1.nil?
-        return "" if argv0.index('multipart/') == false || argv0.index('boundary=') == false
+        return "" if argv0.downcase.index('multipart/') == false || argv0.downcase.index('boundary=') == false
 
         # Some bounce messages include lower-cased "content-type:" field such as the followings:
         #   - content-type: message/delivery-status        => Content-Type: message/delivery-status

data/lib/sisimai/rfc3464/thirdparty.rb

@@ -71,7 +71,7 @@ module Sisimai
             fieldparts = argv1.split(":", 2)
             xfieldname = fieldparts[0].downcase
             xgroupname = FieldGroup[xfieldname]; return [] if xgroupname.nil?
-            xfieldlist = ["", "", Sisimai::String.sweep(fieldparts[1]), xgroupname, "", "PowerMTA"]
+            xfieldlist = ["", "", fieldparts[1].split.join(" "), xgroupname, "", "PowerMTA"]
 
             # - 0: Field-Name
             # - 1: Sub Type: RFC822, DNS, X-Unix, and so on)

data/lib/sisimai/rfc3464.rb

@@ -109,16 +109,12 @@ module Sisimai
               if isboundary.any? { |a| e == a } then goestonext = false; break; end
               if e.start_with?("Content-Type:")
                 # Content-Type: field in multipart/*
-                if e.include?("multipart/")
+                case
                   # Content-Type: multipart/alternative; boundary=aa00220022222222ffeebb
                   # Pick the boundary string and store it into "isboucdary"
-                  isboundary << Sisimai::RFC2045.boundary(e, 0)
-                elsif e.include?("text/plain")
-                  # Content-Type: "text/plain"
-                  goestonext = false
-                else
-                  # Other types: for example, text/html, image/jpg, and so on
-                  goestonext = true
+                  when e.include?("multipart/") then isboundary << Sisimai::RFC2045.boundary(e, 0)
+                  when e.include?("text/plain") then goestonext = false
+                  else goestonext = true # Other types: for example, text/html, image/jpg, and so on
                 end
                 break
               end
@@ -145,7 +141,8 @@ module Sisimai
             next unless o = Sisimai::RFC1894.field(e)
             v = dscontents[-1]
 
-            if o[3] == "addr"
+            case o[3]
+            when "addr"
               # Final-Recipient: rfc822; kijitora@example.jp
               # X-Actual-Recipient: rfc822; kijitora@example.co.jp
               if o[0] == "final-recipient"
@@ -165,7 +162,7 @@ module Sisimai
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 v["alias"] = o[2]
               end
-            elsif o[3] == "code"
+            when "code"
               # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
               v["spec"]      = o[1]
               v["diagnosis"] = o[2]
@@ -212,7 +209,7 @@ module Sisimai
               # Diagnostic-Code: SMTP; 550-5.7.26 The MAIL FROM domain [email.example.jp]
               #    has an SPF record with a hard fail
               next if e.start_with?(" ") == false
-              v["diagnosis"] += " #{Sisimai::String.sweep(e)}"
+              v["diagnosis"] += " " + e
             end
           end
         end
@@ -232,7 +229,7 @@ module Sisimai
 
         if beforemesg != ""
           # Pick some values of $dscontents from the string before StartingOf[:message]
-          beforemesg = Sisimai::String.sweep(beforemesg)
+          beforemesg = beforemesg.split.join(" ")
           alternates["command"]   = Sisimai::SMTP::Command.find(beforemesg)
           alternates["replycode"] = Sisimai::SMTP::Reply.find(beforemesg, dscontents[0]["status"])
           alternates["status"]    = Sisimai::SMTP::Status.find(beforemesg, alternates["replycode"])
@@ -242,7 +239,6 @@ module Sisimai
         dscontents.each do |e|
           # Set default values stored in "permessage" if each value in "dscontents" is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
           lowercased = e["diagnosis"].downcase
 
           if recipients == 1
@@ -254,7 +250,7 @@ module Sisimai
             else
               # The value of e["diagnosis"] is not contained in $beforemesg
               # There may be an important error message in $beforemesg
-              e["diagnosis"] = Sisimai::String.sweep(sprintf("%s %s", beforemesg, e["diagnosis"]))
+              e["diagnosis"] = sprintf("%s %s", beforemesg, e["diagnosis"])
             end
           end
           e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"])

data/lib/sisimai/rfc3834.rb

@@ -116,8 +116,7 @@ module Sisimai
           break if haveloaded >= maxmsgline
         end
         v['diagnosis'] ||= mhead['subject']
-        v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
-        v['reason']    = 'vacation'
+        v['reason']      = 'vacation'
 
         cv = v['diagnosis'].downcase
         Suspending.each do |e|
@@ -127,8 +126,8 @@ module Sisimai
           break
         end
 
-        v['date']      = mhead['date']
-        v['status']    = ''
+        v['date']   = mhead['date']
+        v['status'] = ''
 
         if cv = lower['subject'].match(SubjectSet)
           # Get the Subject header from the original message

data/lib/sisimai/rfc791.rb

@@ -12,8 +12,7 @@ module Sisimai
 
         octet.each do |e|
           # Check each octet is between 0 and 255
-          return false unless e =~ /\A[0-9]{1,3}\z/
-          v = e.to_i
+          return false unless e =~ /\A[0-9]{1,3}\z/; v = e.to_i
           return false if v < 0 || v > 255
         end
         return true
@@ -27,42 +26,8 @@ module Sisimai
         return nil if argv0.to_s.empty?
         return []  if argv0.size < 7
 
-        given = argv0.dup
-        ipv4a = []
-        %w|( ) [ ] ,|.each do |e|
-          # Rewrite: "mx.example.jp[192.0.2.1]" => "mx.example.jp 192.0.2.1"
-          p0 = given.index(e); next if p0.nil?
-          given[p0, 1] = ' '
-        end
-
-        given.split(' ').each do |e|
-          # Find string including an IPv4 address
-          next if e.index('.').nil? # IPv4 address must include "." character
-
-          lx = e.size; next if lx < 7 || lx > 17  # 0.0.0.0 = 7, [255.255.255.255] = 17
-          cu = 0  # Cursor for seeking each octet of an IPv4 address
-          as = '' # ASCII Code of each character
-          eo = '' # Buffer of each octet of IPv4 Address
-
-          while cu < lx
-            # Check whether each character is a number or "." or not
-            as  = e[cu, 1].ord
-            cu += 1
-
-            if as < 48 || as > 57
-              # The character is not a number(0-9)
-              break if as      != 46  # The character is not "."
-              next  if eo      == ''  # The current buffer is empty
-              break if eo.to_i > 255  # The current buffer is greater than 255
-              eo = ''
-              next
-            end
-            eo += as.chr
-            break if eo.to_i > 255
-          end
-          ipv4a << e if eo.size > 0 && eo.to_i < 256
-        end
-        return ipv4a
+        given = argv0.dup.tr('()[],', ' ').squeeze(' ')
+        return given.split(' ').select { |e| is_ipv4address(e) }
       end
 
     end

data/lib/sisimai/rhost/apple.rb

@@ -44,15 +44,15 @@ module Sisimai
             #   Please visit https://support.apple.com/en-us/HT204137
             'due to local policy',
           ],
-          'rejected' => [
-            # - 450 4.1.8 <kijitora@example.jp>: Sender address rejected: Domain not found
-            'sender address rejected',
-          ],
-          'speeding' => [
+          'ratelimited' => [
             # - 421 4.7.1 Messages to ****@icloud.com deferred due to excessive volume.
             #   Try again later - https://support.apple.com/en-us/HT204137
             'due to excessive volume',
           ],
+          'rejected' => [
+            # - 450 4.1.8 <kijitora@example.jp>: Sender address rejected: Domain not found
+            'sender address rejected',
+          ],
           'suspend' => [
             # - https://support.apple.com/guide/icloud/stop-using-or-reactivate-addresses-mm3adb030cbf/icloud
             # - 550 5.1.1 <****@icloud.com>: inactive email address (in reply to RCPT TO command)

data/lib/sisimai/rhost/cloudflare.rb

@@ -6,6 +6,8 @@ module Sisimai
     module Cloudflare
       class << self
         MessagesOf = {
+          # - 554 <YOUR_IP_ADDRESS> found on one or more RBLs (abusixip). Refer to
+          #   https://developers.cloudflare.com/email-routing/postmaster/#spam-and-abusive-traffic/
           "blocked"     => ["found on one or more DNSBLs"],
           "systemerror" => ["Upstream error"],
         }.freeze

data/lib/sisimai/rhost/cox.rb

@@ -37,13 +37,13 @@ module Sisimai
           # - There is a limit to the number of concurrent SMTP connections per IP address to
           #   protect the systems against attack. Ensure that the sending email server is not
           #   opening more than 10 concurrent connections to avoid reaching this limit.
-          'CXCNCT' => 'toomanyconn',
+          'CXCNCT' => 'ratelimited',
 
           # CXMXRT
           #   - The sender has sent email to too many recipients and needs to wait before sending
           #     more email.
           #   - The email sender has exceeded the maximum number of sent email allowed.
-          'CXMXRT' => 'toomanyconn', 
+          'CXMXRT' => 'ratelimited', 
 
           # CDRBL
           # - The sending IP address has been temporarily blocked by Cox due to exhibiting spam-like
@@ -87,31 +87,18 @@ module Sisimai
             'cox too many bad commands from',
             'too many invalid recipients',
           ],
-          'requireptr' => [
-            # - The reverse DNS check of the sending server IP address has failed.
-            # - Cox requires that all connecting email servers contain valid reverse DNS PTR records.
-            'dns check failure - try again later',
-            'rejected - no rdns',
-          ],
-          'policyviolation' => [
-            # - The sending server has attempted to communicate too soon within the SMTP transaction
+          'contenterror' => [
             # - The message has been rejected because it contains an attachment with one of the
             #   following prohibited file types, which commonly contain viruses: .shb, .shs, .vbe,
             #   .vbs, .wsc, .wsf, .wsh, .pif, .msc, .msi, .msp, .reg, .sct, .bat, .chm, .isp, .cpl,
             #   .js, .jse, .scr, .exe.
-            'esmtp no data before greeting',
             'attachment extension is forbidden',
           ],
-          'rejected' => [
-            # Cox requires that all sender domains resolve to a valid MX or A-record within DNS.
-            'sender rejected',
-          ],
-          'systemerror' => [
-            # - Our systems are experiencing an issue which is causing a temporary inability to
-            #   accept new email.
-            'esmtp server temporarily not available',
+          'policyviolation' => [
+            # - The sending server has attempted to communicate too soon within the SMTP transaction
+            'esmtp no data before greeting',
           ],
-          'toomanyconn' => [
+          'ratelimited' => [
             # - The sending IP address has exceeded the five maximum concurrent connection limit.
             # - The SMTP connection has exceeded the 100 email message threshold and was disconnected.
             # - The sending IP address has exceeded one of these rate limits and has been temporarily
@@ -120,6 +107,21 @@ module Sisimai
             'requested action aborted: try again later',
             'message threshold exceeded',
           ],
+          'rejected' => [
+            # Cox requires that all sender domains resolve to a valid MX or A-record within DNS.
+            'sender rejected',
+          ],
+          'requireptr' => [
+            # - The reverse DNS check of the sending server IP address has failed.
+            # - Cox requires that all connecting email servers contain valid reverse DNS PTR records.
+            'dns check failure - try again later',
+            'rejected - no rdns',
+          ],
+          'systemerror' => [
+            # - Our systems are experiencing an issue which is causing a temporary inability to
+            #   accept new email.
+            'esmtp server temporarily not available',
+          ],
           'userunknown' => [
             # - The intended recipient is not a valid Cox Email account.
             'recipient rejected',

data/lib/sisimai/rhost/facebook.rb

@@ -15,14 +15,18 @@ module Sisimai
             "POL-P1",   # Your mail server's IP Address is listed on the Spamhaus PBL.
             "POL-P2",   # Facebook will no longer accept mail from your mail server's IP Address.
             "POL-P3",   # Facebook is not accepting messages from your mail server. This will persist for 4 to 8 hours.
-            "POL-P4",   # Facebook is not accepting messages from your mail server. This will persist for 24 to 48 hours.
-            "POL-T1",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 1 to 2 hours.
-            "POL-T2",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 4 to 8 hours.
-            "POL-T3",   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 24 to 48 hours.
+            "POL-P4",   # ". This will persist for 24 to 48 hours.
+            "POL-T1",   # ", but they may be retried later. This will persist for 1 to 2 hours.
+            "POL-T2",   # ", but they may be retried later. This will persist for 4 to 8 hours.
+            "POL-T3",   # ", but they may be retried later. This will persist for 24 to 48 hours.
           ],
           "contenterror" => [
             "MSG-P2",   # The message contains an attachment type that Facebook does not accept.
           ],
+          "emailtoolarge" => [
+            "MSG-P1",   # The message exceeds Facebook's maximum allowed size.
+            "INT-P2",   # The message exceeds Facebook's maximum allowed size.
+          ],
           "filtered" => [
             "RCP-P2",   # The attempted recipient's preferences prevent messages from being delivered.
             "RCP-P3",   # The attempted recipient's privacy settings blocked the delivery.
@@ -30,16 +34,19 @@ module Sisimai
           "mailboxfull" => [
             "INT-P7",   # The attempted recipient has exceeded their storage quota.
           ],
-          "mesgtoobig" => [
-            "MSG-P1",   # The message exceeds Facebook's maximum allowed size.
-            "INT-P2",   # The message exceeds Facebook's maximum allowed size.
-          ],
           "notcompliantrfc" => [
             "MSG-P3",   # The message contains multiple instances of a header field that can only be present once.
           ],
           "policyviolation" => [
             "POL-P8",   # The message does not comply with Facebook's abuse policies and will not be accepted.
           ],
+          "ratelimited" => [
+            "CON-T1",   # Facebook's mail server currently has too many connections open to allow another one.
+            "CON-T2",   # Your mail server currently has too many connections open to Facebook's mail servers.
+            "CON-T3",   # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
+            "CON-T4",   # Your mail server has exceeded the maximum number of recipients for its current connection.
+            "MSG-T1",   # The number of recipients on the message exceeds Facebook's allowed maximum.
+          ],
           "rejected" => [
             "DNS-P1",   # Your SMTP MAIL FROM domain does not exist.
             "DNS-P2",   # Your SMTP MAIL FROM domain does not have an MX record.
@@ -59,17 +66,10 @@ module Sisimai
             "RCP-T1",   # The attempted recipient address is not currently available due to an internal system issue.
             "INT-Tx",   # These codes indicate a temporary issue internal to Facebook's system.
           ],
-          "toomanyconn" => [
-            "CON-T1",   # Facebook's mail server currently has too many connections open to allow another one.
-            "CON-T2",   # Your mail server currently has too many connections open to Facebook's mail servers.
-            "CON-T3",   # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
-            "CON-T4",   # Your mail server has exceeded the maximum number of recipients for its current connection.
-            "MSG-T1",   # The number of recipients on the message exceeds Facebook's allowed maximum.
-          ],
           "userunknown" => [
             "RCP-P1",   # The attempted recipient address does not exist.
             "INT-P1",   # The attempted recipient address does not exist.
-            "INT-P3",   # The attempted recpient group address does not exist.
+            "INT-P3",   # The attempted recipient group address does not exist.
             "INT-P4",   # The attempted recipient address does not exist.
           ],
           "virusdetected" => [

data/lib/sisimai/rhost/franceptt.rb

@@ -43,7 +43,7 @@ module Sisimai
           # - 421 mwinf5c79 ME Trop de connexions, veuillez verifier votre configuration.
           # - Too many connections, slow down. OFR005_104 [104]
           # - Too many connections, slow down. LPN105_104
-          '104' => 'toomanyconn',
+          '104' => 'ratelimited',
 
           # - Your IP address is missing a DNS PTR record, it also called a rDNS (reverse DNS)
           #   Please set up a valid DNS PTR record for your IP address that point to your domain,
@@ -56,7 +56,7 @@ module Sisimai
           #   Please reduce the number of messages per connection, recommended value is 100
           #   messages per connections
           # - Veuillez essayer plus tard. LPN003_109
-          "109" => 'toomanyconn',
+          "109" => 'ratelimited',
 
           # - Invalid HELO/EHLO
           #   Please set up a valid HELO/EHLO, it must be fully qualified domain name (FQDN) and
@@ -82,6 +82,11 @@ module Sisimai
           # - 501 5.1.0 Emetteur invalide. Invalid Sender. OFR004_405 [405] (in reply to MAIL FROM command))
           '405' => 'rejected',
 
+          # - Your Sender has been rejected
+          #   Please contact Orange by using our contact form and select option
+          #   "Un problème d'envoi d'emails vers les adresses Orange ou Wanadoo (deliverability issue)"
+          "406" => 'rejected',
+
           # - User doesn't exist here
           #   Please remove this email address from your distribution list, it does not exist
           # - 550 5.1.1 Adresse d au moins un destinataire invalide.
@@ -144,7 +149,7 @@ module Sisimai
           #   are trying to send
           # - 421 mwinf5c77 ME Service refuse. Veuillez essayer plus tard. Service refused, please try
           #   later. OFR_999 [999]
-          "99X" => 'toomanyconn',
+          "99X" => 'ratelimited',
 
           # Other undocumented or old error codes
           "105" => "",                # Veuillez essayer plus tard.

data/lib/sisimai/rhost/godaddy.rb

@@ -69,19 +69,19 @@ module Sisimai
           #   retry. IB605
           # - The message has attempted to mail too many recipients.
           # - Reduce the number of recipients and try again.
-          'IB605' => 'toomanyconn',
+          'IB605' => 'ratelimited',
 
           # - 421 Connection refused, too many sessions from This IP. Lower the number of concurrent
           #   sessions. IB007
           # - This IP address currently has too many sessions open.
           # - Check with your email provider to reduce the number of open sessions on your IP
           #   address and then try again.
-          'IB007' => 'toomanyconn',
+          'IB007' => 'ratelimited',
 
           # - 421 Server temporarily unavailable. Try again later. IB101
           # - The email queue is experiencing higher than normal email volume.
           # - Try again later.
-          'IB101' => 'speeding',
+          'IB101' => 'ratelimited',
 
           # - 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
@@ -112,16 +112,16 @@ module Sisimai
 
           # - 550 This IP has sent too many messages this hour. IB504
           # - This IP address has reached the maximum allowed messages for that hour.
-          'IB504' => 'speeding',
+          'IB504' => 'ratelimited',
 
           # - 550 This message has exceeded the max number of messages per session. Open a new
           #   session and try again. IB510
           # - This IP address has reached the maximum allowed messages for that session.
-          'IB510' => 'speeding',
+          'IB510' => 'ratelimited',
 
           # - 550 This IP has sent too many to too many recipients this hour. IB607
           # - This IP address has reached the maximum allowed recipients for that hour.
-          'IB607' => 'speeding',
+          'IB607' => 'ratelimited',
 
           # Remote block list (RBL) bounces
           # ---------------------------------------------------------------------------------------
@@ -143,6 +143,14 @@ module Sisimai
           'IB106' => 'blocked',
         }.freeze
         MessagesOf = {
+          'authfailure' => [
+            # - 550 SPF Sender Invalid - envelope rejected
+            # - 550 5.7.9: This mail has been blocked because the sender is unauthenticated
+            # - 550-5.7.26 DKIM = did not pass
+            "spf sender invalid - envelope rejected",
+            "this mail has been blocked because the sender is unauthenticated",
+            "dkim = did not pass",
+          ],
           'blocked' => [
             # - 554 RBL Reject.
             # - This IP address was blocked from our internal RBL.
@@ -169,6 +177,25 @@ module Sisimai
             #   make space for more email.
             'account storage limit',
           ],
+          'norelaying' => [
+            # - 550 5.7.1: Relay access denied
+            "relay access denied",
+          ],
+          'ratelimited' => [
+            # - 550 5.7.232 Your message can't be sent because your trial tenant has exceeded
+            #   its daily limit for sending email to external recipients (tenant external recipient rate limit)
+            # - 550 5.7.233 - Your message can't be sent because your tenant exceeded its daily
+            #   limit for sending email to external recipients (tenant external recipient rate limit)
+            "exceeded its daily limit",
+          ],
+          'rejected' => [
+            # - 550 5.1.8 Access denied, bad outbound sender AS (42004)
+            "bad outbound sender as (42004)",
+          ],
+          'securityerror' => [
+            # - 550 Please turn on SMTP Authentication in your mail client
+            "turn on smtp authentication in your mail client",
+          ],
           'spamdetected' => [
             # - 552 Message rejected for spam or virus content
             # - The email message contains a link, attachment, or pattern caught by our filters as spam.
@@ -188,15 +215,6 @@ module Sisimai
             #   other. They need to correct their forwarding settings.
             'message is looping',
           ],
-          'toomanyconn' => [
-            # - 550 5.7.232 Your message can't be sent because your trial tenant has exceeded
-            #   its daily limit for sending email to external recipients (tenant external
-            #   recipient rate limit)
-            # - 550 5.7.233 - Your message can't be sent because your tenant exceeded its daily
-            #   limit for sending email to external recipients (tenant external recipient rate
-            #   limit)
-            "exceeded its daily limit",
-          ],
           'userunknown' => [
             # - 550 Recipient not found
             # - The recipient is not a valid email address.