sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/reason/mailererror.rb

@@ -12,9 +12,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MailerError.pm
       class << self
         def text; return 'mailererror'; end
-        def description
-          return 'Email returned due to a mailer program has not exited successfully'
-        end
+        def description; return 'Email returned due to a mailer program has not exited successfully'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -33,9 +31,9 @@ module Sisimai
             |exit[ ]\d+
             |mailer[ ]error
             |pipe[ ]to[ ][|][/].+
-            |X[-]UNIX[;][ ]\d+  # X-UNIX; 127
+            |x[-]unix[;][ ]\d+  # X-UNIX; 127
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/mesgtoobig.rb

@@ -9,9 +9,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/MesgTooBig.pm
       class << self
         def text; return 'mesgtoobig'; end
-        def description
-          return 'Email rejected due to an email size is too big for a destination mail server'
-        end
+        def description; return 'Email rejected due to an email size is too big for a destination mail server'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -21,7 +19,7 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              exceeded[ ]maximum[ ]inbound[ ]message[ ]size
-            |Line[ ]limit[ ]exceeded
+            |line[ ]limit[ ]exceeded
             |max[ ]message[ ]size[ ]exceeded
             |message[ ](?:
                file[ ]too[ ]big
@@ -35,9 +33,9 @@ module Sisimai
               |too[ ]large[ ]for[ ]this[ ].+
               )
             |size[ ]limit
-            |Taille[ ]limite[ ]du[ ]message[ ]atteinte.+[A-Z]{3}.+514
+            |taille[ ]limite[ ]du[ ]message[ ]atteinte.+[a-z]{3}.+514
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -51,31 +49,23 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::MesgTooBig.text
+          return true if argvs.reason == 'mesgtoobig'
 
           require 'sisimai/smtp/status'
           statuscode = argvs.deliverystatus || ''
-          diagnostic = argvs.diagnosticcode || ''
-          reasontext = Sisimai::Reason::MesgTooBig.text
           tempreason = Sisimai::SMTP::Status.name(statuscode)
-          v = false
 
-          if tempreason == reasontext
-            # Delivery status code points "mesgtoobig".
-            # Status: 5.3.4
-            # Diagnostic-Code: SMTP; 552 5.3.4 Error: message file too big
-            v = true
-          else
-            if tempreason == 'exceedlimit' || statuscode == '5.2.3'
-              #  5.2.3   Message length exceeds administrative limit
-              v = false
-            else
-              # Check the value of Diagnosic-Code: header with patterns
-              v = true if Sisimai::Reason::MesgTooBig.match(diagnostic)
-            end
-          end
+          # Delivery status code points "mesgtoobig".
+          # Status: 5.3.4
+          # Diagnostic-Code: SMTP; 552 5.3.4 Error: message file too big
+          return true if tempreason == 'mesgtoobig'
+
+          #  5.2.3   Message length exceeds administrative limit
+          return false if( tempreason == 'exceedlimit' || statuscode == '5.2.3' )
 
-          return v
+          # Check the value of Diagnosic-Code: header with patterns
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end

data/lib/sisimai/reason/networkerror.rb

@@ -14,9 +14,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NetworkError.pm
       class << self
         def text; return 'networkerror'; end
-        def description
-          return 'SMTP connection failed due to DNS look up failure or other network problems'
-        end
+        def description; return 'SMTP connection failed due to DNS look up failure or other network problems'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -26,8 +24,8 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              could[ ]not[ ]connect[ ]and[ ]send[ ]the[ ]mail[ ]to
-            |DNS[ ]records[ ]for[ ]the[ ]destination[ ]computer[ ]could[ ]not[ ]be[ ]found
-            |Hop[ ]count[ ]exceeded[ ]-[ ]possible[ ]mail[ ]loop
+            |dns[ ]records[ ]for[ ]the[ ]destination[ ]computer[ ]could[ ]not[ ]be[ ]found
+            |hop[ ]count[ ]exceeded[ ]-[ ]possible[ ]mail[ ]loop
             |host[ ]is[ ]unreachable
             |mail[ ]forwarding[ ]loop[ ]for[ ]
             |malformed[ ]name[ ]server[ ]reply
