sisimai 4.25.8-java → 4.25.12-java

data/lib/sisimai/reason/rejected.rb

@@ -21,8 +21,8 @@ module Sisimai
           'sender ip address rejected',
         ]
         Index = [
-          '<> invalid sender',
           'access denied (in reply to mail from command)',
+          'access denied (sender blacklisted)',
           'address rejected',
           'administrative prohibition',
           'batv failed to verify',    # SoniWall
@@ -31,6 +31,7 @@ module Sisimai
           'bogus mail from',          # IMail - block empty sender
           'connections not accepted from servers without a valid sender domain',
           'denied [bouncedeny]',      # McAfee
+          'denied by secumail valid-address-filter',
           'delivery not authorized, message refused',
           'does not exist e2110',
           'domain of sender address ',
@@ -41,6 +42,7 @@ module Sisimai
           'from: domain is invalid. please provide a valid from:',
           'fully qualified email address required',   # McAfee
           'invalid domain, see <url:',
+          'invalid sender',
           'is not a registered gateway user',
           'mail from not owned by user',
           'message rejected: email address is not verified',
@@ -51,6 +53,7 @@ module Sisimai
           'returned mail not accepted here',
           'rfc 1035 violation: recursive cname records for',
           'rule imposed mailbox access for',  # MailMarshal
+          'sender address has been blacklisted',
           'sender email address rejected',
           'sender is spammer',
           'sender not pre-approved',
@@ -59,6 +62,7 @@ module Sisimai
           'sender verify failed', # Exim callout
           'syntax error: empty email address',
           'the message has been rejected by batv defense',
+          'this server does not accept mail from',
           'transaction failed unsigned dsn for',
           'unroutable sender address',
           'you are sending to/from an address that has been blacklisted',

data/lib/sisimai/reason/securityerror.rb

@@ -21,27 +21,26 @@ module Sisimai
       class << self
         Regex = %r{(?>
            account[ ]not[ ]subscribed[ ]to[ ]ses
-          |authentification[ ]requise.+[a-z]{3}.+402
           |authentication[ ](?:
              credentials invalid
             |failure
-            |failed;[ ]server[ ].+[ ]said:  # Postfix
+            |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
+          |authentification[ ]requise.+[0-9a-z_]+402
+          |codes?[ ]d'?[ ]*authentification[ ]invalide.+[0-9a-z_]+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
+          |user[ ][^ ]+[ ]is[ ]not[ ]authorized[ ]to[ ]perform[ ]ses:sendrawemail[ ]on[ ]resource
           |you[ ]are[ ]not[ ]authorized[ ]to[ ]send[ ]mail,[ ]authentication[ ]is[ ]required
           |verification[ ]failure
           )

data/lib/sisimai/reason/spamdetected.rb

@@ -20,6 +20,7 @@ module Sisimai
            ["]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
+          |554[ ]5[.]7[.]0[ ]reject,[ ]id=\d+
           |appears[ ]to[ ]be[ ]unsolicited
           |blacklisted[ ]url[ ]in[ ]message
           |block[ ]for[ ]spam
@@ -29,17 +30,18 @@ module Sisimai
             )
           |blocked[ ]for[ ]abuse[.][ ]see[ ]http://att[.]net/blocks   # AT&T
           |bulk[ ]email
+          |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
-          |dt:spm[ ]mx.+[ ]http://mail[.]163[.]com/help/help_spam_16[.]htm
           |greylisted.?.[ ]please[ ]try[ ]again[ ]in
-          |http://(?:www[.]spamhaus[.]org|dsbl[.]org)
+          |high[ ]probability[ ]of[ ]spam
+          |https?://(?:www[.]spamhaus[.]org|dsbl[.]org|mail[.]163[.]com/help/help_spam_16[.]htm)
           |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
+            |rejete[.][ ]mail[ ]rejected[.][ ][0-9a-z_]+506
             )
           |may[ ]consider[ ]spam
           |message[ ](?:
@@ -51,8 +53,10 @@ module Sisimai
               |refer[ ]to[ ]the[ ]troubleshooting[ ]page[ ]at[ ]
               )
             |looks[ ]like[ ]spam
-            |not[ ]accepted[ ]for[ ]policy[ ]reasons[.][ ]see[ ]http:   # Yahoo!
-            |refused[ ]by[ ]mailmarshal[ ]spamprofiler
+            |refused[ ]by[ ](?:
+              mailmarshal[ ]spamprofiler
+             |trustwave[ ]seg[ ]spamprofiler
+             )
             |rejected[ ](?:
                as[ ]spam
               |because[ ]of[ ]unacceptable[ ]content
@@ -62,25 +66,23 @@ module Sisimai
             )
           |our[ ](?:
              email[ ]server[ ]thinks[ ]this[ ]email[ ]is[ ]spam
-            |filters[ ]rate[ ]at[ ]and[ ]above[ ].+[ ]percent[ ]probability[ ]of[ ]being[ ]spam
+            |filters[ ]rate[ ]at[ ]and[ ]above[ ]\d+[ ]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)
+            |[ ]by[ ][^ ]+[ ][(]spam[)]
+            |[ ]due[ ]to[ ]spam[ ](?:url[ ]in[ ])?(?:classification|content)
             )
-          |rejecting[ ]banned[ ]content
+          |rejecting[ ](?:banned|mail)[ ]content
           |related[ ]to[ ]content[ ]with[ ]spam[-]like[ ]characteristics
-          |rule[ ]imposed[ ]as[ ].+is[ ]blacklisted[ ]on              # Mailmarshal RBLs
-          |sender[ ]domain[ ]listed[ ]at[ ].+
+          |rule[ ]imposed[ ]as[ ][^ ]+[ ]is[ ]blacklisted[ ]on
+          |sender[ ]domain[ ]listed[ ]at[ ][^ ]+
           |sending[ ]address[ ]not[ ]accepted[ ]due[ ]to[ ]spam[ ]filter
           |spam[ ](?:
-             .+[ ]exceeded
+             [^ ]+[ ]exceeded
             |blocked
             |check
             |content[ ]matched
@@ -112,7 +114,7 @@ module Sisimai
                identified[ ]as[ ]spam
               |scored[ ]as[ ]spam[ ]with[ ]a[ ]probability
               )
-            |scored[ ].+[ ]spam[ ]points
+            |scored[ ][^ ]+[ ]spam[ ]points
             |was[ ]classified[ ]as[ ]spam
             |was[ ]rejected[ ]by[ ]recurrent[ ]pattern[ ]detection[ ]system
             )
