sisimai 4.25.6 → 4.25.11

data/lib/sisimai/lhost/postfix.rb

@@ -110,8 +110,7 @@ module Sisimai::Lhost
             #           The mail system
             #
             # <userunknown@example.co.jp>: host mx.example.co.jp[192.0.2.153] said: 550
-            # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-            # command)
+            # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
             if 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]
@@ -122,18 +121,12 @@ module Sisimai::Lhost
               emailsteak[1] << cv[1] << ': ' << cv[2] << "\n"
 
             else
-              if cv = e.match(/[ \t][(]in reply to ([A-Z]{4}).*/)
+              if cv = e.match(/[ \t][(]in reply to (?:end of )?([A-Z]{4}).*/) ||
+                 cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
                 # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                 commandset << cv[1]
                 anotherset['diagnosis'] ||= ''
                 anotherset['diagnosis'] << ' ' << e
-
-              elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                # to MAIL command)
-                commandset << cv[1]
-                anotherset['diagnosis'] ||= ''
-                anotherset['diagnosis'] << ' ' << e
-
               else
                 # Alternative error message and recipient
                 if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>] [(]expanded from [<](.+)[>][)]:[ \t]*(.+)\z/)

data/lib/sisimai/lhost/qmail.rb

@@ -23,29 +23,29 @@ module Sisimai::Lhost
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
         'data' => %r{(?:
-           (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
+           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
+          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
       }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
+         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
         |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )

data/lib/sisimai/lhost/sendgrid.rb

@@ -86,7 +86,7 @@ module Sisimai::Lhost
               # Arrival-Date: 2012-12-31 23-59-59
               next unless cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
               o[1] << 'Thu, ' << cv[3] + ' '
-              o[1] << Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
+              o[1] << Sisimai::DateTime.monthname(false)[cv[2].to_i - 1]
               o[1] << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
               o[1] << ' ' << Sisimai::DateTime.abbr2tz('CDT')
             else
@@ -124,7 +124,7 @@ module Sisimai::Lhost
           if e['status'] == '5.0.0' || e['status'] == '4.0.0'
             # Get the value of D.S.N. from the error message or the value of
             # Diagnostic-Code header.
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || e['status']
           end
 
           if e['action'] == 'expired'

data/lib/sisimai/lhost/sendmail.rb

@@ -184,7 +184,7 @@ module Sisimai::Lhost
 
           if anotherset['status']
             # Check alternative status code
-            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d\z/
+            if e['status'].empty? || e['status'] !~ /\A[45][.]\d[.]\d{1,3}\z/
               # Override alternative status code
               e['status'] = anotherset['status']
             end

data/lib/sisimai/lhost/verizon.rb

@@ -44,8 +44,8 @@ module Sisimai::Lhost
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 
@@ -93,8 +93,8 @@ module Sisimai::Lhost
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
-          rebackbone = Regexp.new('^' << Regexp.escape('--' << boundary00 << '--')) unless boundary00.empty?
+          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1)
+          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
           emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
           bodyslices = emailsteak[0].split("\n")
 

data/lib/sisimai/lhost/x3.rb

@@ -73,6 +73,10 @@ module Sisimai::Lhost
             elsif cv = e.match(/\ARouting: (.+)/)
               # Routing: Could not find a gateway for kijitora@example.co.jp
               v['diagnosis'] = cv[1]
+
+            elsif cv = e.match(/\ADiagnostic-Code: smtp; (.+)/)
+              # Diagnostic-Code: smtp; 552 5.2.2 Over quota
+              v['diagnosis'] = cv[1]
             end
           end
         end

data/lib/sisimai/lhost/x4.rb

