sisimai 5.4.1-java → 5.6.0-java

data/lib/sisimai/reason/mailboxfull.rb

@@ -8,55 +8,32 @@ module Sisimai
     module MailboxFull
       class << self
         Index = [
-          '452 insufficient disk space',
-          'account disabled temporarly for exceeding receiving limits',
-          'account is exceeding their quota',
-          'account is over quota',
-          'account is temporarily over quota',
-          'boite du destinataire pleine',
-          'delivery failed: over quota',
-          'disc quota exceeded',
-          'diskspace quota',
-          'does not have enough space',
-          'exceeded storage allocation',
-          'exceeding its mailbox quota',
-          'full mailbox',
-          'is over disk quota',
-          'is over quota temporarily',
-          'mail file size exceeds the maximum size allowed for mail delivery',
-          'mail quota exceeded',
-          'mailbox exceeded the local limit',
-          'mailbox full',
-          'mailbox has exceeded its disk space limit',
-          'mailbox is full',
-          'mailbox over quota',
-          'mailbox quota usage exceeded',
-          'mailbox size limit exceeded',
-          'maildir over quota',
-          'maildir delivery failed: userdisk quota ',
-          'maildir delivery failed: domaindisk quota ',
-          'mailfolder is full',
-          'no space left on device',
-          'not enough disk space',
-          'not enough storage space in',
-          'not sufficient disk space',
-          'over the allowed quota',
-          'quota exceeded',
-          'quota violation for',
-          'recipient reached disk quota',
-          'recipient rejected: mailbox would exceed maximum allowed storage',
-          'the recipient mailbox has exceeded its disk space limit',
-          "the user's space has been used up",
-          'the user you are trying to reach is over quota',
-          'too much mail data',   # @docomo.ne.jp
-          'user has exceeded quota, bouncing mail',
-          'user has too many messages on the server',
-          'user is over quota',
-          'user is over the quota',
-          'user over quota',
-          'user over quota. (#5.1.1)',    # qmail-toaster
-          'was automatically rejected: quota exceeded',
-          'would be over the allowed quota',
+          "452 insufficient disk space",
+          "account disabled temporarly for exceeding receiving limits",
+          "boite du destinataire pleine",
+          "exceeded storage allocation",
+          "full mailbox",
+          "mailbox size limit exceeded",
+          "mailbox would exceed maximum allowed storage",
+          "mailfolder is full",
+          "no space left on device",
+          "not sufficient disk space",
+          "quota violation for",
+          "too much mail data", # @docomo.ne.jp
+          "user has exceeded quota, bouncing mail",
+          "user has too many messages on the server",
+          "user's space has been used up",
+        ].freeze
+        Pairs = [
+          ["account is ", " quota"],
+          ["disk", "quota"],
+          ["enough ", " space"],
+          ["mailbox ", "exceeded", " limit"],
+          ["mailbox ", "full"],
+          ["mailbox ", "quota"],
+          ["maildir ", "quota"],
+          ["over ", "quota"],
+          ["quota ", "exceeded"],
         ].freeze
 
         def text; return 'mailboxfull'; end
@@ -66,8 +43,9 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/mailererror.rb

@@ -30,7 +30,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end

data/lib/sisimai/reason/networkerror.rb

@@ -11,22 +11,21 @@ module Sisimai
     module NetworkError
       class << self
         Index = [
-          'could not connect and send the mail to',
-          'dns records for the destination computer could not be found',
-          'hop count exceeded - possible mail loop',
-          'host is unreachable',
-          'host name lookup failure',
-          'host not found, try again',
-          'mail forwarding loop for ',
-          'malformed name server reply',
-          'malformed or unexpected name server reply',
-          'maximum forwarding loop count exceeded',
-          'message looping',
-          'message probably in a routing loop',
-          'no route to host',
-          'too many hops',
-          'unable to resolve route ',
-          'unrouteable mail domain',
+          "could not connect and send the mail to",
+          "dns records for the destination computer could not be found",
+          "host is unreachable",
+          "host name lookup failure",
+          "host not found, try again",
+          "maximum forwarding loop count exceeded",
+          "no route to host",
+          "too many hops",
+          "unable to resolve route ",
+          "unrouteable mail domain",
+        ].freeze
+        Pairs = [
+          ["malformed", "name server reply"],
+          ["mail ", "loop"],
+          ["message ", "loop"],
         ].freeze
 
         def text; return 'networkerror'; end
@@ -36,8 +35,9 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/norelaying.rb

