sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/reason/userunknown.rb

@@ -1,21 +1,21 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::UserUnknown checks the bounce reason is "userunknown" or
-    # not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::UserUnknown checks the bounce reason is "userunknown" or not. This class is
+    # called only Sisimai::Reason class.
     #
-    # This is the error that a local part (Left hand side of @ sign) of a recipient's
-    # email address does not exist. In many case, a user has changed internet service
-    # provider, or has quit company, or the local part is misspelled. Sisimai will
-    # set "userunknown" to the reason of email bounce if the value of Status: field
-    # in a bounce email is "5.1.1", or connection was refused at SMTP RCPT command,
-    # or the contents of Diagnostic-Code: field represents that it is unknown user.
+    # This is the error that a local part (Left hand side of @ sign) of a recipient's email address
+    # does not exist. In many case, a user has changed internet service provider, or has quit company,
+    # or the local part is misspelled. Sisimai will set "userunknown" to the reason of email bounce
+    # if the value of Status: field in a bounce email is "5.1.1", or connection was refused at SMTP
+    # RCPT command, or the contents of Diagnostic-Code: field represents that it is unknown user.
     #
     #   <kijitora@example.co.jp>: host mx01.example.co.jp[192.0.2.8] said:
     #   550 5.1.1 Address rejected kijitora@example.co.jp (in reply to
     #   RCPT TO command)
     module UserUnknown
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
+        require 'sisimai/string'
+
         PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected NotAccept]
         ModulePath = {
           'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
@@ -25,135 +25,117 @@ module Sisimai
           'Sisimai::Reason::Rejected'    => 'sisimai/reason/rejected',
           'Sisimai::Reason::NotAccept'   => 'sisimai/reason/notaccept',
         }
-        Regex = %r{(?>
-           [#]5[.]1[.]1[ ]bad[ ]address
-          |[<][^ ]+[>][ ]not[ ]found
-          |[<][^ ]+[@][^ ]+[>][.][.][.][ ]blocked[ ]by[ ]
-          |550[ ]address[ ]invalid
-          |5[.]0[.]0[.][ ]mail[ ]rejected[.]
-          |5[.]1[.]0[ ]address[ ]rejected[.]
-          |account[ ][^ ]+[ ]does[ ]not[ ]exist[ ]at[ ]the[ ]organization
-          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide[.][ ]invalid[ ]recipient[.][0-9a-z_]+41[68]
-          |address[ ](?:does[ ]not[ ]exist|unknown)
-          |address[ ](?:does[ ]not[ ]exist|not[ ]present[ ]in[ ]directory|unknown)
-          |archived[ ]recipient
-          |bad[-_ ]recipient
-          |can[']t[ ]accept[ ]user
-          |does[ ]not[ ]exist[.]
-          |destination[ ](?:
-             addresses[ ]were[ ]unknown
-            |server[ ]rejected[ ]recipients
-            )
-          |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
-          |invalid[ ](?:
-             address
-            |mailbox:?
-            |mailbox[ ]path
-            |recipient
-            )
-          |is[ ]not[ ](?:
-             a[ ]known[ ]user
-            |a[ ]valid[ ]mailbox
-            |an[ ]active[ ]address[ ]at[ ]this[ ]host
-            )
-          |mailbox[ ](?:
-             [^ ]+[ ]does[ ]not[ ]exist
-            |[^ ]+[@][^ ]+[ ]unavailable
-            |does[ ]not[ ]exist
-            |invalid
-            |is[ ](?:inactive|unavailable)
-            |not[ ](?:present|found)
-            |unavailable
-            )
-          |nessun[ ]utente[ ]simile[ ]in[ ]questo[ ]indirizzo
-          |no[ ](?:
-             [ ][^ ]+[ ]in[ ]name[ ]directory
-            |account[ ]by[ ]that[ ]name[ ]here
-            |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
-            |mail[ ]box[ ]available[ ]for[ ]this[ ]user
-            |mailbox[ ](?:
-               by[ ]that[ ]name[ ]is[ ]currently[ ]available
-              |found
-              )
-            |matches[ ]to[ ]nameserver[ ]query
-            |such[ ](?:
-               address[ ]here
-              |mailbox
-              |person[ ]at[ ]this[ ]address
-              |recipient
-              |user(?:[ ]here)?
-              )
-            |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-            |valid[ ]recipients,[ ]bye
-            )
-          |non[- ]?existent[ ]user
-          |not[ ](?:
-             a[ ]valid[ ](?:recipient|user[ ]here)
-            |a[ ]local[ ]address
-            |email[ ]addresses
-            )
-          |rcpt[ ][<][^ ]+[>][ ]does[ ]not[ ]exist
-          |recipient[ ]address[ ]rejected[.][ ][(]in[ ]reply[ ]to[ ]rcpt[ ]to[ ]command[)]
-          |recipient[ ](?:
-             [^ ]+[ ]was[ ]not[ ]found[ ]in
-            |address[ ]rejected:[ ](?:
-               access[ ]denied
-              |invalid[ ]user
-              |invalid-recipient
-              |user[ ][^ ]+[ ]does[ ]not[ ]exist
-              |user[ ]unknown[ ]in[ ][^ ]+[ ]table
-              |unknown[ ]user
-              )
-            |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
-            |is[ ]not[ ]local
-            |not[ ](?:exist|found|ok)
-            |refuses[ ]to[ ]accept[ ]your[ ]mail
-            |unknown
-            )
-          |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-          |resolver[.]adr[.]recipient notfound
-          |said:[ ]550[-[ ]]5[.]1[.]1[ ][^ ]+[ ]user[ ]unknown[ ]
-          |sorry,[ ](?:
-             user[ ]unknown
-            |badrcptto
-            |no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
-            |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
-            |following[ ]recipients[ ]was[ ]undeliverable
-            |user[']s[ ]email[ ]name[ ]is[ ]not[ ]found
-            )
-          |there[ ]is[ ]no[ ]one[ ]at[ ]this[ ]address
-          |this[ ](?:
-             address[ ]no[ ]longer[ ]accepts[ ]mail
-            |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
-            |recipient[ ]is[ ]in[ ]my[ ]badrecipientto[ ]list
-            |recipient[ ]is[ ]not[ ]in[ ]my[ ]validrcptto[ ]list
-            |spectator[ ]does[ ]not[ ]exist
-            |user[ ]doesn[']?t[ ]have[ ]a[ ][^ ]+[ ]account
-            )
-          |unknown[ ](?:
-             e[-]?mail[ ]address
-            |local[- ]part
-            |mailbox
-            |recipient
-            |user
-            )
-          |user[ ](?:
-             [^ ]+[ ]was[ ]not[ ]found
-            |[^ ]+[ ]does[ ]not[ ]exist
-            |does[ ]not[ ]exist
-            |missing[ ]home[ ]directory
-            |not[ ](?:active|exist|found|known)
-            |unknown
-            )
-          |utilisateur[ ]inconnu[ ]!
-          |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
-          |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
-          )
-        }x
+        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',
+          "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 does not exist',
+          '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',
+        ].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'],
+          ['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 '],
+          ["this user doesn't have a ", " account"],
+          ['unknown e', 'mail address'],
+          ['unknown local', 'part'],
+          ['user ', ' was not found'],
+          ['user ', ' does not exist'],
+        ].freeze
 
         def text; return 'userunknown'; end
         def description; return "Email rejected due to a local part of a recipient's email address does not exist"; end
@@ -164,22 +146,23 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          return true if argv1 =~ Regex
+          return true if Index.any? { |a| argv1.include?(a) }
+          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # Whether the address is "userunknown" or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: is unknown user
         #                                   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'
 
-          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus) || ''
+          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus']) || ''
           return false if tempreason == 'suspend'
 
-          diagnostic = argvs.diagnosticcode.downcase
+          issuedcode = argvs['diagnosticcode'].downcase
           if tempreason == 'userunknown'
             # *.1.1 = 'Bad destination mailbox address'
             #   Status: 5.1.1
@@ -198,17 +181,17 @@ module Sisimai
                 next
               end
 
-              next unless r.match(diagnostic)
+              next unless r.match(issuedcode)
               # Match with reason defined in Sisimai::Reason::* except UserUnknown.
               matchother = true
               break
             end
             return true unless matchother # Did not match with other message patterns
 
-          elsif argvs.smtpcommand == 'RCPT'
+          elsif argvs['smtpcommand'] == 'RCPT'
             # When the SMTP command is not "RCPT", the session rejected by other
             # reason, maybe.
-            return true if match(diagnostic)
+            return true if match(issuedcode)
           end
 
           return false

data/lib/sisimai/reason/vacation.rb

@@ -1,16 +1,15 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Vacation is for only returning text and description.
-    # This class is called only from Sisimai.reason method.
+    # Sisimai::Reason::Vacation is for only returning text and description. This class is called only
+    # from Sisimai.reason method.
     module Vacation
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/Vacation.pm
       class << self
         Index = [
           'i am away on vacation',
           'i am away until',
           'i am out of the office',
           'i will be traveling for work on',
-        ]
+        ].freeze
 
         def text; return 'vacation'; end
         def description; return 'Email replied automatically due to a recipient is out of office'; end