@@ -37,15 +35,15 @@ module Sisimai
               |probably[ ]in[ ]a[ ]routing[ ]loop
               )
             |name[ ]service[ ]error[ ]for[ ].+[ ](?:
-               Malformed[ ]or[ ]unexpected[ ]name[ ]server[ ]reply
-              |Host[ ]not[ ]found,[ ]try[ ]again
+               malformed[ ]or[ ]unexpected[ ]name[ ]server[ ]reply
+              |host[ ]not[ ]found,[ ]try[ ]again
               )
-            |No[ ]route[ ]to[ ]host
+            |no[ ]route[ ]to[ ]host
             |too[ ]many[ ]hops
-            |Unable[ ]to[ ]resolve[ ]route[ ].+[ ]
+            |unable[ ]to[ ]resolve[ ]route[ ].+[ ]
             |unrouteable[ ]mail[ ]domain
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/norelaying.rb

@@ -14,9 +14,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NoRelaying.pm
       class << self
         def text; return 'norelaying'; end
-        def description
-          return 'Email rejected with error message "Relaying Denied"'
-        end
+        def description; return 'Email rejected with error message "Relaying Denied"'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -26,7 +24,7 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              as[ ]a[ ]relay
-            |Insecure[ ]Mail[ ]Relay
+            |insecure[ ]mail[ ]relay
             |mail[ ]server[ ]requires[ ]authentication[ ]when[ ]attempting[ ]to[ ]
               send[ ]to[ ]a[ ]non-local[ ]e-mail[ ]address    # MailEnable
             |not[ ](?:
@@ -40,10 +38,10 @@ module Sisimai
               )
             |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
+            |this[ ]system[ ]is[ ]not[ ]configured[ ]to[ ]relay[ ]mail
+            |unable[ ]to[ ]relay[ ]for
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -58,17 +56,14 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
 
-          currreason = argvs.reason || ''
-          reexcludes = %r/\A(?:securityerror|systemerror|undefined)\z/
-
-          if currreason.size > 0
+          r = argvs.reason || ''
+          if r.size > 0
             # Do not overwrite the reason
-            return false if currreason =~ reexcludes
+            return false if r.start_with?('securityerror', 'systemerror', 'undefined')
           else
             # Check the value of Diagnosic-Code: header with patterns
-            return true if Sisimai::Reason::NoRelaying.match(argvs.diagnosticcode)
+            return true if match(argvs.diagnosticcode.downcase)
           end
-
           return false
         end
 

data/lib/sisimai/reason/notaccept.rb

@@ -12,9 +12,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/NotAccept.pm
       class << self
         def text; return 'notaccept'; end
