sisimai 5.5.0 → 5.6.0

data/lib/sisimai/reason/rejected.rb

@@ -14,68 +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',    # SonicWall
-          'batv validation failure',  # SonicWall
-          '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
-          'by non-member to a members-only list',
+          "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 email address used to send your message is not subscribed to this group',
-          '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
@@ -88,6 +73,7 @@ module Sisimai
           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

data/lib/sisimai/reason/securityerror.rb

@@ -17,28 +17,22 @@ module Sisimai
     #
     module SecurityError
       class << self
-        require 'sisimai/string'
-
         Index = [
-          'account not subscribed to ses',
-          'authentication credentials invalid',
-          'authentication failure',
-          'authentication required',
-          'authentication turned on in your email client',
-          'executable files are not allowed in compressed files',
-          'insecure mail relay',
-          'recipient address rejected: access denied',
-          "sorry, you don't authenticate or the domain isn't in my list of allowed rcpthosts",
-          'unauthenticated senders not allowed',
-          'verification failure',
-          'you are not authorized to send mail, authentication is required',
+          "account not subscribed to ses",
+          "authentication credentials invalid",
+          "authentication failure",
+          "authentication required",
+          "authentication turned on in your email client",
+          "unauthenticated senders not allowed",
+          "verification failure",
+          "you are not authorized to send mail, authentication is required",
+          "you don't authenticate or the domain isn't in my list of allowed rcpthosts",
         ].freeze
         Pairs = [
-          ['authentication failed; server ', ' said: '],  # Postfix
-          ['authentification invalide', '305'],
-          ['authentification requise', '402'],
-          ['domain ', ' is a dead domain'],
-          ['user ', ' is not authorized to perform ses:sendrawemail on resource'],
+          ["authentication failed; server ", " said: "], # Postfix
+          ["authentification invalide", "305"],
+          ["authentification requise", "402"],
+          ["user ", " is not authorized to perform ses:sendrawemail on resource"],
         ].freeze
 
         def text; return 'securityerror'; end

data/lib/sisimai/reason/spamdetected.rb

@@ -10,109 +10,59 @@ module Sisimai
     #    Last-Attempt-Date: Thu, 9 Apr 2008 23:34:45 +0900 (JST)
     module SpamDetected
       class << self
