sisimai 4.22.2-java → 4.22.3-java

data/lib/sisimai/reason/suspend.rb

@@ -20,18 +20,24 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             invalid/inactive[ ]user
-            # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
+             Boite[ ]du[ ]destinataire[ ]archivee.+[A-Z]{3}.+420
             |email[ ]account[ ]that[ ]you[ ]tried[ ]to[ ]reach[ ]is[ ]disabled
+            |invalid/inactive[ ]user
+            # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
             |is[ ]a[ ]deactivated[ ]mailbox
             |mailbox[ ](?:
                currently[ ]suspended
               |unavailable[ ]or[ ]access[ ]denied
               )
-            |user[ ]suspended   # http://mail.163.com/help/help_spam_16.htm
-            |recipient[ ]suspend[ ]the[ ]service
+            |recipient[ ](?:
+               rejected:[ ]Temporarily[ ]inactive
+              |suspend[ ]the[ ]service
+              )
             |sorry[ ]your[ ]message[ ]to[ ].+[ ]cannot[ ]be[ ]delivered[.][ ]this[ ]
               account[ ]has[ ]been[ ]disabled[ ]or[ ]discontinued
+            |The[ ]domain[ ].+[ ]is[ ]currently[ ]suspended
+            |User[ ].+[ ]temporary[ ]locked
+            |user[ ]suspended   # http://mail.163.com/help/help_spam_16.htm
             |vdelivermail:[ ]account[ ]is[ ]locked[ ]email[ ]bounced
             )
           }ix

data/lib/sisimai/reason/systemerror.rb

