sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/reason/networkerror.rb

@@ -13,6 +13,24 @@ module Sisimai
     module NetworkError
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NetworkError.pm
       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 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',
+        ]
+
         def text; return 'networkerror'; end
         def description; return 'SMTP connection failed due to DNS look up failure or other network problems'; end
 
@@ -22,25 +40,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          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 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',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/norelaying.rb

@@ -13,6 +13,21 @@ module Sisimai
     module NoRelaying
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NoRelaying.pm
       class << self
+        Index = [
+          'as a relay',
+          'insecure mail relay',
+          'mail server requires authentication when attempting to send to a non-local e-mail address',    # MailEnable 
+          'not allowed to relay through this machine',
+          'not an open relay, so get lost',
+          'relay access denied',
+          'relay denied',
+          'relay not permitted',
+          'relaying denied',  # Sendmail
+          "that domain isn't in my list of allowed rcpthost",
+          'this system is not configured to relay mail',
+          'unable to relay for',
+        ]
+
         def text; return 'norelaying'; end
         def description; return 'Email rejected with error message "Relaying Denied"'; end
 
@@ -22,22 +37,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'as a relay',
-            'insecure mail relay',
-            'mail server requires authentication when attempting to send to a non-local e-mail address',    # MailEnable 
-            'not allowed to relay through this machine',
-            'not an open relay, so get lost',
-            'relay access denied',
-            'relay denied',
-            'relay not permitted',
-            'relaying denied',  # Sendmail
-            "that domain isn't in my list of allowed rcpthost",
-            'this system is not configured to relay mail',
-            'unable to relay for',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -11,6 +11,14 @@ module Sisimai
     module NotAccept
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NotAccept.pm
       class << self
+        # Destination mail server does not accept any message
+        Index = [
+          'host/domain does not accept mail', # iCloud
+          'name server: .: host not found',   # Sendmail
+          'no mx record found for domain=',   # Oath(Yahoo!)
+          'smtp protocol returned a permanent error',
+        ]
+
         def text; return 'notaccept'; end
         def description; return 'Delivery failed due to a destination mail server does not accept any email'; end
 