@@ -163,7 +165,12 @@ module Sisimai
           return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'spamdetected'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus).to_s == 'spamdetected'
-          return true if match(argvs.diagnosticcode.downcase)
+
+          # The value of "reason" isn't "spamdetected" 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 false if %w[CONN EHLO HELO MAIL RCPT].include?(argvs.smtpcommand)
+          return true  if match(argvs.diagnosticcode.downcase)
           return false
         end
 

data/lib/sisimai/reason/suspend.rb

@@ -13,6 +13,7 @@ module Sisimai
           ' temporary locked',
           'boite du destinataire archivee',
           'email account that you tried to reach is disabled',
+          'has been suspended',
           'invalid/inactive user',
           'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
           'mailbox currently suspended',

data/lib/sisimai/reason/systemerror.rb

@@ -13,6 +13,7 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Reason/SystemError.pm
       class << self
         Index = [
+          'aliasing/forwarding loop broken',
           "can't create user output file",
           'could not load drd for domain',
           'internal error reading data',  # Microsoft
@@ -25,6 +26,7 @@ module Sisimai
           'loop was found in the mail exchanger',
           'loops back to myself',
           'mail system configuration error',
+          'remote server is misconfigured',
           'server configuration error',
           'service currently unavailable',
           'system config error',

data/lib/sisimai/reason/userunknown.rb

@@ -25,17 +25,20 @@ module Sisimai
           'Sisimai::Reason::Rejected'    => 'sisimai/reason/rejected',
         }
         Regex = %r{(?>
-           .+[ ]user[ ]unknown
-          |[#]5[.]1[.]1[ ]bad[ ]address
-          |[<].+[>][ ]not[ ]found
-          |[<].+[@].+[>][.][.][.][ ]blocked[ ]by[ ]
+           [#]5[.]1[.]1[ ]bad[ ]address
+          |[<][^ ]+[>][ ]not[ ]found
+          |[<][^ ]+[@][^ ]+[>][.][.][.][ ]blocked[ ]by[ ]
+          |550[ ]address[ ]invalid
           |5[.]0[.]0[.][ ]mail[ ]rejected[.]
           |5[.]1[.]0[ ]address[ ]rejected[.]
-          |adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[a-z]{3}.+(?:416|418)
+          |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
@@ -43,7 +46,7 @@ module Sisimai
           |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
           |invalid[ ](?:
              address
-            |mailbox:
+            |mailbox:?
             |mailbox[ ]path
             |recipient
             )
@@ -53,16 +56,17 @@ module Sisimai
             |an[ ]active[ ]address[ ]at[ ]this[ ]host
             )
           |mailbox[ ](?:
-             .+[ ]does[ ]not[ ]exist
-            |.+[@].+[ ]unavailable
+             [^ ]+[ ]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
+             [ ][^ ]+[ ]in[ ]name[ ]directory
             |account[ ]by[ ]that[ ]name[ ]here
             |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
             |mail[ ]box[ ]available[ ]for[ ]this[ ]user
@@ -79,7 +83,7 @@ module Sisimai
               |user(?:[ ]here)?
               )
             |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-            |valid[ ]recipients[,][ ]bye    # Microsoft
+            |valid[ ]recipients,[ ]bye
             )
           |non[- ]?existent[ ]user
           |not[ ](?:
@@ -87,15 +91,15 @@ module Sisimai
             |a[ ]local[ ]address
             |email[ ]addresses
             )
-          |rcpt[ ][<].+[>][ ]does[ ]not[ ]exist
+          |rcpt[ ][<][^ ]+[>][ ]does[ ]not[ ]exist
           |recipient[ ]address[ ]rejected[.][ ][(]in[ ]reply[ ]to[ ]rcpt[ ]to[ ]command[)]
-          |rece?ipient[ ](?:
-             .+[ ]was[ ]not[ ]found[ ]in
+          |recipient[ ](?:
+             [^ ]+[ ]was[ ]not[ ]found[ ]in
             |address[ ]rejected:[ ](?:
                access[ ]denied
               |invalid[ ]user
-              |user[ ].+[ ]does[ ]not[ ]exist
-              |user[ ]unknown[ ]in[ ].+[ ]table
+              |user[ ][^ ]+[ ]does[ ]not[ ]exist
+              |user[ ]unknown[ ]in[ ][^ ]+[ ]table
               |unknown[ ]user
               )
             |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
@@ -104,9 +108,8 @@ module Sisimai
             |unknown
             )
           |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-          |resolver[.]adr[.]recip(?:ient)notfound
-          |said:[ ]550[-[ ]]5[.]1[.]1[ ].+[ ]user[ ]unknown[ ]
-          |smtp[ ]error[ ]from[ ]remote[ ]mail[ ]server[ ]after[ ]end[ ]of[ ]data:[ ]553.+does[ ]not[ ]exist
+          |resolver[.]adr[.]recipient notfound
+          |said:[ ]550[-[ ]]5[.]1[.]1[ ][^ ]+[ ]user[ ]unknown[ ]
           |sorry,[ ](?:
              user[ ]unknown
             |badrcptto
@@ -122,7 +125,7 @@ module Sisimai
              address[ ]no[ ]longer[ ]accepts[ ]mail
             |email[ ]address[ ]is[ ]wrong[ ]or[ ]no[ ]longer[ ]valid
             |spectator[ ]does[ ]not[ ]exist
-            |user[ ]doesn[']?t[ ]have[ ]a[ ].+[ ]account
+            |user[ ]doesn[']?t[ ]have[ ]a[ ][^ ]+[ ]account
             )
           |unknown[ ](?:
              e[-]?mail[ ]address
@@ -132,13 +135,14 @@ module Sisimai
             |user
             )
           |user[ ](?:
-             .+[ ]was[ ]not[ ]found
-            |.+[ ]does[ ]not[ ]exist
+             [^ ]+[ ]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
           )

data/lib/sisimai/reason/virusdetected.rb

@@ -38,14 +38,20 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is security error or not
+        # The bounce reason is "virusdetected" or not
         # @param    [Sisimai::Data] argvs   Object to be detected the reason
         # @return   [True,False]            true: virus detected
         #                                   false: virus was not detected
         # @since 4.22.0
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
+        def true(argvs)
+          # 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 false
         end
 
       end

data/lib/sisimai/rfc1894.rb

@@ -38,14 +38,14 @@ module Sisimai
         'addr' => %r/\A((?:Original|Final|X-Actual)-Recipient):[ ]*(.+?);[ ]*(.+)/,
         'code' => %r/\A(Diagnostic-Code):[ ]*(.+?);[ ]*(.*)/,
         'date' => %r/\A((?:Arrival|Last-Attempt)-Date):[ ]*(.+)/,
-        'host' => %r/\A((?:Reporting|Received-From|Remote)-MTA):[ ]*(.+?);[ ]*(.+)/,
-        'list' => %r/\A(Action):[ ]*(failed|delayed|delivered|relayed|expanded|expired|failure)/i,
+        'host' => %r/\A((?:Received-From|Remote|Reporting)-MTA):[ ]*(.+?);[ ]*(.+)/,
+        'list' => %r/\A(Action):[ ]*(delayed|deliverable|delivered|expanded|expired|failed|failure|relayed)/i,
         'stat' => %r/\A(Status):[ ]*([245][.]\d+[.]\d+)/,
         'text' => %r/\A(X-Original-Message-ID):[ ]*(.+)/,
-       #text: %r/\A(Original-Envelope-Id|Final-Log-ID):[ ]*(.+)/,
+       #'text' => %r/\A(Final-Log-ID|Original-Envelope-Id):[ ]*(.+)/,
       }.freeze
 
-      Correction = { action: { 'failure' => 'failed', 'expired' => 'delayed' } }
+      Correction = { action: { 'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed' }}
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -86,8 +86,8 @@ module Sisimai
       # @since v4.25.0
       def match(argv0 = '')
         return nil if argv0.empty?
-        return 1 if FieldNames[0].any? { |a| argv0.start_with?(a) }
-        return 2 if FieldNames[1].any? { |a| argv0.start_with?(a) }
+        return 1   if FieldNames[0].any? { |a| argv0.start_with?(a) }
+        return 2   if FieldNames[1].any? { |a| argv0.start_with?(a) }
         return nil
       end
 
@@ -98,42 +98,44 @@ module Sisimai
       def field(argv0 = '')
         return nil if argv0.empty?
         group = FieldGroup[argv0.split(':',2).shift.downcase] || ''
-        match = []
 
         return nil if group.empty?
         return nil unless CapturesOn[group]
 
+        table = ['', '', '', '']
+        match = false
         while cv = argv0.match(CapturesOn[group])
           # Try to match with each pattern of Per-Message field, Per-Recipient field
-          # - 0: Field-Name
-          # - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
-          # - 2: Value
-          # - 3: Field Group(addr, code, date, host, stat, text)
-          match[0] = cv[1].downcase
-          match[3] = group
+          #   - 0: Field-Name
+          #   - 1: Sub Type: RFC822, DNS, X-Unix, and so on)
+          #   - 2: Value
+          #   - 3: Field Group(addr, code, date, host, stat, text)
+          match = true
+          table[0] = cv[1].downcase
+          table[3] = group
 
           if group == 'addr' || group == 'code' || group == 'host'
             # - Final-Recipient: RFC822; kijitora@nyaan.jp
             # - Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
             # - Remote-MTA: DNS; mx.example.jp
-            match[1] = cv[2].upcase
-            match[2] = group == 'host' ? cv[3].downcase : cv[3]
-            match[2] = '' if match[2] =~ /\A\s+\z/  # Remote-MTA: dns;
+            table[1] = cv[2].upcase
+            table[2] = group == 'host' ? cv[3].downcase : cv[3]
+            table[2] = '' if table[2] =~ /\A\s+\z/  # Remote-MTA: dns;
           else
             # - Action: failed
             # - Status: 5.2.2
-            match[1] = ''
-            match[2] = group == 'date' ? cv[2] : cv[2].downcase
+            table[1] = ''
+            table[2] = group == 'date' ? cv[2] : cv[2].downcase
 
             # Correct invalid value in Action field:
             break unless group == 'list'
-            break unless Correction[:action][match[2]]
-            match[2] = Correction[:action][match[2]]
+            break unless Correction[:action][table[2]]
+            table[2] = Correction[:action][table[2]]
           end
           break
         end
-        return nil if match.empty?
-        return match
+        return nil unless match
+        return table
       end
 
     end

data/lib/sisimai/rfc3464.rb

@@ -174,7 +174,7 @@ module Sisimai
                 maybealias = cv[2]
               else
                 # Final-Recipient: ...
-                x = v['recipienet'] || ''
+                x = v['recipient'] || ''
                 y = Sisimai::Address.s3s4(cv[2])
                 y = maybealias unless Sisimai::RFC5322.is_emailaddress(y)
 

data/lib/sisimai/rfc3834.rb

@@ -99,7 +99,7 @@ module Sisimai
         if mhead['content-type']
           # Get the boundary string and set regular expression for matching with
           # the boundary string.
-          b0 = Sisimai::MIME.boundary(mhead['content-type'], 0)
+          b0 = Sisimai::MIME.boundary(mhead['content-type'], 0) || ''
           MarkingsOf[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
         end
 

data/lib/sisimai/rfc5322.rb

@@ -64,7 +64,7 @@ module Sisimai
       # Fields that might be long
       # @return   [Hash] Long filed(email header) list
       def LONGFIELDS
-        return { 'to' => 1, 'from' => 1, 'subject' => 1, 'message-id' => 1 }
+        return { 'to' => true, 'from' => true, 'subject' => true, 'message-id' => true }
       end
 
       # Check that the argument is an email address or not
@@ -191,8 +191,13 @@ module Sisimai
         v[1] ||= ''
 
         unless v[1].empty?
-          v[1].sub(/\A[\r\n\s]+/, '')
-          v[1].sub(/\n\n.+\z/m, '')
+          # Remove blank lines, the message body of the original message, and append "\n" at the end
+          # of the original message headers
+          # 1. Remove leading blank lines
+          # 2. Remove text after the first blank line: \n\n
+          # 3. Append "\n" at the end of test block when the last character is not "\n"
+          v[1].sub!(/\A[\r\n\s]+/, '')
+          v[1] = v[1][0, v[1].index("\n\n")] if v[1].include?("\n\n")
           v[1] << "\n" unless v[1].end_with?("\n")
         end
         return v

data/lib/sisimai/rhost/exchangeonline.rb

@@ -22,6 +22,7 @@ module Sisimai
           '5.2.2'   => [{ reason: 'mailboxfull', string: 'Mailbox full' }],
           '5.2.3'   => [{ reason: 'exceedlimit', string: 'Message too large' }],
           '5.2.4'   => [{ reason: 'systemerror', string: 'Mailing list expansion problem' }],
+          '5.2.14'  => [{ reason: 'systemerror', string: 'misconfigured forwarding address' }],
           '5.2.122' => [{ reason: 'toomanyconn' ,string: 'The recipient has exceeded their limit for' }],
           '5.3.3'   => [{ reason: 'systemfull',  string: 'Unrecognized command' }],
           '5.3.4'   => [{ reason: 'mesgtoobig',  string: 'Message too big for system' }],
@@ -29,6 +30,7 @@ module Sisimai
           '5.4.1'   => [{ reason: 'rejected',    string: 'Recipient address rejected: Access denied' }],
           '5.4.11'  => [{ reason: 'contenterror',string: 'Agent generated message depth exceeded' }],
           '5.4.14'  => [{ reason: 'networkerror',string: 'Hop count exceeded' }],
+          '5.4.310' => [{ reason: 'systemerror', string: 'does not exist' }], # DNS domain * does not exist
           '5.5.2'   => [{ reason: 'syntaxerror', string: 'Send hello first' }],
           '5.5.3'   => [{ reason: 'syntaxerror', string: 'Too many recipients' }],
           '5.5.4'   => [{ reason: 'filtered',    string: 'Invalid domain name' }],
@@ -100,7 +102,12 @@ module Sisimai
           'networkerror'  => ['SMTPSEND.DNS.MxLoopback'],
           'rejected'      => ['RESOLVER.RST.NotAuthorized'],
           'securityerror' => ['RESOLVER.RST.AuthRequired'],
-          'systemerror'   => ['RESOLVER.ADR.Ambiguous', 'RESOLVER.ADR.BadPrimary', 'RESOLVER.ADR.InvalidInSmtp'],
+          'systemerror'   => [
+            'RESOLVER.ADR.Ambiguous',
+            'RESOLVER.ADR.BadPrimary',
+            'RESOLVER.ADR.InvalidInSmtp',
+            'RESOLVER.FWD.NotFound',
+          ],
           'toomanyconn'   => ['RESOLVER.ADR.RecipLimit', 'RESOLVER.ADR.RecipientLimit'],
           'userunknown'   => [
             'RESOLVER.ADR.RecipNotFound',

data/lib/sisimai/rhost/franceptt.rb

@@ -123,6 +123,10 @@ module Sisimai
           # Message refuse, verification DMARC en echec LPN007_517
           '517' => 'policyviolation',
 
+          # 554 5.7.1 Client host rejected
+          # LPN000_630
+          '630' => 'policyviolation',
+
           # 421 mwinf5c77 ME Service refuse. Veuillez essayer plus tard.
           # Service refused, please try later. OFR_999 [999]
           '999' => 'blocked',

data/lib/sisimai/rhost/googleapps.rb

@@ -92,7 +92,10 @@ module Sisimai
                 'Messages with multiple addresses in From: header are not accepted.',
                 'The user or domain that you are sending to (or from) has a policy',
             ]},
-            { reason: 'rejected', string: ['Unauthenticated email is not accepted from this domain.'] },
+            { reason: 'rejected', string: [
+                'This message does not have authentication information or fails to pass authentication checks',
+                'Unauthenticated email is not accepted from this domain.',
+            ]},
           ],
           'X.7.4' => [{ reason: 'syntaxerror', string: ['Unrecognized Authentication Type.'] }],
         }.freeze

data/lib/sisimai/rhost.rb

@@ -59,6 +59,7 @@ module Sisimai
           rhostclass = modulename.gsub('::', '/').downcase
           break
         end
+        return nil if rhostclass.empty?
 
         require rhostclass
         reasontext = Module.const_get(modulename).get(argvs)

data/lib/sisimai/smtp/error.rb

@@ -24,27 +24,28 @@ module Sisimai
         #                           nil:   is not an error
         # @since v4.17.3
         def is_permanent(argv1 = '')
-          getchecked = nil
+          return nil unless argv1
+          permanent1 = nil
           statuscode = Sisimai::SMTP::Status.find(argv1) || Sisimai::SMTP::Reply.find(argv1) || '0'
 
           if (classvalue = statuscode[0, 1].to_i) > 0
             # 2, 4, or 5
             if classvalue == 5
               # Permanent error
-              getchecked = true
+              permanent1 = true
 
             elsif classvalue == 4
               # Temporary error
-              getchecked = false
+              permanent1 = false
 
             elsif classvalue == 2
               # Succeeded
-              getchecked = nil
+              permanent1 = nil
             end
           else
             # Check with regular expression
             v = argv1.downcase
-            getchecked = if v.include?('temporar') || v.include?('persistent')
+            permanent1 = if v.include?('temporar') || v.include?('persistent')
                            # Temporary failure
                            false
                          elsif v.include?('permanent')
@@ -53,7 +54,7 @@ module Sisimai
                          end
           end
 
-          return getchecked
+          return permanent1
         end
 
         # Check softbounce or not
@@ -64,6 +65,7 @@ module Sisimai
         #                           '':     May not be bounce ?
         # @since v4.17.3
         def soft_or_hard(argv1 = '', argv2 = '')
+          return nil unless argv1
           return nil if argv1.empty?
           value = nil
 

data/lib/sisimai/smtp/reply.rb

@@ -82,7 +82,7 @@ module Sisimai
           # reply code.
           argv1 = argv1.gsub(/#{IP4Re}/, '***.***.***.***') if argv1 =~ IP4Re
 
-          if cv = argv1.match(/\b([45][0-5][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
+          if cv = argv1.match(/\b([45][0-7][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
             # 550, 447, or 250
             return cv[1]
           else

data/lib/sisimai/smtp/status.rb

@@ -651,7 +651,7 @@ module Sisimai
           '5.7.24' => 'securityerror',  # SPF validation error
           '5.7.25' => 'blocked',        # Reverse DNS validation failed
           '5.7.26' => 'securityerror',  # Multiple authentication checks failed
-          '5.7.27' => 'rejected',       # Sender address has null MX
+          '5.7.27' => 'notaccept',      # MX resource record of a destination host is Null MX: RFC7505
         }.freeze
 
         InternalCode = {

data/lib/sisimai/time.rb

@@ -1,8 +1,7 @@
 require 'date'
-
 module Sisimai
   # Sisimai::Time is a child class of Date for Sisimai::Data.
-  class Time < DateTime
+  class Time < ::DateTime
     # Imported from p5-Sisimail/lib/Sisimai/Time.pm
     def to_json(*)
       return self.to_time.to_i

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '4.25.8'.freeze
+  VERSION = '4.25.12'.freeze
 end