sisimai 4.24.1-java → 4.25.0-java

data/lib/sisimai/reason/contenterror.rb

@@ -10,6 +10,16 @@ module Sisimai
     module ContentError
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ContentError.pm
       class << self
+        Index = [
+          'improper use of 8-bit data in message header',
+          'message header size, or recipient list, exceeds policy limit',
+          'message mime complexity exceeds the policy maximum',
+          'routing loop detected -- too many received: headers',
+          'this message contain invalid mime headers',
+          'this message contain improperly-formatted binary content',
+          'this message contain text that uses unnecessary base64 encoding',
+        ]
+
         def text; return 'contenterror'; end
         def description; return 'Email rejected due to a header format of the email'; end
 
@@ -19,16 +29,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'improper use of 8-bit data in message header',
-            'message header size, or recipient list, exceeds policy limit',
-            'message mime complexity exceeds the policy maximum',
-            'routing loop detected -- too many received: headers',
-            'this message contain invalid mime headers',
-            'this message contain improperly-formatted binary content',
-            'this message contain text that uses unnecessary base64 encoding',
-          ]
-          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/exceedlimit.rb

@@ -9,6 +9,8 @@ module Sisimai
     module ExceedLimit
       # Imported from p5-Sisimail/lib/Sisimai/Reason/ExceedLimit.pm
       class << self
+        Index = ['message too large']
+
         def text; return 'exceedlimit'; end
         def description; return 'Email rejected due to an email exceeded the limit'; end
 
@@ -18,9 +20,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = ['message too large']
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -36,7 +36,7 @@ module Sisimai
           # Delivery status code points exceedlimit.
           # Status: 5.2.3
           # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'exceedlimit'
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'exceedlimit'
 
           # Check the value of Diagnosic-Code: header with patterns
           return true if match(argvs.diagnosticcode.downcase)

data/lib/sisimai/reason/expired.rb

@@ -9,6 +9,25 @@ module Sisimai
     module Expired
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Expired.pm
       class << self
+        Index = [
+          'connection timed out',
+          'could not find a gateway for',
+          'delivery time expired',
+          'failed to deliver to domain ',
+          'giving up on',
+          'has been delayed',
+          'it has not been collected after',
+          'message expired after sitting in queue for',
+          'message expired, connection refulsed',
+          'message timed out',
+          'retry time not reached for any host after a long failure period',
+          'server did not respond',
+          'this message has been in the queue too long',
+          'unable to deliver message after multiple retries',
+          'was not reachable within the allowed queue period',
+          'your message could not be delivered for more than',
+        ]
+
         def text; return 'expired'; end
         def description; return 'Delivery time has expired due to a connection failure'; end
 
@@ -18,26 +37,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'connection timed out',
-            'could not find a gateway for',
-            'delivery time expired',
-            'failed to deliver to domain ',
-            'giving up on',
-            'has been delayed',
-            'it has not been collected after',
-            'message expired after sitting in queue for',
-            'message expired, connection refulsed',
-            'message timed out',
-            'retry time not reached for any host after a long failure period',
-            'server did not respond',
-            'this message has been in the queue too long',
-            'unable to deliver message after multiple retries',
-            'was not reachable within the allowed queue period',
-            'your message could not be delivered for more than',
-          ]
-
-          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/filtered.rb

@@ -12,6 +12,21 @@ module Sisimai
     module Filtered
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Filtered.pm
       class << self
+        Index = [
+          'because the recipient is only accepting mail from specific email addresses',   # AOL Phoenix
+          'bounced address',  # SendGrid|a message to an address has previously been Bounced.
+          'due to extended inactivity new mail is not currently being accepted for this mailbox',
+          'has restricted sms e-mail',    # AT&T
+          'is not accepting any mail',
+          'refused due to recipient preferences', # Facebook
+          'resolver.rst.notauthorized',   # Microsoft Exchange
+          'this account is protected by',
+          'user not found',   # Filter on MAIL.RU
+          'user reject',
+          'we failed to deliver mail because the following address recipient id refuse to receive mail',  # Willcom
+          'you have been blocked by the recipient',
+        ]
+
         def text; return 'filtered'; end
         def description; return 'Email rejected due to a header content after SMTP DATA command'; end
 
@@ -21,22 +36,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'because the recipient is only accepting mail from specific email addresses',   # AOL Phoenix
-            'bounced address',  # SendGrid|a message to an address has previously been Bounced.
-            'due to extended inactivity new mail is not currently being accepted for this mailbox',
-            'has restricted sms e-mail',    # AT&T
-            'is not accepting any mail',
-            'refused due to recipient preferences', # Facebook
-            'resolver.rst.notauthorized',   # Microsoft Exchange
-            'this account is protected by',
-            'user not found',   # Filter on MAIL.RU
-            'user reject',
-            'we failed to deliver mail because the following address recipient id refuse to receive mail',  # Willcom
-            'you have been blocked by the recipient',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -49,12 +49,13 @@ module Sisimai
           return true if argvs.reason == 'filtered'
 
           require 'sisimai/reason/userunknown'
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || ''
+          return false if tempreason == 'suspend'
+
           commandtxt = argvs.smtpcommand || ''
           diagnostic = argvs.diagnosticcode.downcase || ''
-          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
           alterclass = Sisimai::Reason::UserUnknown
 
-          return false if tempreason == 'suspend'
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
             return true if alterclass.match(diagnostic) || match(diagnostic)

data/lib/sisimai/reason/hasmoved.rb

@@ -9,6 +9,8 @@ module Sisimai
     module HasMoved
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HasMoved.pm
       class << self
+        Index = [' has been replaced by ']
+
         def text; return 'hasmoved'; end
         def description; return "Email rejected due to user's mailbox has moved and is not forwarded automatically"; end
 