@@ -10,27 +10,26 @@ module Sisimai
     module NoRelaying
       class << self
         Index = [
-          'as a relay',
-          'email address is not verified.',
-          'insecure mail relay',
-          'is not permitted to relay through this server without authentication',
-          'mail server requires authentication when attempting to send to a non-local e-mail address', # MailEnable
-          'no relaying',
-          'not a gateway',
-          'not allowed to relay through this machine',
-          'not an open relay, so get lost',
-          'not local host',
-          'relay access denied',
-          'relay denied',
-          'relay not permitted',
-          'relaying denied',  # Sendmail
-          'relaying mail to ',
-          'specified domain is not allowed',
-          "that domain isn't in my list of allowed rcpthost",
-          'this system is not configured to relay mail',
-          'unable to relay for',
+          "as a relay",
+          "domain isn't in my list of allowed rcpthost",
+          "email address is not verified.",
+          "insecure mail relay",
+          "no relaying",
+          "not a gateway",
+          "not an open relay, so get lost",
+          "not local host",
+          "relay not permitted",
+          "relaying denied", # Sendmail
+          "relaying mail to ",
+          "send to a non-local e-mail address", # MailEnable
+          "specified domain is not allowed",
+          "unable to relay ",
           "we don't handle mail for",
         ].freeze
+        Pairs = [
+          ["relay ", "denied"],
+          [" not ", " to relay"],
+        ].freeze
 
         def text; return 'norelaying'; end
         def description; return 'Email rejected with error message "Relaying Denied"'; end
@@ -39,8 +38,9 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -11,14 +11,11 @@ module Sisimai
       class << self
         # Destination mail server does not accept any message
         Index = [
-          'does not accept mail (nullmx)',
-          'host/domain does not accept mail', # iCloud
-          'host does not accept mail',        # Sendmail
-          'mail receiving disabled',
-          'name server: .: host not found',   # Sendmail
-          'no mx record found for domain=',   # Oath(Yahoo!)
-          'no route for current request',
-          'smtp protocol returned a permanent error',
+          "does not accept mail",             # Sendmail, iCloud
+          "mail receiving disabled",
+          "name server: .: host not found",   # Sendmail
+          "no mx record found for domain=",   # Oath(Yahoo!)
+          "no route for current request",
         ].freeze
 
         def text; return 'notaccept'; end
@@ -28,7 +25,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
@@ -41,7 +38,7 @@ module Sisimai
         def true(argvs)
           return true  if argvs['reason'] == 'notaccept'
           return true  if [521, 556].index(argvs['replycode'].to_i) # SMTP Reply Code is 554 or 556
-          return false if argvs['command'] != 'MAIL'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -7,16 +7,13 @@ module Sisimai
     # example, there are multiple "Subject" headers in the email.
     module NotCompliantRFC
       class << self
-        require 'sisimai/string'
         Index = [
-          'duplicate header',
-          'this message is not rfc 5322 compliant',
-          'https://support.google.com/mail/?p=rfcmessagenoncompliant',
+          "duplicate header",
+          "message is not rfc 5322 compliant",
+          "multiple addresses in from: header are not accepted",
+          "rfc 1035 violation",
+          "https://support.google.com/mail/?p=rfcmessagenoncompliant",
         ].freeze
-        Pairs = [
-          [' multiple ', ' header'],
-        ].freeze
-        
 
         def text; return 'notcompliantrfc'; end
         def description; return 'Email rejected due to non-compliance with RFC'; end
@@ -25,9 +22,8 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
-          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/policyviolation.rb

@@ -14,36 +14,21 @@ module Sisimai
     #
     module PolicyViolation
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'an illegal attachment on your message',
-          'because the recipient is not accepting mail with ',    # AOL Phoenix
-          'by non-member to a members-only list',
-          'closed mailing list',
-          'denied by policy',
-          'email not accepted for policy reasons',
+          "because the recipient is not accepting mail with ",    # AOL Phoenix
+          "closed mailing list",
+          "delivery not authorized, message refused",
+          "denied by policy",
           # http://kb.mimecast.com/Mimecast_Knowledge_Base/Administration_Console/Monitoring/Mimecast_SMTP_Error_Codes#554
-          'email rejected due to security policies',
-          'header are not accepted',
-          'header error',
-          'local policy violation',
-          'message bounced due to organizational settings',
-          'message given low priority',
-          'message not accepted for policy reasons',
-          'message rejected due to local policy',
-          'messages with multiple addresses',
-          'rejected for policy reasons',
-          'protocol violation',
-          'the email address used to send your message is not subscribed to this group',
-          'the message was rejected by organization policy',
-          'this message was blocked because its content presents a potential',
-          'we do not accept messages containing images or other attachments',
+          "email rejected due to security policies",
+          "for policy reasons",
+          "local policy violation",
+          "message bounced due to organizational settings",
+          "message given low priority",
+          "message was rejected by organization policy",
+          "protocol violation",
           "you're using a mass mailer",
         ].freeze