@@ -20,16 +28,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-
-          # Destination mail server does not accept any message
-          index = [
-            'host/domain does not accept mail', # iCloud
-            'name server: .: host not found',   # Sendmail
-            'no mx record found for domain=',   # Oath(Yahoo!)
-            'smtp protocol returned a permanent error',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/onhold.rb

@@ -27,7 +27,7 @@ module Sisimai
         def true(argvs)
           return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'onhold'
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'onhold'
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'onhold'
           return false
         end
       end

data/lib/sisimai/reason/policyviolation.rb

@@ -16,6 +16,26 @@ module Sisimai
     module PolicyViolation
       # Imported from p5-Sisimail/lib/Sisimai/Reason/PolicyViolation.pm
       class << self
+        Index = [
+          'because the recipient is not accepting mail with ',    # AOL Phoenix
+          'closed mailing list',
+          'denied by policy',
+          'email not accepted for policy reasons',
+          # 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 given low priority',
+          'message not accepted for policy reasons',
+          'messages with multiple addresses',
+          'rejected for policy reasons',
+          'protocol violation',
+          'the email address used to send your message is not subscribed to this group',
+          'you have exceeded the allowable number of posts without solving a captcha',
+          'you have exceeded the the allowable number of posts without solving a captcha',
+        ]
+
         def text; return 'policyviolation'; end
         def description; return 'Email rejected due to policy violation on a destination host'; end
 
@@ -26,26 +46,7 @@ module Sisimai
         # @since 4.22.0
         def match(argv1)
           return nil unless argv1
-          index = [
-            'because the recipient is not accepting mail with ',    # AOL Phoenix
-            'closed mailing list',
-            'denied by policy',
-            'email not accepted for policy reasons',
-            # 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',
-            'message given low priority',
-            'message not accepted for policy reasons',
-            'messages with multiple addresses',
-            'rejected for policy reasons',
-            'protocol violation',
-            'the email address used to send your message is not subscribed to this group',
-            'you have exceeded the allowable number of posts without solving a captcha',
-            'you have exceeded the the allowable number of posts without solving a captcha',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/rejected.rb

@@ -15,6 +15,52 @@ module Sisimai
     module Rejected
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Rejected.pm
       class << self
+        IsNot = [
+          '5.1.0 address rejected',
+          'recipient address rejected',
+          'sender ip address rejected',
+        ]
+        Index = [
+          '<> invalid sender',
+          'access denied (in reply to mail from command)',
+          'address rejected',
+          'administrative prohibition',
+          'batv failed to verify',    # SoniWall
+          'batv validation failure',  # SoniWall
+          'backscatter protection detected an invalid or expired email address',  # MDaemon
+          'bogus mail from',          # IMail - block empty sender
+          'connections not accepted from servers without a valid sender domain',
+          'denied [bouncedeny]',      # McAfee
+          'delivery not authorized, message refused',
+          'does not exist e2110',
+          'domain of sender address ',
+          'emetteur invalide',
+          'empty envelope senders not allowed',
+          '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:',
+          'mail from not owned by user',
+          'message rejected: email address is not verified',
+          'mx records for ',
+          'null sender is not allowed',
+          'recipient not accepted. (batv: no tag',
+          'returned mail not accepted here',
+          'rfc 1035 violation: recursive cname records for',
+          'rule imposed mailbox access for',  # MailMarshal
+          'sender email address rejected',
+          'sender is spammer',
+          'sender not pre-approved',
+          'sender rejected',
+          'sender domain is empty',
+          'sender verify failed', # Exim callout
+          'syntax error: empty email address',
+          'the message has been rejected by batv defense',
+          'transaction failed unsigned dsn for',
+          'unroutable sender address',
+          'you are sending to/from an address that has been blacklisted',
+        ]
+
         def text; return 'rejected'; end
         def description; return "Email rejected due to a sender's email address (envelope from)"; end
 
@@ -24,53 +70,8 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          isnot = [
-            '5.1.0 address rejected',
-            'recipient address rejected',
-            'sender ip address rejected',
-          ]
-          index = [
-            '<> invalid sender',
-            'address rejected',
-            'administrative prohibition',
-            'batv failed to verify',    # SoniWall
-            'batv validation failure',  # SoniWall
-            'backscatter protection detected an invalid or expired email address',  # MDaemon
-            'bogus mail from',          # IMail - block empty sender
-            'connections not accepted from servers without a valid sender domain',
-            'denied [bouncedeny]',      # McAfee
-            'delivery not authorized, message refused',
-            'does not exist e2110',
-            'domain of sender address ',
-            'emetteur invalide',
-            'empty envelope senders not allowed',
-            '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:',
-            'mail from not owned by user',
-            'message rejected: email address is not verified',
-            'mx records for ',
-            'null sender is not allowed',
-            'recipient not accepted. (batv: no tag',
-            'returned mail not accepted here',
-            'rfc 1035 violation: recursive cname records for',
-            'rule imposed mailbox access for',  # MailMarshal
-            'sender email address rejected',
-            'sender is spammer',
-            'sender not pre-approved',
-            'sender rejected',
-            'sender domain is empty',
-            'sender verify failed', # Exim callout
-            'syntax error: empty email address',
-            'the message has been rejected by batv defense',
-            'transaction failed unsigned dsn for',
-            'unroutable sender address',
-            'you are sending to/from an address that has been blacklisted',
-          ]
-
-          return false if isnot.any? { |a| argv1.include?(a) }
-          return true  if index.any? { |a| argv1.include?(a) }
+          return false if IsNot.any? { |a| argv1.include?(a) }
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -80,19 +81,18 @@ module Sisimai
         #                                   false: is not rejected by the sender
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
-          tempreason = 'undefined' if tempreason.empty?
-          diagnostic = argvs.diagnosticcode.downcase
-
           return true if argvs.reason == 'rejected'
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || 'undefined'
           return true if tempreason == 'rejected' # Delivery status code points "rejected".
 
           # Check the value of Diagnosic-Code: header with patterns
-          if argvs.smtpcommand == 'MAIL'
+          diagnostic = argvs.diagnosticcode.downcase
+          commandtxt = argvs.smtpcommand
+          if commandtxt == 'MAIL'
             # The session was rejected at 'MAIL FROM' command
             return true if match(diagnostic)
 
-          elsif argvs.smtpcommand == 'DATA'
+          elsif commandtxt == 'DATA'
             # The session was rejected at 'DATA' command
             if tempreason != 'userunknown'
               # Except "userunknown"

data/lib/sisimai/reason/securityerror.rb

@@ -19,6 +19,34 @@ module Sisimai
     module SecurityError
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SecurityError.pm
       class << self
+        Regex = %r{(?>
+           account[ ]not[ ]subscribed[ ]to[ ]ses
+          |authentification[ ]requise.+[a-z]{3}.+402
+          |authentication[ ](?:
+             credentials invalid
+            |failure
+            |failed;[ ]server[ ].+[ ]said:  # Postfix
+            |required
+            |turned[ ]on[ ]in[ ]your[ ]email[ ]client
+            )
+          |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]mode:[ ].+[)]
+          |codes?[ ]d'?[ ]*authentification[ ]invalide.+[a-z]{3}.+305
+          |domain[ ].+[ ]is[ ]a[ ]dead[ ]domain
+          |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
+          |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
+          |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
+          |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
+          |unauthenticated[ ]senders[ ]not[ ]allowed
+          |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
+          |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
+          |verification[ ]failure
+          )
+        }x
+
         def text; return 'securityerror'; end
         def description; return 'Email rejected due to security violation was detected on a destination host'; end
 