@@ -18,9 +20,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [' has been replaced by ']
-
-          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/hostunknown.rb

@@ -8,6 +8,23 @@ module Sisimai
     module HostUnknown
       # Imported from p5-Sisimail/lib/Sisimai/Reason/HostUnknown.pm
       class << self
+        Index = [
+          'domain does not exist',
+          'domain is not reachable',
+          'domain must exist',
+          'host or domain name not found',
+          'host unknown',
+          'host unreachable',
+          'mail domain mentioned in email address is unknown',
+          'name or service not known',
+          'no such domain',
+          'recipient address rejected: unknown domain name',
+          'recipient domain must exist',
+          'the account or domain may not exist',
+          'unknown host',
+          'unrouteable address',
+        ]
+
         def text; return 'hostunknown'; end
         def description; return "Delivery failed due to a domain part of a recipient's email address does not exist"; end
 
@@ -18,24 +35,7 @@ module Sisimai
         # @since v4.0.0
         def match(argv1)
           return nil unless argv1
-          index = [
-            'domain does not exist',
-            'domain is not reachable',
-            'domain must exist',
-            'host or domain name not found',
-            'host unknown',
-            'host unreachable',
-            'mail domain mentioned in email address is unknown',
-            'name or service not known',
-            'no such domain',
-            'recipient address rejected: unknown domain name',
-            'recipient domain must exist',
-            'the account or domain may not exist',
-            'unknown host',
-            'unrouteable address',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -50,7 +50,7 @@ module Sisimai
           diagnostic = argvs.diagnosticcode.downcase || ''
           statuscode = argvs.deliverystatus || ''
 
-          if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
+          if Sisimai::SMTP::Status.name(statuscode).to_s == 'hostunknown'
             # Status: 5.1.2
             # Diagnostic-Code: SMTP; 550 Host unknown
             require 'sisimai/reason/networkerror'

data/lib/sisimai/reason/mailboxfull.rb

@@ -9,6 +9,53 @@ module Sisimai
     module MailboxFull
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailboxFull.pm
       class << self
+        Index = [
+          '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',
+          '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',
+          'not enough storage space in',
+          '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',
+        ]
+
         def text; return 'mailboxfull'; end
         def description; return "Email rejected due to a recipient's mailbox is full"; end
 
@@ -18,54 +65,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            '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',
-            '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',
-            'not enough storage space in',
-            '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',
-          ]            
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -81,7 +81,7 @@ module Sisimai
           # Delivery status code points "mailboxfull".
           # Status: 4.2.2
           # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
-          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'mailboxfull'
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'mailboxfull'
 
           # Check the value of Diagnosic-Code: header with patterns
           return true if match(argvs.diagnosticcode.downcase)

data/lib/sisimai/reason/mailererror.rb

@@ -11,6 +11,21 @@ module Sisimai
     module MailerError
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailerError.pm
       class << self
+        Regex = %r{(?>
+           \Aprocmail:[ ]    # procmail
+          |bin/(?:procmail|maildrop)
+          |command[ ](?:
+             failed:[ ]
+            |died[ ]with[ ]status[ ]\d+
+            |output:
+            )
+          |exit[ ]\d+
+          |mailer[ ]error
+          |pipe[ ]to[ ][|][/].+
+          |x[-]unix[;][ ]\d+  # X-UNIX; 127
+          )
+        }x
+
         def text; return 'mailererror'; end
         def description; return 'Email returned due to a mailer program has not exited successfully'; end
 
@@ -20,22 +35,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          regex = %r{(?>
-             \Aprocmail:[ ]    # procmail
-            |bin/(?:procmail|maildrop)
-            |command[ ](?:
-               failed:[ ]
-              |died[ ]with[ ]status[ ]\d+
-              |output:
-              )
-            |exit[ ]\d+
-            |mailer[ ]error
-            |pipe[ ]to[ ][|][/].+
-            |x[-]unix[;][ ]\d+  # X-UNIX; 127
-            )
-          }x
-
-          return true if argv1 =~ regex
+          return true if argv1 =~ Regex
           return false
         end
 

data/lib/sisimai/reason/mesgtoobig.rb

@@ -8,6 +8,21 @@ module Sisimai
     module MesgTooBig
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MesgTooBig.pm
       class << self
+        Index = [
+          'exceeded maximum inbound message size',
+          'line limit exceeded',
+          'max message size exceeded',
+          'message file too big',
+          'message length exceeds administrative limit',
+          'message size exceeds fixed limit',
+          'message size exceeds fixed maximum message size',
+          'message size exceeds maximum value',
+          'message too big',
+          'message too large for this ',
+          'size limit',
+          'taille limite du message atteinte',
+        ]
+
         def text; return 'mesgtoobig'; end
         def description; return 'Email rejected due to an email size is too big for a destination mail server'; end
 
@@ -17,22 +32,7 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          index = [
-            'exceeded maximum inbound message size',
-            'line limit exceeded',
-            'max message size exceeded',
-            'message file too big',
-            'message length exceeds administrative limit',
-            'message size exceeds fixed limit',
-            'message size exceeds fixed maximum message size',
-            'message size exceeds maximum value',
-            'message too big',
-            'message too large for this ',
-            'size limit',
-            'taille limite du message atteinte',
-          ]
-
-          return true if index.any? { |a| argv1.include?(a) }
+          return true if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -45,7 +45,7 @@ module Sisimai
           return true if argvs.reason == 'mesgtoobig'
 
           statuscode = argvs.deliverystatus || ''
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
+          tempreason = Sisimai::SMTP::Status.name(statuscode) || ''
 
           # Delivery status code points "mesgtoobig".
           # Status: 5.3.4