-        Pairs = [
-          ['you have exceeded the', 'allowable number of posts without solving a captcha'],
-        ].freeze
 
         def text; return 'policyviolation'; end
         def description; return 'Email rejected due to policy violation on a destination host'; end
@@ -53,9 +38,8 @@ module Sisimai
         # @return   [Boolean]       false: Did not match, true: Matched
         # @since 4.22.0
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
-          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/ratelimited.rb

@@ -0,0 +1,62 @@
+module Sisimai
+  module Reason
+    # Sisimai::Reason::RateLimited checks the bounce reason is "ratelimited" or not. This class is
+    # called only Sisimai::Reason class.
+    #
+    # This is the error that SMTP connection was rejected temporarily due to too many recipients or
+    # 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 RateLimited
+      class << self
+        Index = [
+          "has exceeded the max emails per hour ",
+          "please try again slower",
+          "receiving mail at a rate that prevents additional messages from being delivered",
+          "temporarily deferred due to unexpected volume or user complaints",
+          "throttling failure: ",
+          "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
+        Pairs = [
+          ["exceeded ", "allowable number of posts without solving a captcha"],
+          ["connection ", "limit"],
+          ["temporarily", "rate limited"],
+          ["too many con", "s"],
+        ].freeze
+
+        def text; return 'ratelimited'; 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 true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false
+        end
+
+        # Rejected by domain or address filter ?
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
+        # @return   [Boolean]               true:  is rate limited
+        #                                   false: is not rate limited
+        # @see http://www.ietf.org/rfc/rfc2822.txt
+        def true(argvs)
+          return true if argvs['reason'] == 'ratelimited'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'ratelimited'
+          return match(argvs['diagnosticcode'].downcase)
+        end
+
+      end
+    end
+  end
+end
+
+
+

data/lib/sisimai/reason/rejected.rb

@@ -14,66 +14,53 @@ module Sisimai
     module Rejected
       class << self
         IsNot = [
-          '5.1.0 address rejected',
-          'recipient address rejected',
-          'sender ip address rejected',
+          "5.1.0 address rejected",
+          "ip address ",
+          "recipient address rejected",
         ].freeze
         Index = [
-          'access denied (in reply to mail from command)',
-          'access denied (sender blacklisted)',
-          'address rejected',
-          'administrative prohibition',
-          'batv failed to verify',    # SoniWall
-          'batv validation failure',  # SoniWall
-          'backscatter protection detected an invalid or expired email address',  # MDaemon
-          "because the sender isn't on the recipient's list of senders to accept mail from",
-          'bogus mail from',          # IMail - block empty sender
+          "access denied (in reply to mail from command)",
+          "administrative prohibition",
+          "all recipient addresses rejected : access denied",
+          "backscatter protection detected an invalid or expired email address", # MDaemon
+          "by non-member to a members-only list",
           "can't determine purported responsible address",
-          'connections not accepted from servers without a valid sender domain',
-          'denied [bouncedeny]',      # McAfee
-          'denied by secumail valid-address-filter',
-          'delivery not authorized, message refused',
-          'does not exist e2110',
-          'domain of sender address ',
-          'email address is on senderfilterconfig list',
-          'emetteur invalide',
-          'empty envelope senders not allowed',
-          'envelope blocked - ',
-          'error: no third-party dsns',   # SpamWall - block empty sender
-          'from: domain is invalid. please provide a valid from:',
-          'fully qualified email address required',   # McAfee
-          'invalid domain, see <url:',
-          'invalid sender',
-          'is not a registered gateway user',
-          'mail from not owned by user',
-          'message rejected: email address is not verified',
-          'mx records for ',
-          'null sender is not allowed',
-          'recipient addresses rejected : access denied',
-          'recipient not accepted. (batv: no tag',
-          'returned mail not accepted here',
-          'rfc 1035 violation: recursive cname records for',
-          'rule imposed mailbox access for',  # MailMarshal
-          'sending this from a different address or alias using the ',
-          'sender address has been blacklisted',
-          'sender email address rejected',
-          'sender is in my black list',
-          'sender is spammer',
-          'sender not pre-approved',
-          'sender rejected',
-          'sender domain is empty',
-          'sender verify failed',     # Exim callout
-          'sender was rejected',      # qmail
-          'spam reporting address',   # SendGrid|a message to an address has previously been marked as Spam by the recipient.
-          'syntax error: empty email address',
-          'the message has been rejected by batv defense',
-          'this server does not accept mail from',
-          'transaction failed unsigned dsn for',
-          'unroutable sender address',
-          'you are not allowed to post to this mailing list',
-          'you are sending to/from an address that has been blacklisted',
-          'your access to submit messages to this e-mail system has been rejected',
-          'your email address has been blacklisted',  # MessageLabs
+          "connections not accepted from servers without a valid sender domain",
+          "denied by secumail valid-address-filter", # SecuMail
+          "domain of sender address ",
+          "email address is on senderfilterconfig list",
+          "emetteur invalide",
+          "empty email address",
+          "empty envelope senders not allowed",
+          "from: domain is invalid. please provide a valid from:",
+          "fully qualified email address required",   # McAfee
+          "invalid sender",
+          "is not a registered gateway user",
+          "mail from not owned by user",
+          "mailfrom domain is listed in spamhaus",
+          "null sender is not allowed",
+          "returned mail not accepted here",
+          "sending this from a different address or alias using the ",
+          "sender is spammer",
+          "sender not pre-approved",
+          "sender domain is empty",
+          "sender domain listed at ",
+          "sender verify failed",     # Exim callout
+          "server does not accept mail from",
+          "spam reporting address",   # SendGrid|a message to an address has previously been marked as Spam by the recipient.
+          "unroutable sender address",
+          "you are not allowed to post to this mailing list",
+          "your access to submit messages to this e-mail system has been rejected",
+          "your email address has been blacklisted",  # MessageLabs
+        ].freeze
+        Pairs = [
+          ["after end of data:", ".", " does not exist"],
+          ["after mail from:", ".", " does not exist"],
+          ["domain ", " is a dead domain"],
+          ["email address ", "is not "],
+          ["send", "blacklisted"],
+          ["sender", " rejected"],
+          ["sender is", " list"],
         ].freeze
 
         def text; return 'rejected'; end
@@ -83,9 +70,10 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return false if IsNot.any? { |a| argv1.include?(a) }
           return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 

data/lib/sisimai/reason/requireptr.rb

@@ -6,35 +6,23 @@ module Sisimai
     # SMTP connection.
     module RequirePTR
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'access denied. ip name lookup failed',
-          'all mail servers must have a ptr record with a valid reverse dns entry',
-          'bad dns ptr resource record',
-          'cannot find your hostname',
+          "cannot find your hostname",
           "cannot resolve your address.",
-          'client host rejected: cannot find your hostname',  # Yahoo!
-          'fix reverse dns for ',
-          'ips with missing ptr records',
-          'no ptr record found.',
-          'please get a custom reverse dns name from your isp for your host',
-          'ptr record setup',
-          'reverse dns failed',
-          'reverse dns required',
-          'sender ip reverse lookup rejected',
-          'the ip address sending this message does not have a ptr record setup', # Google
-          'the corresponding forward dns entry does not point to the sending ip', # Google
-          'this system will not accept messages from servers/devices with no reverse dns',
-          'unresolvable relay host name',
-          'we do not accept mail from hosts with dynamic ip or generic dns ptr-records',
+          "corresponding forward dns entry does not point to the sending ip", # Google
+          "ip name lookup failed",
+          "no matches to nameserver query",
+          "sender ip reverse lookup rejected",
+          "unresolvable relay host name",
         ].freeze
         Pairs = [
-          ['domain ',' mismatches client ip'],
-          ['dns lookup failure: ', ' try again later'],
-          ['reverse dns lookup for host ', ' failed permanently'],
-          ['server access ', ' forbidden by invalid rdns record of your mail server'],
-          ['service permits ', ' unverifyable sending ips'],
+          ["domain "," mismatches client ip"],
+          ["domain name verification on your ip address ", "failed"],
+          ["dns lookup failure: ", " try again later"],
+          ["ptr", "record"],
+          ["reverse", " dns"],
+          ["server access ", " forbidden by invalid rdns record of your mail server"],
+          ["service permits ", " unverifyable sending ips"],
         ].freeze
 
         def text; return 'requireptr'; end
@@ -44,7 +32,7 @@ module Sisimai
         # @param    [String] argv1  String to be matched with regular expressions
         # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return false unless argv1
+          return false if argv1.nil? || argv1.empty?
           return true  if Index.any? { |a| argv1.include?(a) }
           return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false