@@ -25,6 +25,7 @@ module Sisimai
           return nil unless argv1
           regex = %r{(?>
              can[']t[ ]create[ ]user[ ]output[ ]file
+            |Could[ ]not[ ]load[ ]DRD[ ]for[ ]domain
             |Internal[ ](?:
                error[ ]reading[ ]data                             # Microsoft
               |server[ ]error:[ ]Operation[ ]now[ ]in[ ]progress  # Microsoft

data/lib/sisimai/reason/toomanyconn.rb

@@ -26,6 +26,7 @@ module Sisimai
           regex = %r{(?>
              All[ ]available[ ]IPs[ ]are[ ]at[ ]maximum[ ]connection[ ]limit    # SendGrid
             |connection[ ]rate[ ]limit[ ]exceeded
+            |domain[ ].+[ ]has[ ]exceeded[ ]the[ ]max[ ]emails[ ]per[ ]hour[ ].+[ ]allowed
             |no[ ]IPs[ ]available[ ][-][ ].+[ ]exceeds[ ]per[-]domain[ ]connection[ ]limit[ ]for
             |Throttling[ ]failure:[ ](?:
                Daily[ ]message[ ]quota[ ]exceeded
@@ -35,8 +36,11 @@ module Sisimai
                connections
               |connections[ ]from[ ]your[ ]host[.]    # Microsoft
               |concurrent[ ]SMTP[ ]connections        # Microsoft
+              |errors[ ]from[ ]your[ ]IP              # Free.fr
               |SMTP[ ]sessions[ ]for[ ]this[ ]host    # Sendmail(daemon.c)
               )
+            |Trop[ ]de[ ]connexions,[ ].+[A-Z]{3}.+104
+            |We[ ]have[ ]already[ ]made[ ]numerous[ ]attempts[ ]to[ ]deliver[ ]this[ ]message
             )
           }ix
 

data/lib/sisimai/reason/userunknown.rb

@@ -31,65 +31,83 @@ module Sisimai
              .+[ ]user[ ]unknown
             |[#]5[.]1[.]1[ ]bad[ ]address
             |[<].+[>][ ]not[ ]found
-            |address[ ]does[ ]not[ ]exist
-            |address[ ]unknown
+            |[<].+[@].+[>][.][.][.][ ]Blocked[ ]by[ ]
+            |5[.]0[.]0[.][ ]Mail[ ]rejected[.]
+            |5[.]1[.]0[ ]Address[ ]rejected[.]
+            |Adresse[ ]d[ ]au[ ]moins[ ]un[ ]destinataire[ ]invalide.+[A-Z]{3}.+(?:416|418)
+            |address[ ](?:does[ ]not[ ]exist|unknown)
             |archived[ ]recipient
             |BAD[-_ ]RECIPIENT
             |can[']t[ ]accept[ ]user
-            |destination[ ]addresses[ ]were[ ]unknown
-            |destination[ ]server[ ]rejected[ ]recipients
-            |email[ ]address[ ]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                 # Linkedin
+              |recipient
               )
             |is[ ]not[ ](?:
                a[ ]known[ ]user
+              |a[ ]valid[ ]mailbox
               |an[ ]active[ ]address[ ]at[ ]this[ ]host
               )
             |mailbox[ ](?:
-               not[ ]present
-              |not[ ]found
+               .+[ ]does[ ]not[ ]exist
+              |.+[@].+[ ]unavailable
+              |invalid
+              |is[ ](?:inactive|unavailable)
+              |not[ ](?:present|found)
               |unavailable
               )
             |no[ ](?:
-               account[ ]by[ ]that[ ]name[ ]here
+               [ ].+[ ]in[ ]name[ ]directory
+              |account[ ]by[ ]that[ ]name[ ]here
+              |existe[ ](?:dicha[ ]persona|ese[ ]usuario[ ])
               |mail[ ]box[ ]available[ ]for[ ]this[ ]user
-              |mailbox[ ]found
+              |mailbox[ ](?:
+                 by[ ]that[ ]name[ ]is[ ]currently[ ]available
+                |found
+                )
               |matches[ ]to[ ]nameserver[ ]query
               |such[ ](?:
-                 mailbox
+                 address[ ]here
+                |mailbox
                 |person[ ]at[ ]this[ ]address
                 |recipient
                 |user(?:[ ]here)?
                 )
-              |[ ].+[ ]in[ ]name[ ]directory
+              |thank[ ]you[ ]rejected:[ ]Account[ ]Unavailable:
               |valid[ ]recipients[,][ ]bye    # Microsoft
               )
             |non[- ]?existent[ ]user
             |not[ ](?:
                a[ ]valid[ ]user[ ]here
               |a[ ]local[ ]address
+              |email[ ]addresses
               )
             |rcpt[ ][<].+[>][ ]does[ ]not[ ]exist
-            |recipient[ ](?:
+            |rece?ipient[ ](?:
                .+[ ]was[ ]not[ ]found[ ]in
               |address[ ]rejected:[ ](?:
-                 invalid[ ]user
+                 Access[ ]denied
+                |invalid[ ]user
                 |user[ ].+[ ]does[ ]not[ ]exist
                 |user[ ]unknown[ ]in[ ].+[ ]table
                 |unknown[ ]user
                 )
               |does[ ]not[ ]exist(?:[ ]on[ ]this[ ]system)?
               |is[ ]not[ ]local
-              |not[ ]found
-              |not[ ]OK
+              |not[ ](?:exist|found|OK)
               |unknown
               )
             |requested[ ]action[ ]not[ ]taken:[ ]mailbox[ ]unavailable
-            |RESOLVER[.]ADR[.]RecipNotFound # Microsoft
+            |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
             |sorry,[ ](?:
                user[ ]unknown
               |badrcptto
@@ -100,9 +118,11 @@ module Sisimai
               |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
+              |spectator[ ]does[ ]not[ ]exist
               |user[ ]doesn[']?t[ ]have[ ]a[ ].+[ ]account
               )
             |unknown[ ](?:
@@ -117,11 +137,11 @@ module Sisimai
               |.+[ ]does[ ]not[ ]exist
               |does[ ]not[ ]exist
               |missing[ ]home[ ]directory
-              |not[ ]found     # 550 User not found. See http://mail.bigmir.net/err/2/
-              |not[ ]known
+              |not[ ](?:active|found|known)
               |unknown
               )
             |vdeliver:[ ]invalid[ ]or[ ]unknown[ ]virtual[ ]user
+            |your[ ]envelope[ ]recipient[ ]is[ ]in[ ]my[ ]badrcptto[ ]list
             )
           }ix
 
@@ -140,7 +160,7 @@ module Sisimai
           return true if argvs.reason == Sisimai::Reason::UserUnknown.text
 
           require 'sisimai/smtp/status'
-          prematches = %w|NoRelaying Blocked MailboxFull HasMoved|
+          prematches = %w|NoRelaying Blocked MailboxFull HasMoved Blocked Rejected|
           matchother = false
           statuscode = argvs.deliverystatus || ''
           diagnostic = argvs.diagnosticcode || ''

data/lib/sisimai/reason/vacation.rb

@@ -9,7 +9,26 @@ module Sisimai
         def description
           return 'Email replied automatically due to a recipient is out of office'
         end
-        def match;   return nil; end
+
+        # Try to match that the given text and regular expressions
+        # @param    [String] argv1  String to be matched with regular expressions
+        # @return   [True,False]    false: Did not match
+        #                           true: Matched
+        def match(argv1)
+          return nil unless argv1
+          regex = %r{(?>
+             I[ ]am[ ](?:
+               away[ ](?:on[ ]vacation|until)
+              |out[ ]of[ ]the[ ]office
+              )
+            |I[ ]will[ ]be[ ]traveling[ ]for[ ]work[ ]on
+          )
+          }ix
+
+          return true if argv1 =~ regex
+          return false
+        end
+
         def true(*); return nil; end
       end
     end

data/lib/sisimai/reason/virusdetected.rb

@@ -29,7 +29,9 @@ module Sisimai
         def match(argv1)
           return nil unless argv1
           regex = %r{(?>
-             the[ ]message[ ]was[ ]rejected[ ]because[ ]it[ ]contains[ ]prohibited[ ]virus[ ]or[ ]spam[ ]content
+             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
             |Your[ ]message[ ]was[ ]infected[ ]with[ ]a[ ]virus
             )
           }ix

data/lib/sisimai/rfc3464.rb

@@ -68,7 +68,7 @@ module Sisimai
         require 'sisimai/address'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
+        hasdivided = mbody.scrub('?').split("\n")
         havepassed = ['']
         scannedset = Sisimai::MDA.scan(mhead, mbody)
         rfc822list = []   # (Array) Each line in message/rfc822 part string
@@ -372,7 +372,6 @@ module Sisimai
             |Error-for:[ ]+
             |Failed[ ]Recipient:[ ]
             |Failed[ ]to[ ]deliver[ ]to[ ]
-            |generated[ ]from[ ]
             |Intended[ ]recipient:[ ]
             |Mailbox[ ]is[ ]full:[ ]
             |RCPT[ ]To:
@@ -414,7 +413,7 @@ module Sisimai
               b['agent'] = self.smtpagent + '::Fallback'
               recipients += 1
 
-            elsif cv = e.match(/[(]expanded[ ]from:[ ]([^@]+[@][^@]+)[)]/)
+            elsif cv = e.match(/[(](?:expanded|generated)[ ]from:?[ ]([^@]+[@][^@]+)[)]/)
               # (expanded from: neko@example.jp)
               b['alias'] = Sisimai::Address.s3s4(cv[1])
             end
@@ -430,7 +429,7 @@ module Sisimai
           rfc822list.each do |e|
             # Check To: header in the original message
             next unless cv = e.match(/\ATo:\s*(.+)\z/)
-            r = Sisimai::Address.find(cv[1], true)
+            r = Sisimai::Address.find(cv[1], true) || []
             next if r.empty?
 
             if dscontents.size == recipients

data/lib/sisimai/rfc3834.rb

@@ -10,13 +10,18 @@ module Sisimai
         # https://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
         :'x-auto-response-suppress' => %r/(?:OOF|AutoReply)/i,
         :'precedence' => %r/\Aauto_reply\z/,
-        :'subject' => %r/\A(?:
+        :'subject' => %r/\A(?>
              Auto:
-            |Out[ ]of[ ]Office:
+            |Auto[ ]Response:
+            |Automatic[ ]reply:
+            |Out[ ]of[ ](?:the[ ])*Office:
           )
         /xi,
       }.freeze
-      Re1 = { :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/ }.freeze
+      Re1 = {
+        :boundary => %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/,
+        :endof    => %r/\A__END_OF_EMAIL_MESSAGE__\z/
+      }
       Re2 = {
         :subject => %r/(?:
              SECURITY[ ]information[ ]for  # sudo
@@ -26,6 +31,14 @@ module Sisimai
         :from    => %r/(?:root|postmaster|mailer-daemon)[@]/i,
         :to      => %r/root[@]/,
       }.freeze
+      ReV = %r{\A(?>
+         (?:.+?)?Re:
+        |Auto(?:[ ]Response):
+        |Automatic[ ]reply:
+        |Out[ ]of[ ]Office:
+        )
+        [ ]*(.+)\z
+      }xi
 
       def description; 'Detector for auto replied message'; end
       def smtpagent;   'RFC3834'; end
@@ -84,11 +97,13 @@ module Sisimai
         require 'sisimai/address'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
+        hasdivided = mbody.scrub('?').split("\n")
+        rfc822part = '' # (String) message/rfc822-headers part
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
         maxmsgline = 5  # (Integer) Max message length(lines)
         haveloaded = 0  # (Integer) The number of lines loaded from message body
         blanklines = 0  # (Integer) Counter for countinuous blank lines
+        countuntil = 1  # (Integer) Maximum value of blank lines in the body part
         v = dscontents[-1]
 
         # RECIPIENT_ADDRESS
@@ -107,16 +122,27 @@ module Sisimai
         end
         return nil unless recipients > 0
 
+        if mhead['content-type']
+          # Get the boundary string and set regular expression for matching with
+          # the boundary string.
+          require 'sisimai/mime'
+          b0 = Sisimai::MIME.boundary(mhead['content-type'], 0)
+          Re1[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
+        end
+
         # BODY_PARSER: Get vacation message
         hasdivided.each do |e|
           # Read the first 5 lines except a blank line
+          countuntil += 1 if e =~ Re1[:boundary]
+
           unless e.size > 0
             # Check a blank line
             blanklines += 1
-            break if blanklines > 1
+            break if blanklines > countuntil
             next
           end
           next unless e =~ / /
+          next if e =~ /\AContent-(?:Type|Transfer)/
 
           v['diagnosis'] ||= ''
           v['diagnosis']  += e + ' '
@@ -133,7 +159,12 @@ module Sisimai
         v['status']    = ''
 
         v.each_key { |a| v[a] ||= '' }
-        return { 'ds' => dscontents, 'rfc822' => '' }
+
+        if cv = mhead['subject'].match(ReV)
+          # Get the Subject header from the original message
+          rfc822part = sprintf("Subject: %s\n", cv[1])
+        end
+        return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end
 
     end

data/lib/sisimai/rhost.rb

@@ -8,8 +8,9 @@ module Sisimai
       # Imported from p5-Sisimail/lib/Sisimai/Rhost.pm
       RhostClass = {
         %r/\Aaspmx[.]l[.]google[.]com\z/                 => 'GoogleApps',
-        %r/[.]protection[.]outlook[.]com\z/              => 'ExchangeOnline',
+        %r/[.](?:prod|protection)[.]outlook[.]com\z/     => 'ExchangeOnline',
         %r/\A(?:smtp|mailstore1)[.]secureserver[.]net\z/ => 'GoDaddy',
+        %r/\b(?:laposte[.]net|orange[.]fr)\z/            => 'FrancePTT',
       }.freeze
 
       # Retrun the list of remote hosts Sisimai support

data/lib/sisimai/rhost/exchangeonline.rb

@@ -128,6 +128,12 @@ module Sisimai
               :regexp => %r/(?:Invalid[ ]arguments|Routing[ ]loop[ ]detected)/x,
             },
           ],
+          %r/\A5[.]4[.]14\z/ => [
+            {
+              :reason => 'networkerror',
+              :regexp => %r/Hop[ ]count[ ]exceeded/x
+            },
+          ],
           %r/\A5[.]5[.]2\z/ => [
             {
               :reason => 'syntaxerror',
@@ -239,6 +245,18 @@ module Sisimai
             },
           ],
         }.freeze
+        MesgTable = {
+          # Copied and converted from Sisimai::Bite::Email::Exchange2007
+          :expired       => %r/QUEUE[.]Expired/,
+          :hostunknown   => %r/SMTPSEND[.]DNS[.]NonExistentDomain/,
+          :mesgtoobig    => %r/RESOLVER[.]RST[.]Recip(?:ient)?SizeLimit/,
+          :networkerror  => %r/SMTPSEND[.]DNS[.]MxLoopback/,
+          :rejected      => %r/RESOLVER[.]RST[.]NotAuthorized/,
+          :securityerror => %r/RESOLVER[.]RST[.]AuthRequired/,
+          :systemerror   => %r/RESOLVER[.]ADR[.](?:Ambiguous|BadPrimary|InvalidInSmtp)/,
+          :toomanyconn   => %r/RESOLVER[.]ADR[.]Recip(?:ient)?Limit/,
+          :userunknown   => %r/RESOLVER[.]ADR[.](?:Ex)?Recip(?:ient)?NotFound/,
+        }.freeze
 
         # Detect bounce reason from Exchange Online
         # @param    [Sisimai::Data] argvs   Parsed email object
@@ -263,6 +281,17 @@ module Sisimai
             end
           end
 
+          if reasontext.empty?
+            # D.S.N. included in the error message did not matched with any key
+            # in CodeTable
+            MesgTable.each_key do |e|
+              # Try to match with error messages defined in MesgTable
+              next unless statusmesg =~ MesgTable[e]
+              reasontext = e.to_s
+              break
+            end
+          end
+
           return reasontext
         end
 

data/lib/sisimai/rhost/franceptt.rb

@@ -0,0 +1,58 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Data
+    # object as an argument of get() method when the value of "rhost" of the object
+    # is "*.laposte.net" or "*.orange.fr".
+    # This class is called only Sisimai::Data class.
+    module FrancePTT
+      class << self
+        # Imported from p5-Sisimail/lib/Sisimai/Rhost/FrancePTT.pm
+        CodeTable = {
+          :'103' => 'blocked',       # Service refuse. Veuillez essayer plus tard.
+          :'104' => 'toomanyconn',   # Too many connections, slow down. LPN105_104
+          :'105' => nil,             # Veuillez essayer plus tard.
+          :'109' => nil,             # Veuillez essayer plus tard. LPN003_109
+          :'201' => nil,             # Veuillez essayer plus tard. OFR004_201
+          :'305' => 'securityerror', # 550 5.7.0 Code d'authentification invalide OFR_305
+          :'401' => 'blocked',       # 550 5.5.0 SPF: *** is not allowed to send mail. LPN004_401
+          :'402' => 'securityerror', # 550 5.5.0 Authentification requise. Authentication Required. LPN105_402
+          :'403' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender.
+          :'405' => 'rejected',      # 5.0.1 Emetteur invalide. Invalid Sender. LPN105_405
+          :'415' => 'rejected',      # Emetteur invalide. Invalid Sender. OFR_415
+          :'416' => 'userunknown',   # 550 5.1.1 Adresse d au moins un destinataire invalide. Invalid recipient. LPN416
+          :'417' => 'mailboxfull',   # 552 5.1.1 Boite du destinataire pleine. Recipient overquota.
+          :'418' => 'userunknown',   # Adresse d au moins un destinataire invalide
+          :'420' => 'suspend',       # Boite du destinataire archivee. Archived recipient.
+          :'421' => 'rejected',      # 5.5.3 Mail from not owned by user. LPN105_421.
+          :'423' => nil,             # Service refused, please try later. LPN105_423
+          :'424' => nil,             # Veuillez essayer plus tard. LPN105_424
+          :'506' => 'spamdetected',  # Mail rejete. Mail rejected. OFR_506 [506]
+          :'510' => 'blocked',       # Veuillez essayer plus tard. service refused, please try later. LPN004_510 
+          :'513' => nil,             # Mail rejete. Mail rejected. OUK_513
+          :'514' => 'mesgtoobig',    # Taille limite du message atteinte
+        }.freeze
+
+        # Detect bounce reason from Oranage or La Poste
+        # @param    [Sisimai::Data] argvs   Parsed email object
+        # @return   [String]                The bounce reason for Orange or La Poste
+        def get(argvs)
+          return nil unless argvs
+          return nil unless argvs.is_a? Sisimai::Data
+          return argvs.reason if argvs.reason.size > 0
+
+          statusmesg = argvs.diagnosticcode
+          reasontext = ''
+
+          if cv = statusmesg.match(/\b(LPN|OFR|OUK)(_[0-9]{3}|[0-9]{3}[-_][0-9]{3})\b/)
+            # OUK_513, LPN105-104, OFR102-104
+            v = sprintf("%03d", (cv[1] + cv[2])[-3, 3])
+            reasontext = CodeTable[v.to_sym] || 'undefined'
+          end
+          return reasontext
+        end
+
+      end
+    end
+  end
+end
+