@@ -19,7 +19,7 @@ module Sisimai::Lhost
         # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
         #  K = success, Z = temporary error, D = permanent error
         message: %r{\A(?>
-           He/Her[ ]is[ ]not.+[ ]user
+           He/Her[ ]is[ ]not[ ].+[ ]user
           |Hi[.][ ].+[ ]unable[ ]to[ ]deliver[ ]your[ ]message[ ]to[ ]
             the[ ]following[ ]addresses
           |Su[ ]mensaje[ ]no[ ]pudo[ ]ser[ ]entregado
@@ -41,29 +41,29 @@ module Sisimai::Lhost
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
+        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
+        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
+        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?.+ does not like recipient[.]/,
+        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
         'data' => %r{(?:
-           (?:Error:)?.+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
+           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
+          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
       }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
+         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
         |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
         |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
         )

data/lib/sisimai/lhost/x5.rb

@@ -39,13 +39,17 @@ module Sisimai::Lhost
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
+        # Pick the second message/rfc822 part because the format of email-x5-*.eml is nested structure
+        prefillets = mbody.split(ReBackbone, 2)
+        prefillets[1].sub!(/\A.+?\n\n/s, '')
+        emailsteak = Sisimai::RFC5322.fillet(prefillets[1], ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
+
         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.
@@ -56,7 +60,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators['deliverystatus']) == 0
+          next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
           v = dscontents[-1]

data/lib/sisimai/mail.rb

@@ -4,7 +4,6 @@ module Sisimai
   # Sisimai::Mail::Memory classes.
   class Mail
     # Imported from p5-Sisimail/lib/Sisimai/Mail.pm
-    Until = 'v4.25.10'
 
     # :path [String] path to mbox or Maildir/
     # :kind [String] Data type: mailbox, maildir, or stdin
@@ -25,7 +24,7 @@ module Sisimai
           # Sisimai::Mail.new('<STDIN>')
           classname = self.class.to_s << '::STDIN'
           parameter['kind'] = 'stdin'
-          parameter['path'] = $stdin
+          parameter['path'] = '<STDIN>'
         else
           # The argumenet is a mailbox or a Maildir/.
           mediatype = argv1.include?("\n") ? 'memory' : File.ftype(argv1)
@@ -52,6 +51,7 @@ module Sisimai
         # The argument neither a mailbox nor a Maildir/.
         classname = self.class.to_s << '::STDIN'
         parameter['kind'] = 'stdin'
+        parameter['path'] = '<STDIN>'
       end
       return nil unless classname
 
@@ -64,16 +64,6 @@ module Sisimai
       @data = parameter['data']
     end
 
-    def mail
-      warn " ***warning: Sisimai::Mail.mail will be removed at #{Until}. Use Sisimai::Mail.data instead"
-      return data
-    end
-
-    def type
-      warn " ***warning: Sisimai::Mail.type will be removed at #{Until}. Use Sisimai::Mail.kind instead"
-      return kind
-    end
-
     # Alias method of Sisimai::Mail.data.read()
     # @return   [String] Contents of mbox/Maildir
     def read
@@ -81,15 +71,6 @@ module Sisimai
       return data.read
     end
 
-    # Close the handle
-    # @return   [True,False]  true:  Successfully closed the handle
-    #                         false: Mail handle is not defined
-    def close
-      warn " ***warning: Sisimai::Mail.close will be removed at #{Until}. The handle automatically closes at the EOF"
-      return false unless data.handle
-      data.handle = nil
-      return true
-    end
   end
 end
 

data/lib/sisimai/mda.rb

@@ -7,7 +7,7 @@ module Sisimai
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
         # 12: "Your message to <%t> was automatically rejected:%n%r"
-        'dovecot'    => %r/\AYour message to .+ was automatically rejected:\z/,
+        'dovecot'    => %r/\AYour message to [^ ]+ was automatically rejected:\z/,
         'mail.local' => %r/\Amail[.]local: /,
         'procmail'   => %r/\Aprocmail: /,
         'maildrop'   => %r/\Amaildrop: /,
@@ -16,7 +16,7 @@ module Sisimai
       }.freeze
       MarkingsOf = {
         message: %r{\A(?>
-           Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
+           Your[ ]message[ ]to[ ][^ ]+[ ]was[ ]automatically[ ]rejected:\z
           |(?:mail[.]local|procmail|maildrop|vdelivermail|vdeliver):[ ]
           )
         }x

data/lib/sisimai/message.rb

@@ -32,102 +32,71 @@ module Sisimai
     #                                   value of the arguments are missing
     def initialize(data: '', **argvs)
       return nil if data.empty?
+      param = {}
       email = data.scrub('?').gsub("\r\n", "\n")
+      thing = { 'from' => '','header' => {}, 'rfc822' => '', ds => [], 'catch' => nil }
 
-      methodargv = { 'data' => email, 'hook' => argvs[:hook] || nil }
+      #methodargv = { 'data' => email, 'hook' => argvs[:hook] || nil }
+      # 1. Load specified MTA modules
       [:load, :order].each do |e|
         # Order of MTA modules
         next unless argvs[e]
         next unless argvs[e].is_a? Array
         next if argvs[e].empty?
-        methodargv[e.to_s] = argvs[e]
+        param[e.to_s] = argvs[e]
       end
+      tobeloaded = Sisimai::Message.load(param)
 
-      datasource = Sisimai::Message.make(methodargv)
-      return nil unless datasource
-      return nil unless datasource['ds']
-
-      @from   = datasource['from']
-      @header = datasource['header']
-      @ds     = datasource['ds']
-      @rfc822 = datasource['rfc822']
-      @catch  = datasource['catch'] || nil
-    end
-
-    # Check whether the object has valid content or not
-    # @return        [True,False]   returns true if the object is void
-    def void
-      return true unless @ds
-      return false
-    end
-
-    # Make data structure from the email message(a body part and headers)
-    # @param         [Hash] argvs   Email data
-    # @options argvs [String] data  Entire email message
-    # @options argvs [Array]  load  User defined MTA module list
-    # @options argvs [Array]  order The order of MTA modules
-    # @options argvs [Code]   hook  Reference to callback method
-    # @return        [Hash]         Resolved data structure
-    def self.make(argvs)
-      email = argvs['data']
-
-      hookmethod = argvs['hook'] || nil
-      processing = {
-        'from'   => '',  # From_ line
-        'header' => {},  # Email header
-        'rfc822' => '',  # Original message part
-        'ds'     => [],  # Parsed data, Delivery Status
-        'catch'  => nil, # Data parsed by callback method
-      }
-      methodargv = {
-        'load'  => argvs['load'] || [],
-        'order' => argvs['order'] || []
-      }
-      tobeloaded = Sisimai::Message.load(methodargv)
-
-      # 1. Split email data to headers and a body part.
+      # 2. Split email data to headers and a body part.
       return nil unless aftersplit = Sisimai::Message.divideup(email)
 
-      # 2. Convert email headers from text to hash reference
-      processing['from']   = aftersplit['from']
-      processing['header'] = Sisimai::Message.makemap(aftersplit['header'])
+      # 3. Convert email headers from text to hash reference
+      thing['from']   = aftersplit[0]
+      thing['header'] = Sisimai::Message.makemap(aftersplit[1])
 
-      # 3. Decode and rewrite the "Subject:" header
-      unless processing['header']['subject'].empty?
+      # 4. Decode and rewrite the "Subject:" header
+      unless thing['header']['subject'].empty?
         # Decode MIME-Encoded "Subject:" header
-        s = processing['header']['subject']
+        s = thing['header']['subject']
         q = Sisimai::MIME.is_mimeencoded(s) ? Sisimai::MIME.mimedecode(s.split(/[ ]/)) : s
 
         # Remove "Fwd:" string from the Subject: header
         if cv = q.downcase.match(/\A[ \t]*fwd?:[ ]*(.*)\z/)
           # Delete quoted strings, quote symbols(>)
           q = cv[1]
-          aftersplit['body'] = aftersplit['body'].gsub(/^[>]+[ ]/, '').gsub(/^[>]$/, '')
+          aftersplit[2] = aftersplit[2].gsub(/^[>]+[ ]/, '').gsub(/^[>]$/, '')
         end
-        processing['header']['subject'] = q
+        thing['header']['subject'] = q
       end
 
-      # 4. Rewrite message body for detecting the bounce reason
-      tryonfirst = Sisimai::Order.make(processing['header']['subject'])
-      methodargv = {
-        'hook' => hookmethod,
-        'mail' => processing,
-        'body' => aftersplit['body'],
-        'tryonfirst' => tryonfirst,
+      # 5. Rewrite message body for detecting the bounce reason
+      param = {
+        'hook' => argvs[:hook] || nil,
+        'mail' => thing,
+        'body' => aftersplit[2],
         'tobeloaded' => tobeloaded,
+        'tryonfirst' => Sisimai::Order.make(thing['header']['subject'])
       }
-      return nil unless bouncedata = Sisimai::Message.parse(methodargv)
+      return nil unless bouncedata = Sisimai::Message.parse(param)
       return nil if bouncedata.empty?
 
-      # 5. Rewrite headers of the original message in the body part
-      %w|ds catch rfc822|.each { |e| processing[e] = bouncedata[e] }
+      # 6. Rewrite headers of the original message in the body part
+      %w|ds catch rfc822|.each { |e| thing[e] = bouncedata[e] }
       p = bouncedata['rfc822']
-      p = aftersplit['body'] if p.empty?
-      processing['rfc822'] = p.is_a?(::String) ? Sisimai::Message.makemap(p, true) : p
-
-      return processing
+      p = aftersplit[2] if p.empty?
+      thing['rfc822'] = p.is_a?(::String) ? Sisimai::Message.makemap(p, true) : p
+
+      @from   = thing['from']
+      @header = thing['header']
+      @ds     = thing['ds']
+      @rfc822 = thing['rfc822']
+      @catch  = thing['catch'] || nil
     end
 
+    # Check whether the object has valid content or not
+    # @return        [True,False]   returns true if the object is void
+    def void; return @ds ? false : true; end
+
     # Load MTA modules which specified at 'order' and 'load' in the argument
     # @param         [Hash] argvs       Module information to be loaded
     # @options argvs [Array]  load      User defined MTA module list
@@ -171,28 +140,28 @@ module Sisimai
 
     # Divide email data up headers and a body part.
     # @param         [String] email  Email data
-    # @return        [Hash]          Email data after split
+    # @return        [Array]         Email data after split
     def self.divideup(email)
       return nil if email.empty?
 
-      block = { 'from' => '', 'header' => '', 'body' => '' }
+      block = ['', '', '']  # 0:From, 1:Header, 2:Body
       email.gsub!(/\r\n/, "\n")  if email.include?("\r\n")
       email.gsub!(/[ \t]+$/, '') if email =~ /[ \t]+$/
 
-      (block['header'], block['body']) = email.split(/\n\n/, 2)
-      return nil unless block['header']
-      return nil unless block['body']
+      (block[1], block[2]) = email.split(/\n\n/, 2)
+      return nil unless block[1]
+      return nil unless block[2]
 
-      if block['header'].start_with?('From ')
+      if block[1].start_with?('From ')
         # From MAILER-DAEMON Tue Feb 11 00:00:00 2014
-        block['from'] = block['header'].split(/\n/, 2)[0].delete("\r")
+        block[0] = block[1].split(/\n/, 2)[0].delete("\r")
       else
         # Set pseudo UNIX From line
-        block['from'] = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014'
+        block[0] = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014'
       end
 
-      block['header'] << "\n" unless block['header'].end_with?("\n")
-      block['body']   << "\n"
+      block[1] << "\n" unless block[1].end_with?("\n")
+      block[2] << "\n"
       return block
     end
 
@@ -307,12 +276,7 @@ module Sisimai
       if hookmethod.is_a? Proc
         # Call the hook method
         begin
-          p = {
-            'datasrc' => 'email',
-            'headers' => mailheader,
-            'message' => bodystring,
-            'bounces' => nil
-          }
+          p = { 'headers' => mailheader, 'message' => bodystring }
           havecaught = hookmethod.call(p)
         rescue StandardError => ce
           warn ' ***warning: Something is wrong in hook method :' << ce.to_s