-        require 'sisimai/string'
-
         Index = [
-          ' - spam',
-          '//www.spamhaus.org/help/help_spam_16.htm',
-          '//dsbl.org/help/help_spam_16.htm',
-          '//mail.163.com/help/help_spam_16.htm',
-          '554 5.7.0 reject, id=',
-          'appears to be unsolicited',
-          'blacklisted url in message',
-          'block for spam',
-          'blocked by policy: no spam please',
-          'blocked by spamassassin',                      # rejected by SpamAssassin
-          'blocked for abuse. see http://att.net/blocks', # AT&T
-          'cannot be forwarded because it was detected as spam',
-          'considered unsolicited bulk e-mail (spam) by our mail filters',
-          'content filter rejection',
-          'cyberoam anti spam engine has identified this email as a bulk email',
-          'denied due to spam list',
-          'high probability of spam',
-          'is classified as spam and is rejected',
-          'listed in work.drbl.imedia.ru',
-          'the mail server detected your message as spam and has prevented delivery.',   # CPanel/Exim with SA rejections on
-          'mail appears to be unsolicited',   # rejected due to spam
-          'mail content denied',              # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000726
-          'may consider spam',
-          'message considered as spam or virus',
-          'message contains spam or virus',
-          'message content rejected',
-          'message detected as spam',
-          'message filtered',
-          'message filtered. please see the faqs section on spam',
-          'message filtered. refer to the troubleshooting page at ',
-          'message looks like spam',
-          'message is being rejected as it seems to be a spam',
-          'message refused by mailmarshal spamprofiler',
-          'message refused by trustwave seg spamprofiler',
-          'message rejected as spam',
-          'message rejected because of unacceptable content',
-          'message rejected due to suspected spam content',
-          'message rejected for policy reasons',
-          'message was rejected for possible spam/virus content',
-          'our email server thinks this email is spam',
-          'our system has detected that this message is ',
-          'probable spam',
-          'reject bulk.advertising',
-          'rejected: spamassassin score ',
-          'rejected - bulk email',
-          'rejecting banned content',
-          'rejecting mail content',
-          'related to content with spam-like characteristics',
-          'sender domain listed at ',
-          'sending address not accepted due to spam filter',
-          'spam blocked',
-          'spam check',
-          'spam content matched',
-          'spam detected',
-          'spam email',
-          'spam email not accepted',
-          'spam message rejected.',   # mail.ru
-          'spam not accepted',
-          'spam refused',
-          'spam rejection',
-          'spam score ',
-          'spambouncer identified spam',  # SpamBouncer identified SPAM
-          'spamming not allowed',
-          'too many spam complaints',
-          'too much spam.',               # Earthlink
-          'the email message was detected as spam',
-          'the message has been rejected by spam filtering engine',
-          'the message was rejected due to classification as bulk mail',
-          'the content of this message looked like spam', # SendGrid
-          'this message appears to be spam',
-          'this message has been identified as spam',
-          'this message has been scored as spam with a probability',
-          'this message was classified as spam',
-          'this message was rejected by recurrent pattern detection system',
-          'transaction failed spam message not queued',   # SendGrid
-          'we dont accept spam',
-          'your email appears similar to spam we have received before',
-          'your email breaches local uribl policy',
-          'your email had spam-like ',
-          'your email is considered spam',
-          'your email is probably spam',
-          'your email was detected as spam',
-          'your message as spam and has prevented delivery',
-          'your message has been temporarily blocked by our filter',
-          'your message has been rejected because it appears to be spam',
-          'your message has triggered a spam block',
-          'your message may contain the spam contents',
-          'your message failed several antispam checks',
+          "blacklisted url in message",
+          "block for spam",
+          "blocked by policy: no spam please",
+          "blocked by spamassassin", # rejected by SpamAssassin
+          "classified as spam and is rejected",
+          "content filter rejection",
+          "denied due to spam list",
+          "identified spam", # 554 SpamBouncer identified SPAM, message permanently rejected (#5.3.0)
+          "may consider spam",
+          "message content rejected",
+          "message has been temporarily blocked by our filter",
+          "message is being rejected as it seems to be a spam",
+          "message was rejected by recurrent pattern detection system",
+          "our email server thinks this email is spam",
+          "reject bulk.advertising",
+          "spam check",
+          "spam content ",
+          "spam detected",
+          "spam email",
+          "spam-like header",
+          "spam message",
+          "spam not accepted",
+          "spam refused",
+          "spamming not allowed",
+          "unsolicited ",
+          "your email breaches local uribl policy",
         ].freeze
         Pairs = [
-          ['greylisted', ' please try again in'],
-          ['mail score (', ' over '],
-          ['mail rejete. mail rejected. ', '506'],
-          ['our filters rate at and above ', ' percent probability of being spam'],
-          ['rejected by ', ' (spam)'],
-          ['rejected due to spam ', 'classification'],
-          ['rejected due to spam ', 'content'],
-          ['rule imposed as ', ' is blacklisted on'],
-          ['spam ', ' exceeded'],
-          ['this message scored ', ' spam points'],
+          ["accept", " spam"],
+          ["appears", " to ", "spam"],
+          ["bulk", "mail"],
+          ["considered", " spam"],
+          ["contain", " spam"],
+          ["detected", " spam"],
+          ["greylisted", " please try again in"],
+          ["mail score (", " over "],
+          ["mail rejete. mail rejected. ", "506"],
+          ["message ", "as spam"],
+          ["message ", "like spam"],
+          ["message ", "spamprofiler"],
+          ["probab", " spam"],
+          ["refused by", " spamprofiler"],
+          ["reject", " content"],
+          ["reject, id=", "spam"],
+          ["rejected by ", " (spam)"],
+          ["rejected due to spam ", "classification"],
+          ["rule imposed as ", " is blacklisted on"],
+          ["score", "spam"],
+          ["spam ", "block"],
+          ["spam ", "filter"],
+          ["spam ", " exceeded"],
+          ["spam ", "score"],
         ].freeze
 
         def text; return 'spamdetected'; end
@@ -141,7 +91,7 @@ module Sisimai
           # The value of "reason" isn't "spamdetected" when the value of "command" is an SMTP command
           # to be sent before the SMTP DATA command because all the MTAs read the headers and the
           # entire message body after the DATA command.