@@ -28,35 +56,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             account[ ]not[ ]subscribed[ ]to[ ]ses
-            |authentification[ ]requise.+[a-z]{3}.+402
-            |authentication[ ](?:
-               credentials invalid
-              |failure
-              |failed;[ ]server[ ].+[ ]said:  # Postfix
-              |required
-              |turned[ ]on[ ]in[ ]your[ ]email[ ]client
-              )
-            |\d+[ ]denied[ ]\[[a-z]+\][ ].+[(]mode:[ ].+[)]
-            |codes?[ ]d'?[ ]*authentification[ ]invalide.+[a-z]{3}.+305
-            |domain[ ].+[ ]is[ ]a[ ]dead[ ]domain
-            |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
-            |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
-            |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
-            |tls[ ]required[ ]but[ ]not[ ]supported # SendGrid:the recipient mailserver does not support TLS or have a valid certificate
-            |unauthenticated[ ]senders[ ]not[ ]allowed
-            |user[ ].+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
-            |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
-            |verification[ ]failure
-            )
-          }x
-
-          return true if argv1 =~ regex
+          return true if argv1 =~ Regex
           return false
         end
 

data/lib/sisimai/reason/spamdetected.rb

@@ -16,141 +16,141 @@ module Sisimai
     module SpamDetected
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SpamDetected.pm
       class << self