-        def description
-          return 'Delivery failed due to a destination mail server does not accept any email'
-        end
+        def description; return 'Delivery failed due to a destination mail server does not accept any email'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -25,10 +23,10 @@ module Sisimai
 
           # Destination mail server does not accept any message
           regex = %r{(?:
-               Name[ ]server:[ ][.]:[ ]host[ ]not[ ]found # Sendmail
+               name[ ]server:[ ][.]:[ ]host[ ]not[ ]found # Sendmail
               |55[46][ ]smtp[ ]protocol[ ]returned[ ]a[ ]permanent[ ]error
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false
@@ -42,23 +40,13 @@ module Sisimai
         def true(argvs)
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
-          return true if argvs.reason == Sisimai::Reason::NotAccept.text
-
-          diagnostic = argvs.diagnosticcode || ''
-          v = false
+          return true if argvs.reason == 'notaccept'
 
-          if argvs.replycode =~ /\A(?:521|554|556)\z/
-            # SMTP Reply Code is 554 or 556
-            v = false
-          else
-            # Check the value of Diagnosic-Code: header with patterns
-            if argvs.smtpcommand == 'MAIL'
-              # Matched with a pattern in this class
-              v = true if Sisimai::Reason::NotAccept.match(diagnostic)
-            end
-          end
-
-          return v
+          # SMTP Reply Code is 554 or 556
+          return true if [521, 554, 556].index(argvs.replycode.to_i)
+          return false if argvs.smtpcommand == 'MAIL'
+          return true if match(argvs.diagnosticcode.downcase)
+          return false
         end
 
       end

data/lib/sisimai/reason/onhold.rb

@@ -9,9 +9,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/OnHold.pm
       class << self
         def text; return 'onhold'; end
-        def description
-          return 'Sisimai could not decided the reason due to there is no (or less) detailed information for judging the reason'
-        end
+        def description; return 'Sisimai could not decided the reason due to there is no (or less) detailed information for judging the reason'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -30,13 +28,10 @@ module Sisimai
           return nil unless argvs
           return nil unless argvs.is_a? Sisimai::Data
           return nil unless argvs.deliverystatus.size > 0
-          return true if argvs.reason == Sisimai::Reason::OnHold.text
-
-          statuscode = argvs.deliverystatus || ''
-          reasontext = Sisimai::Reason::OnHold.text
+          return true if argvs.reason == 'onhold'
 
           require 'sisimai/smtp/status'
-          return true if Sisimai::SMTP::Status.name(statuscode) == reasontext
+          return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'onhold'
           return false
         end
       end

data/lib/sisimai/reason/policyviolation.rb

@@ -17,9 +17,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/PolicyViolation.pm
       class << self
         def text; return 'policyviolation'; end
-        def description
-          return 'Email rejected due to policy violation on a destination host'
-        end
+        def description; return 'Email rejected due to policy violation on a destination host'; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -31,24 +29,24 @@ module Sisimai
           regex = %r{(?>
              because[ ]the[ ]recipient[ ]is[ ]not[ ]accepting[ ]mail[ ]with[ ](?:attachments|embedded[ ]images) # AOL Phoenix
             |closed[ ]mailing[ ]list
-            |Denied[ ]by[ ]policy
+            |denied[ ]by[ ]policy
             |email[ ](?:
                not[ ]accepted[ ]for[ ]policy[ ]reasons
               # http://kb.mimecast.com/Mimecast_Knowledge_Base/Administration_Console/Monitoring/Mimecast_SMTP_Error_Codes#554
               |rejected[ ]due[ ]to[ ]security[ ]policies
               )
             |header[ ](?:are[ ]not[ ]accepted|error)
-            |Mail[ ]from[ ].+[ ]rejected[ ]for[ ]policy[ ]reasons
+            |mail[ ]from[ ].+[ ]rejected[ ]for[ ]policy[ ]reasons
             |message[ ](?:
                given[ ]low[ ]priority
               |not[ ]accepted[ ]for[ ]policy[ ]reasons
               )
-            |Messages[ ]with[ ]multiple[ ]addresses
-            |You[ ]have[ ]exceeded[ ]the[ ]the[ ]allowable[ ]number[ ]of[ ]posts[ ]without[ ]solving[ ]a[ ]captcha
-            |Protocol[ ]violation
-            |The[ ]email[ ]address[ ]used[ ]to[ ]send[ ]your[ ]message[ ]is[ ]not[ ]subscribed[ ]to[ ]this[ ]group
+            |messages[ ]with[ ]multiple[ ]addresses
+            |you[ ]have[ ]exceeded[ ]the[ ]the[ ]allowable[ ]number[ ]of[ ]posts[ ]without[ ]solving[ ]a[ ]captcha
+            |protocol[ ]violation
+            |the[ ]email[ ]address[ ]used[ ]to[ ]send[ ]your[ ]message[ ]is[ ]not[ ]subscribed[ ]to[ ]this[ ]group
             )
-          }ix
+          }x
 
           return true if argv1 =~ regex
           return false

data/lib/sisimai/reason/rejected.rb

@@ -16,9 +16,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/Rejected.pm
       class << self
         def text; return 'rejected'; end
-        def description
-          return "Email rejected due to a sender's email address (envelope from)"
-        end
+        def description; return "Email rejected due to a sender's email address (envelope from)"; end
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
@@ -26,43 +24,43 @@ module Sisimai
         #                           true: Matched
         def match(argv1)
           return nil unless argv1
-          isnot = %r{(?:5[.]1[.]0[ ]Address
-            |Recipient[ ]address
-            |Sender[ ]IP[ ]address
+          isnot = %r{(?:5[.]1[.]0[ ]address
+            |recipient[ ]address
+            |sender[ ]ip[ ]address
             )[ ]rejected
-          }xi
+          }x
           regex = %r{(?>
              [<][>][ ]invalid[ ]sender
             |address[ ]rejected
-            |Administrative[ ]prohibition
+            |administrative[ ]prohibition
             |batv[ ](?:
                failed[ ]to[ ]verify   # SoniWall
               |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
+            |connections[ ]not[ ]accepted[ ]from[ ]servers[ ]without[ ]a[ ]valid[ ]sender[ ]domain
             |denied[ ]\[bouncedeny\]    # McAfee
-            |Delivery[ ]not[ ]authorized,[ ]message[ ]refused
-            |does[ ]not[ ]exist[ ]E2110
+            |delivery[ ]not[ ]authorized,[ ]message[ ]refused
+            |does[ ]not[ ]exist[ ]e2110
             |domain[ ]of[ ]sender[ ]address[ ].+[ ]does[ ]not[ ]exist
-            |Emetteur[ ]invalide.+[A-Z]{3}.+(?:403|405|415)
+            |emetteur[ ]invalide.+[a-z]{3}.+(?:403|405|415)
             |empty[ ]envelope[ ]senders[ ]not[ ]allowed
             |error:[ ]no[ ]third-party[ ]dsns               # SpamWall - block empty sender
-            |From:[ ]Domain[ ]is[ ]invalid[.][ ]Please[ ]provide[ ]a[ ]valid[ ]From:
+            |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.+[A-Z]{3}.+421
-            |Message[ ]rejected:[ ]Email[ ]address[ ]is[ ]not[ ]verified
+            |mail[ ]from[ ]not[ ]owned[ ]by[ ]user.+[a-z]{3}.+421
+            |message[ ]rejected:[ ]email[ ]address[ ]is[ ]not[ ]verified
             |mx[ ]records[ ]for[ ].+[ ]violate[ ]section[ ].+
-            |Null[ ]Sender[ ]is[ ]not[ ]allowed
+            |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
-              |is[ ]Spammer
+              |is[ ]spammer
               |not[ ]pre[-]approved
               |rejected
               |domain[ ]is[ ]empty
@@ -71,10 +69,10 @@ module Sisimai
             |syntax[ ]error:[ ]empty[ ]email[ ]address
             |the[ ]message[ ]has[ ]been[ ]rejected[ ]by[ ]batv[ ]defense
             |transaction[ ]failed[ ]unsigned[ ]dsn[ ]for
-            |Unroutable[ ]sender[ ]address
+            |unroutable[ ]sender[ ]address
             |you[ ]are[ ]sending[ ]to[/]from[ ]an[ ]address[ ]that[ ]has[ ]been[ ]blacklisted
             )
-          }ix
+          }x
 
           return false if argv1 =~ isnot
           return true  if argv1 =~ regex
@@ -91,41 +89,30 @@ module Sisimai
           return nil unless argvs.is_a? Sisimai::Data
 
           require 'sisimai/smtp/status'
-          statuscode = argvs.deliverystatus || ''
-          reasontext = Sisimai::Reason::Rejected.text
-
-          return true if argvs.reason == reasontext
-
-          tempreason = Sisimai::SMTP::Status.name(statuscode)
+          tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
           tempreason = 'undefined' if tempreason.empty?
-          diagnostic = argvs.diagnosticcode || ''
-          v = false
+          diagnostic = argvs.diagnosticcode.downcase
 
-          if tempreason == reasontext
-            # Delivery status code points "rejected".
-            v = true
-          else
-            # Check the value of Diagnosic-Code: header with patterns
-            if argvs.smtpcommand == 'MAIL'
-              # The session was rejected at 'MAIL FROM' command
-              v = true if Sisimai::Reason::Rejected.match(diagnostic)
+          return true if argvs.reason == 'rejected'
+          return true if tempreason == 'rejected' # Delivery status code points "rejected".
 
-            elsif argvs.smtpcommand == 'DATA'
-              # The session was rejected at 'DATA' command
-              if tempreason != 'userunknown'
-                # Except "userunknown"
-                v = true if Sisimai::Reason::Rejected.match(diagnostic)
-              end
-            else
-              if tempreason =~ /\A(?:onhold|undefined|securityerror|systemerror)\z/
-                # Try to match with message patterns when the temporary reason
-                # is "onhold", "undefined", "securityerror", or "systemerror"
-                v = true if Sisimai::Reason::Rejected.match(diagnostic)
-              end
+          # Check the value of Diagnosic-Code: header with patterns
+          if argvs.smtpcommand == 'MAIL'
+            # The session was rejected at 'MAIL FROM' command
+            return true if match(diagnostic)
+
+          elsif argvs.smtpcommand == 'DATA'
+            # The session was rejected at 'DATA' command
+            if tempreason != 'userunknown'
+              # Except "userunknown"
+              return true if match(diagnostic)
             end
+          elsif %w[onhold undefined securityerror systemerror].include?(tempreason)
+            # Try to match with message patterns when the temporary reason
+            # is "onhold", "undefined", "securityerror", or "systemerror"
+            return true if match(diagnostic)
           end
-
-          return v
+          return false
         end
 
       end