sisimai 5.4.1-java → 5.6.0-java

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
@@ -48,7 +42,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

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
@@ -122,7 +72,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
@@ -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,29 +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',
-          '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
@@ -38,8 +40,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/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
@@ -45,7 +41,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

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
@@ -20,7 +20,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/userunknown.rb

@@ -14,8 +14,6 @@ module Sisimai
     #   RCPT TO command)
     module UserUnknown
       class << self
-        require 'sisimai/string'
-
         PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected NotAccept]
         ModulePath = {
           'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
@@ -26,118 +24,87 @@ module Sisimai
           'Sisimai::Reason::NotAccept'   => 'sisimai/reason/notaccept',
         }
         Index = [
-          '#5.1.1 bad address',
-          '550 address invalid',
-          '5.1.0 address rejected.',
-          'address does not exist',
-          'address not present in directory',
-          'address unknown',
+          "#5.1.1 bad address",
+          "550 address invalid",
+          "5.1.0 address rejected.",
+          "address not present in directory",
+          "address unknown",
+          "badrcptto",
           "can't accept user",
-          'does not exist.',
-          'destination addresses were unknown',
-          'destination server rejected recipients',
-          'email address does not exist',
-          'email address could not be found',
-          'invalid address',
-          'invalid mailbox',
-          'invalid mailbox path',
-          'invalid recipient',
-          'is not a known user',
-          'is not a valid mailbox',
-          'is not an active address at this host',
-          'mailbox does not exist',
-          'mailbox invalid',
-          'mailbox is inactive',
-          'mailbox is unavailable',
-          'mailbox not present',
-          'mailbox not found',
-          'mailbox unavaiable',
-          'nessun utente simile in questo indirizzo',
-          'no account by that name here',
-          'no existe dicha persona',
-          'no existe ese usuario ',
-          'no mail box available for this user',
-          'no mailbox by that name is currently available',
-          'no mailbox found',
-          'no such address here',
-          'no such mailbox',
-          'no such person at this address',
-          'no such recipient',
-          'no such user',
-          'no thank you rejected: account unavailable',
-          'no valid recipients, bye',
-          'not a valid recipient',
-          'not a valid user here',
-          'not a local address',
-          'not email addresses',
-          'recipient address rejected. (in reply to rcpt to command)',
-          'recipient address rejected: access denied',
-          'recipient address rejected: invalid user',
-          'recipient address rejected: invalid-recipient',
-          'recipient address rejected: unknown user',
-          'recipient address rejected: userunknown',
-          'recipient does not exist',
-          'recipient is not accepted',
-          'recipient is not local',
-          'recipient not exist',
-          'recipient not found',
-          'recipient not ok',
-          'recipient refuses to accept your mail',
-          'recipient unknown',
-          'requested action not taken: mailbox unavailable',
-          'resolver.adr.recipient notfound',
-          'sorry, user unknown',
-          'sorry, badrcptto',
-          'sorry, no mailbox here by that name',
-          'sorry, your envelope recipient has been denied',
-          "that domain or user isn't in my list of allowed rcpthosts",
-          'the email account that you tried to reach does not exist',
-          'the following recipients was undeliverable',
-          "the user's email name is not found",
-          'there is no one at this address',
-          'this address no longer accepts mail',
-          'this email address is wrong or no longer valid',
-          'this recipient is in my badrecipientto list',
-          'this recipient is not in my validrcptto list',
-          'this spectator does not exist',
-          'unknown mailbox',
-          'unknown recipient',
-          'unknown user',
-          'user does not exist',
-          'user missing home directory',
-          'user not active',
-          'user not exist',
-          'user not found',
-          'user not known',
-          'user unknown',
-          'utilisateur inconnu !',
-          'vdeliver: invalid or unknown virtual user',
-          'your envelope recipient is in my badrcptto list',
+          "destination addresses were unknown",
+          "destination server rejected recipients",
+          "domain or user isn't in my list of allowed rcpthosts",
+          "email account that you tried to reach does not exist",
+          "email address could not be found",
+          "invalid address",
+          "invalid mailbox",
+          "is not a known user",
+          "is not a valid mailbox",
+          "mailbox does not exist",
+          "mailbox invalid",
+          "mailbox not present",
+          "mailbox not found",
+          "nessun utente simile in questo indirizzo",
+          "no account by that name here",
+          "no existe dicha persona",
+          "no existe ese usuario ",
+          "no such recipient",
+          "no such user",
+          "no thank you rejected: account unavailable",
+          "no valid recipients, bye",
+          "not a valid recipient",
+          "not a valid user here",
+          "not a local address",
+          "not email addresses",
+          "recipient address rejected. (in reply to rcpt to command)",
+          "recipient address rejected: access denied",
+          "recipient address rejected: userunknown",
+          "recipient is in my badrecipientto list",
+          "recipient is not accepted",
+          "recipient is not in my validrcptto list",
+          "recipient is not local",
+          "recipient not ok",
+          "recipient refuses to accept your mail",
+          "recipient unknown",
+          "recipients was undeliverable",
+          "spectator does not exist",
+          "there is no one at this address",
+          "unknown mailbox",
+          "unknown recipient",
+          "unknown user",
+          "user missing home directory",
+          "user not known",
+          "user unknown",
+          "utilisateur inconnu !",
+          "weil die adresse nicht gefunden wurde oder keine e-mails empfangen kann",
+          "your envelope recipient has been denied",
         ].freeze
         Pairs = [
-          ['<', '> not found'],
-          ['<', '>... blocked by '],
-          ['account ', ' does not exist at the organization'],
-          ['adresse d au moins un destinataire invalide. invalid recipient.', '416'],
-          ['adresse d au moins un destinataire invalide. invalid recipient.', '418'],
-          ['bad', 'recipient'],
-          ['mailbox ', 'does not exist'],
-          ['mailbox ', 'unavailable or access denied'],
-          ['no ', ' in name directory'],
-          ['non', 'existent user'],
-          ['rcpt <', ' does not exist'],
-          ['rcpt (', 't exist '],
-          ['recipient ', ' was not found in'],
-          ['recipient address rejected: user ', '  does not exist'],
-          ['recipient address rejected: user unknown in ', '  table'],
-          ['said: 550-5.1.1 ', ' user unknown '],
-          ['said: 550 5.1.1 ', ' user unknown '],
+          ["<", "> not found"],
+          ["<", ">... blocked by "],
+          ["account ", " does not exist at the organization"],
+          ["address", " no longer"],
+          ["address", " not exist"],
+          ["bad", "recipient"],
+          ["invalid", "recipient"],
+          ["invalid", "user"],
+          ["mailbox ", "does not exist"],
+          ["mailbox ", "unavailable"],
+          ["no ", " in name directory"],
+          ["no ", "mail", "box "],
+          ["no ", "such", "address"],
+          ["non", "existent user"],
+          ["rcpt <", " does not exist"],
+          ["rcpt (", "t exist "],
+          ["recipient no", "found"],
+          ["recipient ", " not exist"],
+          ["recipient ", " was not found in"],
           ["this user doesn't have a ", " account"],
-          ['unknown e', 'mail address'],
-          ['unknown local', 'part'],
-          ['user ', ' was not found'],
-          ['user ', ' does not exist'],
-          ['user (', ') unknown'],
+          ["unknown e", "mail address"],
+          ["unknown local", "part"],
+          ["user ", " not exist"],
+          ["user ", "not found"],
+          ["user (", ") unknown"],
         ].freeze
 
         def text; return 'userunknown'; end
@@ -147,7 +114,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
@@ -159,7 +126,8 @@ module Sisimai
         #                                   false: is not unknown user.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'userunknown'
+          return true  if argvs['reason'] == 'userunknown'
+          return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
 
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
           return false if tempreason == 'suspend'
@@ -183,12 +151,12 @@ module Sisimai
                 next
               end
 
-              next unless r.match(issuedcode)
+              next if r.match(issuedcode) == false
               # Match with reason defined in Sisimai::Reason::* except UserUnknown.
               matchother = true
               break
             end
-            return true unless matchother # Did not match with other message patterns
+            return true if matchother == false  # Did not match with other message patterns
 
           elsif argvs['command'] == 'RCPT'
             # When the SMTP command is not "RCPT", the session rejected by other

data/lib/sisimai/reason/vacation.rb

@@ -18,7 +18,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