-        def text; return 'spamdetected'; end
-        def description; return 'Email rejected by spam filter running on 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   [True,False]    false: Did not match
-        #                           true: Matched
-        def match(argv1)
-          return nil unless argv1
-          regex = %r{(?>
-             ["]the[ ]mail[ ]server[ ]detected[ ]your[ ]message[ ]as[ ]spam[ ]and[ ]
-                has[ ]prevented[ ]delivery[.]["]    # CPanel/Exim with SA rejections on
-            |(?:\d[.]\d[.]\d|\d{3})[ ]spam\z
-            |appears[ ]to[ ]be[ ]unsolicited
-            |blacklisted[ ]url[ ]in[ ]message
-            |block[ ]for[ ]spam
-            |blocked[ ]by[ ](?:
-               policy:[ ]no[ ]spam[ ]please
-              |spamassassin                   # rejected by SpamAssassin
-              )
-            |blocked[ ]for[ ]abuse[.][ ]see[ ]http://att[.]net/blocks   # AT&T
-            |bulk[ ]email
-            |content[ ]filter[ ]rejection
-            |cyberoam[ ]anti[ ]spam[ ]engine[ ]has[ ]identified[ ]this[ ]email[ ]as[ ]a[ ]bulk[ ]email
-            |denied[ ]due[ ]to[ ]spam[ ]list
-            |dt:spm[ ]mx.+[ ]http://mail[.]163[.]com/help/help_spam_16[.]htm
-            |greylisted.?.[ ]please[ ]try[ ]again[ ]in
-            |http://(?:www[.]spamhaus[.]org|dsbl[.]org)
-            |listed[ ]in[ ]work[.]drbl[.]imedia[.]ru
-            |mail[ ](?:
-               appears[ ]to[ ]be[ ]unsolicited    # rejected due to spam
-              |content[ ]denied   # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000726
-              |rejete.+[a-z]{3}.+506
-              )
-            |may[ ]consider[ ]spam
-            |message[ ](?:
-               considered[ ]as[ ]spam[ ]or[ ]virus
-              |content[ ]rejected
-              |filtered
-              |filtered[.][ ](?:
-                 please[ ]see[ ]the[ ]faqs[ ]section[ ]on[ ]spam
-                |refer[ ]to[ ]the[ ]troubleshooting[ ]page[ ]at[ ]
-                )
-              |looks[ ]like[ ]spam
-              |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]see[ ]http:   # Yahoo!
-              |refused[ ]by[ ]mailmarshal[ ]spamprofiler
-              |rejected[ ](?:
-                 as[ ]spam
-                |because[ ]of[ ]unacceptable[ ]content
-                |due[ ]to[ ]suspected[ ]spam[ ]content
-                |for[ ]policy[ ]reasons
-                )
-              )
-            |our[ ](?:
-               email[ ]server[ ]thinks[ ]this[ ]email[ ]is[ ]spam
-              |filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
-              |system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
-              )
-            |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
-            |probable[ ]spam
-            |reject[ ]bulk[.]advertising
-            |reject,.+[ ][-][ ]spam[.][ ]
-            |rejected(?:
-               :[ ]spamassassin[ ]score[ ]
-              |[ ]by[ ].+[ ][(]spam[)]
-              |[ ]due[ ]to[ ]spam[ ](?:classification|content)
+        Regex = %r{(?>
+           ["]the[ ]mail[ ]server[ ]detected[ ]your[ ]message[ ]as[ ]spam[ ]and[ ]
+              has[ ]prevented[ ]delivery[.]["]    # CPanel/Exim with SA rejections on
+          |(?:\d[.]\d[.]\d|\d{3})[ ]spam\z
+          |appears[ ]to[ ]be[ ]unsolicited
+          |blacklisted[ ]url[ ]in[ ]message
+          |block[ ]for[ ]spam
+          |blocked[ ]by[ ](?:
+             policy:[ ]no[ ]spam[ ]please
+            |spamassassin                   # rejected by SpamAssassin
+            )
+          |blocked[ ]for[ ]abuse[.][ ]see[ ]http://att[.]net/blocks   # AT&T
+          |bulk[ ]email
+          |content[ ]filter[ ]rejection
+          |cyberoam[ ]anti[ ]spam[ ]engine[ ]has[ ]identified[ ]this[ ]email[ ]as[ ]a[ ]bulk[ ]email
+          |denied[ ]due[ ]to[ ]spam[ ]list
+          |dt:spm[ ]mx.+[ ]http://mail[.]163[.]com/help/help_spam_16[.]htm
+          |greylisted.?.[ ]please[ ]try[ ]again[ ]in
+          |http://(?:www[.]spamhaus[.]org|dsbl[.]org)
+          |listed[ ]in[ ]work[.]drbl[.]imedia[.]ru
+          |mail[ ](?:
+             appears[ ]to[ ]be[ ]unsolicited    # rejected due to spam
+            |content[ ]denied   # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000726
+            |rejete.+[a-z]{3}.+506
+            )
+          |may[ ]consider[ ]spam
+          |message[ ](?:
+             considered[ ]as[ ]spam[ ]or[ ]virus
+            |content[ ]rejected
+            |filtered
+            |filtered[.][ ](?:
+               please[ ]see[ ]the[ ]faqs[ ]section[ ]on[ ]spam
+              |refer[ ]to[ ]the[ ]troubleshooting[ ]page[ ]at[ ]
               )
-            |rejecting[ ]banned[ ]content
-            |related[ ]to[ ]content[ ]with[ ]spam[-]like[ ]characteristics
-            |rule[ ]imposed[ ]as[ ].+is[ ]blacklisted[ ]on              # Mailmarshal RBLs
-            |sender[ ]domain[ ]listed[ ]at[ ].+
-            |sending[ ]address[ ]not[ ]accepted[ ]due[ ]to[ ]spam[ ]filter
-            |spam[ ](?:
-               .+[ ]exceeded
-              |blocked
-              |check
-              |content[ ]matched
-              |detected
-              |email
-              |email[ ]not[ ]accepted
-              |message[ ]rejected[.]       # mail.ru
-              |not[ ]accepted
-              |refused
-              |rejection
-              |reporting[ ]address    # SendGrid: a message to an address has previously been marked as Spam by the recipient.
-              |score[ ]
+            |looks[ ]like[ ]spam
+            |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]see[ ]http:   # Yahoo!
+            |refused[ ]by[ ]mailmarshal[ ]spamprofiler
+            |rejected[ ](?:
+               as[ ]spam
+              |because[ ]of[ ]unacceptable[ ]content
+              |due[ ]to[ ]suspected[ ]spam[ ]content
+              |for[ ]policy[ ]reasons
               )
-            |spambouncer[ ]identified[ ]spam    # SpamBouncer identified SPAM
-            |spamming[ ]not[ ]allowed
-            |too[ ]much[ ]spam[.]               # Earthlink
-            |the[ ]message[ ](?:
-               has[ ]been[ ]rejected[ ]by[ ]spam[ ]filtering[ ]engine
-              |was[ ]rejected[ ]due[ ]to[ ]classification[ ]as[ ]bulk[ ]mail
+            )
+          |our[ ](?:
+             email[ ]server[ ]thinks[ ]this[ ]email[ ]is[ ]spam
+            |filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
+            |system[ ]has[ ]detected[ ]that[ ]this[ ]message[ ]is
+            )
+          |permanent[ ]failure[ ]for[ ]one[ ]or[ ]more[ ]recipients[ ][(].+:blocked[)]
+          |probable[ ]spam
+          |reject[ ]bulk[.]advertising
+          |reject,.+[ ][-][ ]spam[.][ ]
+          |rejected(?:
+             :[ ]spamassassin[ ]score[ ]
+            |[ ]by[ ].+[ ][(]spam[)]
+            |[ ]due[ ]to[ ]spam[ ](?:classification|content)
+            )
+          |rejecting[ ]banned[ ]content
+          |related[ ]to[ ]content[ ]with[ ]spam[-]like[ ]characteristics
+          |rule[ ]imposed[ ]as[ ].+is[ ]blacklisted[ ]on              # Mailmarshal RBLs
+          |sender[ ]domain[ ]listed[ ]at[ ].+
+          |sending[ ]address[ ]not[ ]accepted[ ]due[ ]to[ ]spam[ ]filter
+          |spam[ ](?:
+             .+[ ]exceeded
+            |blocked
+            |check
+            |content[ ]matched
+            |detected
+            |email
+            |email[ ]not[ ]accepted
+            |message[ ]rejected[.]       # mail.ru
+            |not[ ]accepted
+            |refused
+            |rejection
+            |reporting[ ]address    # SendGrid: a message to an address has previously been marked as Spam by the recipient.
+            |score[ ]
+            )
+          |spambouncer[ ]identified[ ]spam    # SpamBouncer identified SPAM
+          |spamming[ ]not[ ]allowed
+          |too[ ]much[ ]spam[.]               # Earthlink
+          |the[ ]message[ ](?:
+             has[ ]been[ ]rejected[ ]by[ ]spam[ ]filtering[ ]engine
+            |was[ ]rejected[ ]due[ ]to[ ]classification[ ]as[ ]bulk[ ]mail
+            )
+          |the[ ]content[ ]of[ ]this[ ]message[ ]looked[ ]like[ ]spam # SendGrid
+          |this[ ](?:e-mail|mail)[ ](?:
+             cannot[ ]be[ ]forwarded[ ]because[ ]it[ ]was[ ]detected[ ]as[ ]spam
+            |is[ ]classified[ ]as[ ]spam[ ]and[ ]is[ ]rejected
+            )
+          |this[ ]message[ ](?:
+             appears[ ]to[ ]be[ ]spam
+            |has[ ]been[ ](?:
+               identified[ ]as[ ]spam
+              |scored[ ]as[ ]spam[ ]with[ ]a[ ]probability
               )
-            |the[ ]content[ ]of[ ]this[ ]message[ ]looked[ ]like[ ]spam # SendGrid
-            |this[ ](?:e-mail|mail)[ ](?:
-               cannot[ ]be[ ]forwarded[ ]because[ ]it[ ]was[ ]detected[ ]as[ ]spam
-              |is[ ]classified[ ]as[ ]spam[ ]and[ ]is[ ]rejected
+            |scored[ ].+[ ]spam[ ]points
+            |was[ ]classified[ ]as[ ]spam
+            |was[ ]rejected[ ]by[ ]recurrent[ ]pattern[ ]detection[ ]system
+            )
+          |transaction[ ]failed[ ]spam[ ]message[ ]not[ ]queued       # SendGrid
+          |we[ ]dont[ ]accept[ ]spam
+          |you're[ ]using[ ]a[ ]mass[ ]mailer
+          |your[ ](?:
+             email[ ](?:
+               appears[ ]similar[ ]to[ ]spam[ ]we[ ]have[ ]received[ ]before
+              |breaches[ ]local[ ]uribl[ ]policy
+              |had[ ]spam[-]like[ ]
+              |is[ ](?:considered|probably)[ ]spam
+              |was[ ]detected[ ]as[ ]spam
               )
-            |this[ ]message[ ](?:
-               appears[ ]to[ ]be[ ]spam
+            |message[ ](?:
+               as[ ]spam[ ]and[ ]has[ ]prevented[ ]delivery
               |has[ ]been[ ](?:
-                 identified[ ]as[ ]spam
-                |scored[ ]as[ ]spam[ ]with[ ]a[ ]probability
-                )
-              |scored[ ].+[ ]spam[ ]points
-              |was[ ]classified[ ]as[ ]spam
-              |was[ ]rejected[ ]by[ ]recurrent[ ]pattern[ ]detection[ ]system
-              )
-            |transaction[ ]failed[ ]spam[ ]message[ ]not[ ]queued       # SendGrid
-            |we[ ]dont[ ]accept[ ]spam
-            |you're[ ]using[ ]a[ ]mass[ ]mailer
-            |your[ ](?:
-               email[ ](?:
-                 appears[ ]similar[ ]to[ ]spam[ ]we[ ]have[ ]received[ ]before
-                |breaches[ ]local[ ]uribl[ ]policy
-                |had[ ]spam[-]like[ ]
-                |is[ ](?:considered|probably)[ ]spam
-                |was[ ]detected[ ]as[ ]spam
-                )
-              |message[ ](?:
-                 as[ ]spam[ ]and[ ]has[ ]prevented[ ]delivery
-                |has[ ]been[ ](?:
-                   temporarily[ ]blocked[ ]by[ ]our[ ]filter
-                  |rejected[ ]because[ ]it[ ]appears[ ]to[ ]be[ ]spam
-                  )
-                |has[ ]triggered[ ]a[ ]spam[ ]block
-                |may[ ]contain[ ]the[ ]spam[ ]contents
-                |failed[ ]several[ ]antispam[ ]checks
+                 temporarily[ ]blocked[ ]by[ ]our[ ]filter
+                |rejected[ ]because[ ]it[ ]appears[ ]to[ ]be[ ]spam
                 )
+              |has[ ]triggered[ ]a[ ]spam[ ]block
+              |may[ ]contain[ ]the[ ]spam[ ]contents
+              |failed[ ]several[ ]antispam[ ]checks
               )
             )
-          }x
+          )
+        }x
 
-          return true if argv1 =~ regex
+        def text; return 'spamdetected'; end
+        def description; return 'Email rejected by spam filter running on 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   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          return true if argv1 =~ Regex
           return false
         end
 
@@ -162,7 +162,7 @@ module Sisimai
         def true(argvs)
           return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'spamdetected'
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'spamdetected'
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'spamdetected'
           return true if match(argvs.diagnosticcode.downcase)
           return false
         end