data/lib/sisimai/reason/virusdetected.rb

@@ -1,11 +1,10 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::VirusDetected checks the bounce reason is "virusdetected"
-    # or not. This class is called only Sisimai::Reason class.
+    # Sisimai::Reason::VirusDetected checks the bounce reason is "virusdetected" or not. This class
+    # is called only Sisimai::Reason class.
     #
-    # This is an error that any virus or trojan horse detected in the message by
-    # a virus scanner program at a destination mail server. This reason has been
-    # divided from "securityerror" at Sisimai 4.22.0.
+    # This is an error that any virus or trojan horse detected in the message by a virus scanner program
+    # at a destination mail server. This reason has been divided from "securityerror" at Sisimai 4.22.0.
     #
     #   Your message was infected with a virus. You should download a virus
     #   scanner and check your computer for viruses.
@@ -14,15 +13,15 @@ module Sisimai
     #     Recipient: <kijitora@example.jp>
     #
     module VirusDetected
-      # Imported from p5-Sisimail/lib/Sisimai/Reason/VirusDetected.pm
       class << self
         Index = [
           'it has a potentially executable attachment',
           'the message was rejected because it contains prohibited virus or spam content',
           'this form of attachment has been used by recent viruses or other malware',
           'virus detected',
+          'virus phishing/malicious_url detected',
           'your message was infected with a virus',
-        ]
+        ].freeze
 
         def text; return 'virusdetected'; end
         def description; return 'Email rejected due to a virus scanner on a destination host'; end
@@ -39,7 +38,7 @@ module Sisimai
         end
 
         # The bounce reason is "virusdetected" or not
-        # @param    [Sisimai::Data] argvs   Object to be detected the reason
+        # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [True,False]            true: virus detected
         #                                   false: virus was not detected
         # @since 4.22.0
@@ -48,9 +47,9 @@ module Sisimai
           # The value of "reason" isn't "visusdetected" when the value of "smtpcommand" 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 true  if argvs.reason == 'virusdetected'
-          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs.smtpcommand)
-          return true  if match(argvs.diagnosticcode.downcase)
+          return true  if argvs['reason'] == 'virusdetected'
+          return false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs['smtpcommand'])
+          return true  if match(argvs['diagnosticcode'].downcase)
           return false
         end