sisimai 4.25.5-java → 4.25.11-java

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

@@ -16,18 +16,29 @@ module Sisimai
     module UserUnknown
       # Imported from p5-Sisimail/lib/Sisimai/Reason/UserUnknown.pm
       class << self
+        PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected]
+        ModulePath = {
+          'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
+          'Sisimai::Reason::Blocked'     => 'sisimai/reason/blocked',
+          'Sisimai::Reason::MailboxFull' => 'sisimai/reason/mailboxfull',
+          'Sisimai::Reason::HasMoved'    => 'sisimai/reason/hasmoved',
+          '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
@@ -35,7 +46,7 @@ module Sisimai
           |email[ ]address[ ](?:does[ ]not[ ]exist|could[ ]not[ ]be[ ]found)
           |invalid[ ](?:
              address
-            |mailbox:
+            |mailbox:?
             |mailbox[ ]path
             |recipient
             )
@@ -45,15 +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
@@ -70,23 +83,23 @@ module Sisimai
               |user(?:[ ]here)?
               )
             |thank[ ]you[ ]rejected:[ ]account[ ]unavailable:
-            |valid[ ]recipients[,][ ]bye    # Microsoft
+            |valid[ ]recipients,[ ]bye
             )
           |non[- ]?existent[ ]user
           |not[ ](?:
-             a[ ]valid[ ]user[ ]here
+             a[ ]valid[ ](?:recipient|user[ ]here)
             |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)?
@@ -95,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
@@ -113,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
@@ -123,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
           )
@@ -165,15 +178,13 @@ module Sisimai
             #   Status: 5.1.1
             #   Diagnostic-Code: SMTP; 550 5.1.1 <***@example.jp>:
             #     Recipient address rejected: User unknown in local recipient table
-            prematches = %w[NoRelaying Blocked MailboxFull HasMoved Blocked Rejected]
             matchother = false
-
-            while e = prematches.shift do
+            PreMatches.each do |e|
               # Check the value of "Diagnostic-Code" with other error patterns.
               p = 'Sisimai::Reason::' << e
               r = nil
               begin
-                require p.downcase.gsub('::', '/')
+                require ModulePath[p]
                 r = Module.const_get(p)
               rescue
                 warn '***warning: Failed to load ' << p

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

@@ -92,28 +92,15 @@ module Sisimai
         ['"]?[<]?([^\s\n\r@=<>]+[@][-.0-9A-Za-z]+[.][0-9A-Za-z]+)[>]?['"]?
       }xi.freeze
 
-
-      def description; 'Fallback Module for MTAs'; end
-      def smtpagent;   'RFC3464'; end
-      def headerlist;  return []; end
-
       # Detect an error for RFC3464
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or nil if it failed to parse or the
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
-        require 'sisimai/mda'
-
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         bodyslices = mbody.scrub('?').split("\n")
         readslices = ['']
-        mdabounced = Sisimai::MDA.make(mhead, mbody)
         rfc822text = ''   # (String) message/rfc822 part text
         maybealias = nil  # (String) Original-Recipient Field
         blanklines = 0    # (Integer) The number of blank lines
@@ -187,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)
 
@@ -297,7 +284,7 @@ module Sisimai
               elsif readslices[-2].start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                 # Continued line of the value of Diagnostic-Code header
                 v['diagnosis'] << ' ' << cv[1]
-                e = 'Diagnostic-Code: ' << e
+                readslices[-1] = 'Diagnostic-Code: ' << e
               else
                 if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                   # 2.2.2 The Reporting-MTA DSN field
@@ -384,7 +371,6 @@ module Sisimai
           bodyslices = mbody.split("\n")
           while e = bodyslices.shift do
             # Get the recipient's email address and error messages.
-            break if e.start_with?('__END_OF_EMAIL_MESSAGE__')
             d = e.downcase
             break if d =~ MarkingsOf[:rfc822]
             break if d =~ ReStop
@@ -405,7 +391,6 @@ module Sisimai
                 b = dscontents[-1]
               end
               b['recipient'] = y
-              b['agent'] = self.smtpagent + '::Fallback'
               recipients += 1
               itisbounce ||= true
 
@@ -428,12 +413,13 @@ module Sisimai
             dscontents << Sisimai::Lhost.DELIVERYSTATUS if dscontents.size == recipients
             b = dscontents[-1]
             b['recipient'] = r[0][:address]
-            b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
             recipients += 1
           end
         end
         return nil unless recipients > 0
 
+        require 'sisimai/mda'
+        mdabounced = Sisimai::MDA.make(mhead, mbody)
         dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -453,13 +439,10 @@ module Sisimai
 
           if mdabounced
             # Make bounce data by the values returned from Sisimai::MDA.make()
-            e['agent']     = mdabounced['mda'] || self.smtpagent
+            e['agent']     = mdabounced['mda'] || 'RFC3464'
             e['reason']    = mdabounced['reason'] || 'undefined'
             e['diagnosis'] = mdabounced['message'] unless mdabounced['message'].empty?
             e['command']   = ''
-          else
-            # Set the value of smtpagent
-            e['agent'] = self.smtpagent
           end
 
           e['status'] ||= Sisimai::SMTP::Status.find(e['diagnosis']) || ''
@@ -467,12 +450,11 @@ module Sisimai
             e['command'] = cv[1]
           end
           e['date'] ||= mhead['date']
-          e.each_key { |a| e[a] ||= '' }
         end
 
         return { 'ds' => dscontents, 'rfc822' => rfc822text }
       end
-
+      def description; 'Fallback Module for MTAs'; end
     end
   end
 end

data/lib/sisimai/rfc3834.rb

@@ -38,21 +38,11 @@ module Sisimai
         [ ]*(.+)\z
       }xi.freeze
 
-      def description; 'Detector for auto replied message'; end
-      def smtpagent;   'RFC3834'; end
-      def headerlist;  return %w[auto-submitted precedence x-auto-response-suppress x-apple-action]; end
-
       # Detect auto reply message as RFC3834
-      # @param         [Hash] mhead       Message header of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
-      #                                   or nil if it failed to parse or the
-      #                                   arguments are missing
+      # @param  [Hash] mhead    Message headers of a bounce email
+      # @param  [String] mbody  Message body of a bounce email
+      # @return [Hash]          Bounce data list and message/rfc822 part
+      # @return [Nil]           it failed to parse or the arguments are missing
       def make(mhead, mbody)
         leave = 0
         match = 0
@@ -109,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
 
@@ -136,19 +126,16 @@ module Sisimai
         v['diagnosis'] ||= mhead['subject']
         v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
         v['reason']    = 'vacation'
-        v['agent']     = self.smtpagent
         v['date']      = mhead['date']
         v['status']    = ''
 
-        v.each_key { |a| v[a] ||= '' }
-
         if cv = mhead['subject'].match(SubjectSet)
           # Get the Subject header from the original message
           rfc822part = 'Subject: ' << cv[1] + "\n"
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end
-
+      def description; 'Detector for auto replied message'; end
     end
   end
 end

data/lib/sisimai/rfc5322.rb

@@ -64,9 +64,8 @@ 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
-      LongHeaders = Sisimai::RFC5322.LONGFIELDS
 
       # Check that the argument is an email address or not
       # @param    [String] email  Email address string
@@ -192,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