-          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['command'])
+          return false if Sisimai::SMTP::Command::ExceptDATA.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/suspend.rb

@@ -6,30 +6,31 @@ module Sisimai
     module Suspend
       class << self
         Index = [
-          ' is currently suspended',
-          ' temporary locked',
-          'archived recipient',
-          'boite du destinataire archivee',
-          'email account that you tried to reach is disabled',
-          'has been suspended',
-          'inactive account',
-          'invalid/inactive user',
-          'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
-          'is unavailable: user is terminated',
-          'mailbox currently suspended',
-          'mailbox disabled',
-          'mailbox is frozen',
-          'mailbox unavailable or access denied',
-          'recipient rejected: temporarily inactive',
-          'recipient suspend the service',
-          "the email account that you tried to reach is inactive",
-          'this account has been disabled or discontinued',
-          'this account has been temporarily suspended',
-          'this address no longer accepts mail',
-          'this mailbox is disabled',
-          'user or domain is disabled',
-          'user suspended',   # http://mail.163.com/help/help_spam_16.htm
-          'vdelivermail: account is locked email bounced',
+          " currently suspended",
+          " temporary locked",
+          "address no longer accepts mail",
+          "archived recipient",
+          "boite du destinataire archivee",
+          "email account that you tried to reach is inactive",
+          "inactive account",
+          "inactivity new mail is not currently being accepted for this mailbox",
+          "invalid/inactive user",
+          "is a deactivated mailbox", # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
+          "is unavailable: user is terminated",
+          "mailbox is frozen",
+          "mailbox is inactive",
+          "mailbox unavailable or access denied",
+          "recipient rejected: temporarily inactive",
+          "recipient suspend the service",
+          "user or domain is disabled",
+          "user suspended", # http://mail.163.com/help/help_spam_16.htm
+          "vdelivermail: account is locked email bounced",
+        ].freeze
+        Pairs = [
+          ["account ", "disabled"],
+          ["has been ", "suspended"],
+          ["mailbox ", "disabled"],
+          ["not ", "active"],
         ].freeze
 
         def text; return 'suspend'; end
@@ -41,6 +42,7 @@ module Sisimai
         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
 

data/lib/sisimai/reason/systemerror.rb

@@ -9,33 +9,29 @@ module Sisimai
     #   message has been in the queue too long.
     module SystemError
       class << self
-        require 'sisimai/string'
         Index = [
-          'aliasing/forwarding loop broken',
+          "aliasing/forwarding loop broken",
           "can't create user output file",
-          'could not load drd for domain',
-          'internal error reading data',  # Microsoft
-          'internal server error: operation now in progress', # Microsoft
-          'interrupted system call',
-          'it encountered an error while being processed',
-          'it would create a mail loop',
-          'local configuration error',
-          'local error in processing',
-          'loop was found in the mail exchanger',
-          'loops back to myself',
-          'mail system configuration error',
-          'queue file write error',
-          'recipient deferred because there is no mdb',
-          'remote server is misconfigured',
-          'server configuration error',
-          'service currently unavailable',
-          'system config error',
-          'temporary local problem',
-          'timeout waiting for input',
-          'transaction failed ',
+          "cannot send e-mail to yourself",
+          "could not load ",
+          "interrupted system call",
+          "it encountered an error while being processed",
+          "it would create a mail loop",
+          "loop was found in the mail exchanger",
+          "loops back to myself",
+          "queue file write error",
+          "recipient deferred because there is no mdb",
+          "remote server is misconfigured",
+          "service currently unavailable",
+          "temporary local problem",
+          "timeout waiting for input",
+          "transaction failed ",
         ].freeze
         Pairs = [
-          ['unable to connect ', 'daemon'],
+          ["config", " error"],
+          ["internal ", "error"],
+          ["local ", "error"],
+          ["unable to connect ", "daemon"],
         ].freeze
 
         def text; return 'systemerror'; end

data/lib/sisimai/reason/systemfull.rb

@@ -9,8 +9,8 @@ module Sisimai
     module SystemFull
       class << self
         Index = [
+          'exceeded storage allocation',   # MS Exchange
           'mail system full',
-          'requested mail action aborted: exceeded storage allocation',   # MS Exchange
         ].freeze
 
         def text; return 'systemfull'; end