sisimai 4.25.4 → 4.25.5

data/lib/sisimai/mime.rb

@@ -134,9 +134,9 @@ module Sisimai
         encodename = nil
         ctencoding = nil
         mimeinside = false
-        hasdivided = argv1.split("\n")
+        textslices = argv1.split("\n")
 
-        while e = hasdivided.shift do
+        while e = textslices.shift do
           # This is a multi-part message in MIME format. Your mail reader does not
           # understand MIME message format.
           # --=_gy7C4Gpes0RP4V5Bs9cK4o2Us2ZT57b-3OLnRN+4klS8dTmQ

data/lib/sisimai/order.rb

@@ -79,12 +79,6 @@ module Sisimai
         'Sisimai::Lhost::SurfControl',
       ].freeze
 
-      OrderJ1 = [
-        # These modules support JSON structure
-        'Sisimai::Lhost::AmazonSES',
-        'Sisimai::Lhost::SendGrid',
-      ].freeze
-
       # This variable don't hold MTA name which have one or more MTA specific
       # header such as X-AWS-Outgoing, X-Yandex-Uniq.
       Pattern = {
@@ -183,7 +177,7 @@ module Sisimai
       # @return   [Hash]          Pattern table for the group
       def by(group = '')
         return {} if group.empty?
-        return Pattern[group] if Pattern.key?(group)
+        return Pattern[group] if Pattern[group]
         return {}
       end
       Subject = Sisimai::Order.by('subject').freeze
@@ -216,7 +210,7 @@ module Sisimai
 
           Module.const_get(e).headerlist.each do |v|
             # Get header name which required each MTA module
-            next if Skips.key?(v)
+            next if Skips[v]
             table[v] ||= []
             table[v] << e
           end
@@ -224,25 +218,6 @@ module Sisimai
         return table
       end
 
-      # @abstract Make default order of MTA(JSON) modules to be loaded
-      # @return   [Array] Default order list of MTA(JSON) modules
-      # @until    v4.25.5
-      def forjson; return OrderJ1; end
-
-      # @abstract Print warnings about an obsoleted method. This method will be
-      #           removed at the future release of Sisimai
-      # @until    v4.25.6
-      def warn(whois = '', useit = nil)
-        label = ' ***warning:'
-        methodname = caller[0][/`.*'/][1..-2]
-        messageset = sprintf("%s %s.%s is marked as obsoleted", label, whois, methodname)
-
-        useit ||= methodname
-        messageset << sprintf(" and will be removed at %s.", Sisimai::Lhost.removedat)
-        messageset << sprintf(" Use %s.%s instead.\n", self.name, useit) if useit != 'gone'
-        Kernel.warn messageset
-      end
-
     end
   end
 end

data/lib/sisimai/reason.rb

@@ -52,16 +52,14 @@ module Sisimai
         return nil unless argvs
         return nil unless argvs.is_a? Sisimai::Data
 
-        unless GetRetried.key?(argvs.reason)
+        unless GetRetried[argvs.reason]
           # Return reason text already decided except reason match with the
           # regular expression of retry() method.
           return argvs.reason unless argvs.reason.empty?
         end
+        return 'delivered' if argvs.deliverystatus.start_with?('2.')
 
-        statuscode = argvs.deliverystatus || ''
         reasontext = ''
-        return 'delivered' if statuscode.start_with?('2.')
-
         if argvs.diagnostictype == 'SMTP' || argvs.diagnostictype == ''
           # Diagnostic-Code: SMTP; ... or empty value
           ClassOrder[0].each do |e|
@@ -119,7 +117,7 @@ module Sisimai
           while true
             diagnostic   = argvs.diagnosticcode.downcase || ''
             trytomatch   = reasontext.empty? ? true : false
-            trytomatch ||= true if GetRetried.key?(reasontext)
+            trytomatch ||= true if GetRetried[reasontext]
             trytomatch ||= true if argvs.diagnostictype != 'SMTP'
             throw :TRY_TO_MATCH unless trytomatch
 

data/lib/sisimai/rfc1894.rb

@@ -127,7 +127,7 @@ module Sisimai
 
             # Correct invalid value in Action field:
             break unless group == 'list'
-            break unless Correction[:action].key?(match[2])
+            break unless Correction[:action][match[2]]
             match[2] = Correction[:action][match[2]]
           end
           break

data/lib/sisimai/rfc3464.rb

@@ -16,12 +16,15 @@ module Sisimai
             )
           |the[ ]original[ ]message[ ]was[ ]received[ ]at[ ]
           |this[ ]report[ ]relates[ ]to[ ]your[ ]message
-          |your[ ]message[ ]was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
+          |your[ ]message[ ](?:
+             could[ ]not[ ]be[ ]delivered
+            |was[ ]not[ ]delivered[ ]to[ ]the[ ]following[ ]recipients
+            )
           )
         }x,
         rfc822:  %r{\A(?>
            content-type:[ ]*(?:message/rfc822|text/rfc822-headers)
-          |return-path:[ ]*[<].+[>]\z
+          |return-path:[ ]*[<].+[>]
           )\z
         }x,
         error:   %r/\A(?:[45]\d\d[ \t]+|[<][^@]+[@][^@]+[>]:?[ \t]+)/,
@@ -108,10 +111,10 @@ module Sisimai
         require 'sisimai/mda'
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.scrub('?').split("\n")
-        havepassed = ['']
+        bodyslices = mbody.scrub('?').split("\n")
+        readslices = ['']
         mdabounced = Sisimai::MDA.make(mhead, mbody)
-        rfc822list = []   # (Array) Each line in message/rfc822 part string
+        rfc822text = ''   # (String) message/rfc822 part text
         maybealias = nil  # (String) Original-Recipient Field
         blanklines = 0    # (Integer) The number of blank lines
         readcursor = 0    # (Integer) Points the current cursor position
@@ -124,11 +127,11 @@ module Sisimai
         }
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
+          readslices << e # Save the current line for the next loop
           d = e.downcase
-          p = havepassed[-2]
 
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
@@ -153,7 +156,7 @@ module Sisimai
               break if blanklines > 1
               next
             end
-            rfc822list << e
+            rfc822text << e << "\n"
           else
             # Error message part
             next unless readcursor & Indicators[:deliverystatus] > 0
@@ -291,7 +294,7 @@ module Sisimai
                 # Diagnostic-Code: 554 ...
                 v['diagnosis'] = cv[1]
 
-              elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
+              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
@@ -378,8 +381,8 @@ module Sisimai
           break unless match > 0
 
           b = dscontents[-1]
-          hasdivided = mbody.split("\n")
-          while e = hasdivided.shift do
+          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
@@ -418,15 +421,11 @@ module Sisimai
         end
         return nil unless itisbounce
 
-        unless recipients > 0
-          # Try to get a recipient address from email headers
-          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) || []
-            next if r.empty?
+        if recipients == 0 && cv = rfc822text.match(/^To:[ ]*(.+)/)
+          # Try to get a recipient address from "To:" header of the original message
+          if r = Sisimai::Address.find(cv[1], true)
+            # Found a recipient address
             dscontents << Sisimai::Lhost.DELIVERYSTATUS if dscontents.size == recipients
-
             b = dscontents[-1]
             b['recipient'] = r[0][:address]
             b['agent'] = Sisimai::RFC3464.smtpagent + '::Fallback'
@@ -439,14 +438,16 @@ module Sisimai
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-          if e.key?('alterrors') && !e['alterrors'].empty?
+          if e['alterrors']
             # Copy alternative error message
-            e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
-              # Override the value of diagnostic code message
-              e['diagnosis'] = e['alterrors'] unless e['alterrors'].empty?
+            unless e['alterrors'].empty?
+              e['diagnosis'] ||= e['alterrors']
+              if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
+                # Override the value of diagnostic code message
+                e['diagnosis'] = e['alterrors']
+              end
+              e.delete('alterrors')
             end
-            e.delete('alterrors')
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
@@ -469,8 +470,7 @@ module Sisimai
           e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => rfc822text }
       end
 
     end

data/lib/sisimai/rfc3834.rb

@@ -10,6 +10,7 @@ module Sisimai
         'auto-submitted' => %r/\Aauto-(?:generated|replied|notified)/,
         # https://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
         'x-auto-response-suppress' => %r/(?:oof|autoreply)/,
+        'x-apple-action' => %r/\Avacation\z/,
         'precedence' => %r/\Aauto_reply\z/,
         'subject' => %r/\A(?>
              auto:
@@ -39,7 +40,7 @@ module Sisimai
 
       def description; 'Detector for auto replied message'; end
       def smtpagent;   'RFC3834'; end
-      def headerlist;  return %w[auto-submitted precedence x-auto-response-suppress]; 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
@@ -59,7 +60,7 @@ module Sisimai
         # DETECT_EXCLUSION_MESSAGE
         Excludings.each_key do |e|
           # Exclude message from root@
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           next unless mhead[e].downcase =~ Excludings[e]
           leave = 1
@@ -70,7 +71,7 @@ module Sisimai
         # DETECT_AUTO_REPLY_MESSAGE
         AutoReply1.each_key do |e|
           # RFC3834 Auto-Submitted and other headers
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           next unless mhead[e].downcase =~ AutoReply1[e]
           match += 1
@@ -80,7 +81,7 @@ module Sisimai
 
         require 'sisimai/lhost'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.scrub('?').split("\n")
+        bodyslices = 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)
@@ -92,7 +93,7 @@ module Sisimai
         # RECIPIENT_ADDRESS
         %w[from return-path].each do |e|
           # Try to get the address of the recipient
-          next unless mhead.key?(e)
+          next unless mhead[e]
           next unless mhead[e]
           v['recipient'] = mhead[e]
           break
@@ -113,7 +114,7 @@ module Sisimai
         end
 
         # BODY_PARSER: Get vacation message
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
           # Read the first 5 lines except a blank line
           countuntil += 1 if e =~ MarkingsOf[:boundary]
 

data/lib/sisimai/rfc5322.rb

@@ -57,7 +57,7 @@ module Sisimai
       # @return   [Array,Hash]    RFC822 Header list
       def HEADERFIELDS(group = '')
         return HeaderIndex if group.empty?
-        return HeaderTable[group] if HeaderTable.key?(group)
+        return HeaderTable[group] if HeaderTable[group]
         return HeaderTable
       end
 
@@ -177,37 +177,26 @@ module Sisimai
         return hosts
       end
 
-      # Weed out rfc822/message header fields excepct necessary fields
-      # @param    [Array] argv1  each line divided message/rc822 part
-      # @return   [String]       Selected fields
-      def weedout(argv1)
-        return nil unless argv1.is_a?(Array)
-
-        rfc822next = { from: false, to: false, subject: false }
-        rfc822part = '' # (String) message/rfc822-headers part
-        previousfn = '' # (String) Previous field name
-
-        while e = argv1.shift do
-          # After "message/rfc822"
-          if e.start_with?(' ', "\t")
-            # Continued line from the previous line
-            next if rfc822next[previousfn]
-            rfc822part << e + "\n" if LongHeaders.key?(previousfn)
-          else
-            # Get required headers only
-            (lhs, rhs) = e.split(/:[ ]*/, 2)
-            next unless lhs
-            lhs.downcase!
-
-            previousfn = ''
-            next unless HeaderIndex.key?(lhs)
-
-            previousfn  = lhs
-            rfc822part << e + "\n"
-          end
+      # Split given entire message body into error message lines and the original
+      # message part only include email headers
+      # @param    [String] mbody  Entire message body
+      # @param    [Regexp] regex  Regular expression of the message/rfc822 or the
+      #                           beginning of the original message part
+      # @return   [Array]         [Error message lines, The original message]
+      # @since    v4.25.5
+      def fillet(mbody = '', regex)
+        return nil if mbody.empty?
+        return nil unless regex
+
+        v = mbody.split(regex, 2)
+        v[1] ||= ''
+
+        unless v[1].empty?
+          v[1].sub(/\A[\r\n\s]+/, '')
+          v[1].sub(/\n\n.+\z/m, '')
+          v[1] << "\n" unless v[1].end_with?("\n")
         end
-
-        return rfc822part
+        return v
       end
 
     end

data/lib/sisimai/rhost/franceptt.rb

@@ -8,28 +8,124 @@ module Sisimai
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/FrancePTT.pm
         ErrorCodes = {
-          '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
+          # 550 5.7.1 Service unavailable; client [X.X.X.X] blocked using Spamhaus
+          # Les emails envoyes vers la messagerie Laposte.net ont ete bloques par nos services.
+          # Afin de regulariser votre situation, nous vous invitons a cliquer sur le lien ci-dessous et a suivre la procedure.
+          # The emails sent to the mail host Laposte.net were blocked by our services.
+          # To regularize your situation please click on the link below and follow the procedure
+          # https://www.spamhaus.org/lookup/ LPNAAA_101 (in reply to RCPT TO command))
+          '101' => 'blocked',
+
+          # 550 mwinf5c04 ME Adresse IP source bloquee pour incident de spam.
+          # Client host blocked for spamming issues. OFR006_102 Ref
+          #
+          # refused to talk to me: 550 5.5.0 Les emails envoyes vers la messagerie Laposte.net ont ete bloques par nos services.
+          # Afin de regulariser votre situation, nous vous invitons a cliquer sur le lien ci-dessous et a suivre la procedure.
+          # The emails sent to the mail host Laposte.net were blocked by our services.
+          # To regularize your situation please click on the link below and follow the procedure
+          # https://senderscore.org/blacklistlookup/  LPN007_102
+          '102' => 'blocked',
+
+          # refused to talk to me: 550 mwinf5c10 ME Service refuse. Veuillez essayer plus tard.
+          # Service refused, please try later. OFR006_103 X.X.X.X [103]
+          '103' => 'blocked',
+
+          # refused to talk to me: 421 mwinf5c79 ME Trop de connexions, veuillez verifier votre configuration.
+          # Too many connections, slow down. OFR005_104 [104]
+          # Too many connections, slow down. LPN105_104
+          '104' => 'toomanyconn',
+
+          # Veuillez essayer plus tard.
+          '105' => nil,
+
+          # refused to talk to me: 421 4.2.1 Service refuse. Veuillez essayer plus tard.
+          # Service refused, please try later. LPN006_107)
+          '107' => nil,
+
+          # refused to talk to me: 550 5.5.0 Service refuse. Veuillez essayer plus tard.
+          # service refused, please try later. LPN001_108
+          '108' => nil,
+
+          # Veuillez essayer plus tard. LPN003_109
+          '109' => nil,
+
+          # Veuillez essayer plus tard. OFR004_201
+          '201' => nil,
+
+          # 550 5.7.0 Code d'authentification invalide OFR_305
+          '305' => 'securityerror',
+
+          # 550 5.5.0 SPF: *** is not allowed to send mail. LPN004_401
+          '401' => 'blocked',
+
+          # 550 5.5.0 Authentification requise. Authentication Required. LPN105_402
+          '402' => 'securityerror',
+
+          # 5.0.1 Emetteur invalide. Invalid Sender.
+          '403' => 'rejected',
+
+          # 5.0.1 Emetteur invalide. Invalid Sender. LPN105_405
+          # 501 5.1.0 Emetteur invalide. Invalid Sender. OFR004_405 [405] (in reply to MAIL FROM command))
+          '405' => 'rejected',
+
+          # Emetteur invalide. Invalid Sender. OFR_415
+          '415' => 'rejected',
+
+          # 550 5.1.1 Adresse d au moins un destinataire invalide.
+          # Invalid recipient. LPN416 (in reply to RCPT TO command)
+          # Invalid recipient. OFR_416 [416] (in reply to RCPT TO command)
+          '416' => 'userunknown',
+
+          # 552 5.1.1 Boite du destinataire pleine.
+          # Recipient overquota. OFR_417 [417] (in reply to RCPT TO command))
+          '417' => 'mailboxfull',
+
+          # Adresse d au moins un destinataire invalide
+          '418' => 'userunknown',
+
+          # 550 5.5.0 Boite du destinataire archivee.
+          # Archived recipient. LPN007_420 (in reply to RCPT TO command)
+          '420' => 'suspend',
+
+          # 5.5.3 Mail from not owned by user. LPN105_421.
+          '421' => 'rejected',
+
+          # Service refused, please try later. LPN105_423
+          '423' => nil,
+
+          # Veuillez essayer plus tard. LPN105_424
+          '424' => nil,
+
+          # 550 5.5.0 Le compte du destinataire est bloque. The recipient account isblocked. LPN007_426 (in reply to RCPT TO command)
+          '426' => 'suspend',
+
+          # 421 4.2.0 Service refuse. Veuillez essayer plus tard.
+          # Service refused, please try later. OFR005_505 [505] (in reply to end of DATA command)
+          #
+          # 421 4.2.1 Service refuse. Veuillez essayer plus tard.
+          # Service refused, please try later. LPN007_505 (in reply to end of DATA command)
+          '505' => 'systemerror',
+
+          # Mail rejete. Mail rejected. OFR_506 [506]
+          '506' => 'spamdetected',
+
+          # 550 5.5.0 Service refuse. Veuillez essayer plus tard.
+          # service refused, please try later. LPN005_510 (in reply to end of DATA command)
+          '510' => 'blocked',
+
+          # Mail rejete. Mail rejected. OUK_513
+          '513' => nil,
+
+          # Taille limite du message atteinte
+          '514' => 'mesgtoobig',
+
+          # 571 5.7.1 Message refused, DMARC verification Failed.
+          # Message refuse, verification DMARC en echec LPN007_517
+          '517' => 'policyviolation',
+
+          # 421 mwinf5c77 ME Service refuse. Veuillez essayer plus tard.
+          # Service refused, please try later. OFR_999 [999]
+          '999' => 'blocked',
         }.freeze
 
         # Detect bounce reason from Oranage or La Poste
@@ -41,8 +137,8 @@ module Sisimai
           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
+          if cv = statusmesg.match(/\b(LPN|LPNAAA|OFR|OUK)(_[0-9]{3}|[0-9]{3}[-_][0-9]{3})\b/i)
+            # OUK_513, LPN105-104, OFR102-104, ofr_506
             v = sprintf("%03d", (cv[1] + cv[2])[-3, 3])
             reasontext = ErrorCodes[v] || 'undefined'
           end