sisimai 5.1.0 → 5.2.0

data/lib/sisimai/lhost/sendmail.rb

@@ -4,6 +4,7 @@ module Sisimai::Lhost
   module Sendmail
     class << self
       require 'sisimai/lhost'
+      require 'sisimai/rfc1123'
       require 'sisimai/smtp/reply'
       require 'sisimai/smtp/status'
       require 'sisimai/smtp/command'
@@ -55,24 +56,25 @@ module Sisimai::Lhost
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
-            # Beginning of the bounce message or message/delivery-status part
+            # Beginning of the bounce message or the message/delivery-status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
 
-          if f = Sisimai::RFC1894.match(e)
+          f = Sisimai::RFC1894.match(e)
+          if f > 0
             # "e" matched with any field defined in RFC3464
             o = Sisimai::RFC1894.field(e) || next
             v = dscontents[-1]
 
-            if o[-1] == 'addr'
+            if o[3] == 'addr'
               # Final-Recipient: rfc822; kijitora@example.jp
               # X-Actual-Recipient: rfc822; kijitora@example.co.jp
               if o[0] == 'final-recipient'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                if v['recipient']
+                if v["recipient"] != ""
                   # There are multiple recipient addresses in the message body.
                   dscontents << Sisimai::Lhost.DELIVERYSTATUS
                   v = dscontents[-1]
@@ -83,16 +85,17 @@ module Sisimai::Lhost
                 # X-Actual-Recipient: rfc822; kijitora@example.co.jp
                 v['alias'] = o[2]
               end
-            elsif o[-1] == 'code'
+            elsif o[3] == 'code'
               # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
               v['spec'] = o[1]
               v['diagnosis'] = o[2]
             else
               # Other DSN fields defined in RFC3464
               next unless fieldtable[o[0]]
+              next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f
+              next unless f == 1
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -109,15 +112,15 @@ module Sisimai::Lhost
             # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
             unless e.start_with?(' ')
               if e.start_with?('>>> ')
-                # >>> DATA
-                thecommand = Sisimai::SMTP::Command.find(e)
+                # >>> DATA (Client Command)
+                thecommand = Sisimai::SMTP::Command.find(e) if thecommand.empty?
 
               elsif e.start_with?('<<< ')
-                # <<< Response
+                # <<< Response from the SMTP server
                 cv = e[4, e.size - 4]
                 esmtpreply << cv unless esmtpreply.index(cv)
               else
-                # Detect SMTP session error or connection error
+                # Detect an SMTP session error or a connection error
                 next if sessionerr
                 if e.start_with?(StartingOf[:error][0])
                   # ----- Transcript of session follows -----
@@ -134,8 +137,8 @@ module Sisimai::Lhost
                   # ----- Transcript of session follows -----
                   # Message could not be delivered for too long
                   # Message will be deleted from queue
-                  cr = Sisimai::SMTP::Reply.find(e)  || ''
-                  cs = Sisimai::SMTP::Status.find(e) || ''
+                  cr = Sisimai::SMTP::Reply.find(e)
+                  cs = Sisimai::SMTP::Status.find(e)
 
                   if cr.size + cs.size > 7
                     # 550 5.1.2 <kijitora@example.org>... Message
@@ -167,13 +170,12 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['diagnosis'] ||= ''
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           if anotherset['diagnosis']
             # Copy alternative error message
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].start_with?(' ')
-            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].=~ /\A\d+\z/
+            e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'] =~ /\A\d+\z/
             e['diagnosis'] = anotherset['diagnosis'] if e['diagnosis'].empty?
           end
 
@@ -188,10 +190,9 @@ module Sisimai::Lhost
           end
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['command'] ||= thecommand || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
-          if e['command'].empty?
-            e['command'] = 'EHLO' unless esmtpreply.empty?
-          end
+          e["command"]   = thecommand if e["command"].empty?
+          e["command"]   = Sisimai::SMTP::Command.find(e['diagnosis']) if e["command"].empty?
+          e["command"]   = "EHLO" if e["command"].empty? && esmtpreply.size > 0
 
           while true
             # Check alternative status code and override it

data/lib/sisimai/lhost/v5sendmail.rb

@@ -25,7 +25,7 @@ module Sisimai::Lhost
         #   savemail.c:497|   while (fgets(buf, sizeof buf, xfile) != NULL)
         #   savemail.c:498|       putline(buf, fp, m);
         #   savemail.c:499|   (void) fclose(xfile);
-        error:   [' while talking to '],
+        error:   ['While talking to '],
         message: ['----- Transcript of session follows -----'],
       }.freeze
 
@@ -41,15 +41,15 @@ module Sisimai::Lhost
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         return nil unless emailparts[1].size > 0
 
+        require 'sisimai/rfc1123'
         require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        anotherset = {}     # (Hash) Another error information
-        responding = []     # (Array) Responses from remote server
-        commandset = []     # (Array) SMTP command which is sent to remote server
-        errorindex = -1     # (Integer)
+        anotherone = {}     # (Hash) Another error information
+        remotehost = ""     # The last remote hostname
+		    curcommand = ""     # The last SMTP command
         v = nil
 
         while e = bodyslices.shift do
@@ -70,75 +70,103 @@ module Sisimai::Lhost
           # 550 <kijitora@example.org>... User unknown
           # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
           v = dscontents[-1]
+          curcommand = Sisimai::SMTP::Command.find(e) if e.start_with?(">>> ")
 
-          if e.start_with?('5', '4') && Sisimai::String.aligned(e, [' <', '@', '>...'])
+          if Sisimai::String.aligned(e, [' <', '@', '>...']) || e.upcase.include?(">>> RCPT TO:")
             # 550 <kijitora@example.org>... User unknown
-            if v['recipient']
-              # There are multiple recipient addresses in the message body.
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-              v = dscontents[-1]
-            end
-            p1 = e.index('<', 0)
-            p2 = e.index('>...')
-            v['recipient'] = e[p1 + 1, p2 - p1 - 1]
-            v['diagnosis'] = e[p2 + 5, e.size]
-
-            # Concatenate the response of the server and error message
-            v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
-            recipients += 1
-
-          elsif e.start_with?('>>> ')
             # >>> RCPT To:<kijitora@example.org>
-            cv = Sisimai::SMTP::Command.find(e); commandset[recipients] = cv if cv
-
-          elsif e.start_with?('<<< ')
-            # <<< Response
-            # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
-            # <<< 550 Requested User Mailbox not found. No such user here.
-            responding[recipients] = e[4, e.size]
+            p0 = e.index(" ")
+            p1 = e.index("<", p0)
+            p2 = e.index(">", p1)
+            cv = Sisimai::Address.s3s4(e[p1, p2 - p1 + 1])
+
+            if remotehost == ""
+              # Keep error messages before "While talking to ..." line
+              anotherone[recipients] ||= ""; anotherone[recipients] << " " << e
+              next
+            end
 
+            if cv == v["recipient"] || (curcommand == "MAIL" && e.start_with?("<<< "))
+              # The recipient address is the same address with the last appeared address
+              # like "550 <mikeneko@example.co.jp>... User unknown"
+              # Append this line to the string which is keeping error messages
+              v["diagnosis"] << " " << e
+              v["replycode"] = Sisimai::SMTP::Reply.find(e)
+              curcommand     = ""
+            else
+              # The recipient address in this line differs from the last appeared address
+              # or is the first recipient address in this bounce message
+              if v["recipient"] != ""
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              recipients += 1
+              v["recipient"] = cv
+              v["rhost"]     = remotehost
+              v["replycode"] = Sisimai::SMTP::Reply.find(e)
+              v["diagnosis"] << " " << e
+              v["command"]   = curcommand if v["command"].empty?
+            end
           else
-            # Detect SMTP session error or connection error
-            next if v['sessionerr']
-
+            # This line does not include a recipient address
             if e.include?(StartingOf[:error][0])
-              # ----- Transcript of session follows -----
               # ... while talking to mta.example.org.:
-              v['sessionerr'] = true
-              next
-            end
-
-            if e.start_with?('4', '5') && e.include?('... ')
-              # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
-              anotherset['replycode'] = e[0, 3]
-              anotherset['diagnosis'] = e[e.index('... ') + 4, e.size]
+              cv = Sisimai::RFC1123.find(e)
+              remotehost = cv if Sisimai::RFC1123.is_internethost(cv)
+            else
+              # Append this line into the error message string
+              if e.start_with?(">>> ", "<<< ")
+                # >>> DATA
+                # <<< 550 Your E-Mail is redundant.  You cannot send E-Mail to yourself (shironeko@example.jp).
+                # >>> QUIT
+                # <<< 421 dns.example.org Sorry, unable to contact destination SMTP daemon.
+                # <<< 550 Requested User Mailbox not found. No such user here.
+                v["diagnosis"] << " " << e
+              else
+                # 421 Other error message
+                anotherone[recipients] ||= ""; anotherone[recipients] << " " << e
+              end
             end
           end
         end
 
-        p1 = emailparts[1].index("\nTo: ")     || -1
-        p2 = emailparts[1].index("\n", p1 + 6) || -1
-        if recipients == 0 && p1 > 0
-          # Get the recipient address from "To:" header at the original message
-          dscontents[0]['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
-          recipients = 1
+        if recipients == 0
+          # There is no recipient address in the error message
+          anotherone.each_key do |e|
+            # Try to pick an recipient address, a reply code, and error messages
+            cv = Sisimai::Address.s3s4(anotherone[e]); next unless Sisimai::Address.is_emailaddress(cv)
+            cr = Sisimai::SMTP::Reply.find(anotherone[e])
+
+            dscontents[e]["recipient"] = cv
+            dscontents[e]["replycode"] = cr
+            dscontents[e]["diagnosis"] = anotherone[e]
+            recipients += 1
+          end
+
+          if recipients == 0
+            # Try to pick an recipient address from the original message
+            p1 = emailparts[1].index("\nTo: ")     || -1
+            p2 = emailparts[1].index("\n", p1 + 6) || -1
+
+            if p1 > 0
+              # Get the recipient address from "To:" header at the original message
+              cv = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
+              return nil unless Sisimai::Address.is_emailaddress(cv)
+              dscontents[0]["recipient"] = cv
+              recipients += 1
+            end
+          end
         end
         return nil unless recipients > 0
 
-        dscontents.each do |e|
-          errorindex += 1
-          e.delete('sessionerr')
-
-          e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
-                               # Copy alternative error message
-                               anotherset['diagnosis']
-                             else
-                               # Set server response as a error message
-                               responding[errorindex]
-                             end
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['replycode'] = Sisimai::SMTP::Reply.find(e['diagnosis']) || anotherset['replycode']
-          e['command']   = commandset[errorindex] || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
+        j = 0; dscontents.each do |e|
+          # Tidy up the error message in e.Diagnosis
+          e["diagnosis"] = anotherone[j] if e["diagnosis"].empty?
+          e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"])
+          e["command"]   = Sisimai::SMTP::Command.find(e["diagnosis"]) if e["command"].empty?
+          e["replycode"] = Sisimai::SMTP::Reply.find(e["diagnosis"])
+          e["replycode"] = Sisimai::SMTP::Reply.find(anotherone[j]) if e["replycode"].empty?
 
           # @example.jp, no local part
           # Get email address from the value of Diagnostic-Code header

data/lib/sisimai/lhost/verizon.rb

@@ -64,7 +64,7 @@ module Sisimai::Lhost
             #   RCPT TO: *****@vtext.com
             v = dscontents[-1]
             if e.start_with?('  RCPT TO: ')
-              if v['recipient']
+              if v["recipient"] != ""
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
@@ -112,7 +112,7 @@ module Sisimai::Lhost
             # Date:  Wed, 20 Jun 2013 10:29:52 +0000
             v = dscontents[-1]
             if e.start_with?('To: ')
-              if v['recipient']
+              if v["recipient"] != ""
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]

data/lib/sisimai/lhost/x1.rb

@@ -47,7 +47,7 @@ module Sisimai::Lhost
 
           if Sisimai::String.aligned(e, ['@', ' [', ']'])
             # kijitora@example.co.jp [User unknown]
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/x2.rb

@@ -49,7 +49,7 @@ module Sisimai::Lhost
 
           if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
             # <kijitora@example.com>:
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -58,7 +58,6 @@ module Sisimai::Lhost
             recipients += 1
           else
             # This user doesn't have a example.com account (kijitora@example.com) [0]
-            v['diagnosis'] ||= ''
             v['diagnosis'] << ' ' << e
           end
         end

data/lib/sisimai/lhost/x3.rb

@@ -56,7 +56,7 @@ module Sisimai::Lhost
 
           if e.include?('  * ') && e.include?('@')
             #   * kijitora@example.com
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -84,7 +84,7 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/x6.rb

@@ -52,7 +52,7 @@ module Sisimai::Lhost
           if p1 == 0 || p2 == 0
             # SMTP Server <mta2.example.jp> rejected recipient <kijitora@examplejp> 
             # The following recipients returned permanent errors: neko@example.jp.
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost/zoho.rb

@@ -55,7 +55,7 @@ module Sisimai::Lhost
 
           if Sisimai::String.aligned(e, ['@', ' ', 'ERROR_CODE :'])
             # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -73,7 +73,7 @@ module Sisimai::Lhost
           elsif e.start_with?('[Status: ')
             # Expired
             # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]

data/lib/sisimai/lhost.rb

@@ -9,21 +9,20 @@ module Sisimai
       # @private
       def DELIVERYSTATUS
         return {
-          'spec'         => nil,  # Protocl specification
-          'date'         => nil,  # The value of Last-Attempt-Date header
-          'rhost'        => nil,  # The value of Remote-MTA header
-          'lhost'        => nil,  # The value of Received-From-MTA header
-          'alias'        => nil,  # The value of alias entry(RHS)
-          'agent'        => nil,  # MTA module name
-          'action'       => nil,  # The value of Action header
-          'status'       => nil,  # The value of Status header
-          'reason'       => nil,  # Temporary reason of bounce
-          'command'      => nil,  # SMTP command in the message body
-          'replycode'    => nil,  # SMTP Reply code
-          'diagnosis'    => nil,  # The value of Diagnostic-Code header
-          'recipient'    => nil,  # The value of Final-Recipient header
-          'hardbounce'   => nil,  # Hard bounce or not
-          'feedbacktype' => nil,  # Feedback Type
+          'spec'         => "",  # Protocl specification
+          'date'         => "",  # The value of Last-Attempt-Date header
+          'rhost'        => "",  # The value of Remote-MTA header
+          'lhost'        => "",  # The value of Received-From-MTA header
+          'alias'        => "",  # The value of alias entry(RHS)
+          'agent'        => "",  # MTA module name
+          'action'       => "",  # The value of Action header
+          'status'       => "",  # The value of Status header
+          'reason'       => "",  # Temporary reason of bounce
+          'command'      => "",  # SMTP command in the message body
+          'replycode'    => "",  # SMTP Reply code
+          'diagnosis'    => "",  # The value of Diagnostic-Code header
+          'recipient'    => "",  # The value of Final-Recipient header
+          'feedbacktype' => "",  # Feedback Type
         }
       end
 
@@ -41,12 +40,10 @@ module Sisimai
       # @return   [Array] MTA list with order
       def index
         return %w[
-          Activehunter Amavis AmazonSES AmazonWorkMail Aol ApacheJames Barracuda Bigfoot Biglobe
-          Courier Domino DragonFly EZweb EinsUndEins Exchange2003 Exchange2007 Exim FML Facebook GMX
-          GSuite GoogleGroups Gmail IMailServer InterScanMSS KDDI MXLogic MailFoundry MailMarshalSMTP
-          MailRu McAfee MessageLabs MessagingServer Notes Office365 OpenSMTPD Outlook Postfix
-          PowerMTA ReceivingSES SendGrid Sendmail SurfControl V5sendmail Verizon X1 X2 X3 X4 X5 X6
-          Yahoo Yandex Zoho MFILTER Qmail
+          Activehunter AmazonSES ApacheJames Biglobe Courier Domino DragonFly EZweb EinsUndEins Exchange2003
+          Exchange2007 Exim FML GMX GoogleWorkspace GoogleGroups Gmail IMailServer InterScanMSS KDDI
+          MailFoundry MailMarshalSMTP MessagingServer Notes OpenSMTPD Postfix Sendmail V5sendmail
+          Verizon X1 X2 X3 X6 Zoho MFILTER Qmail
         ]
       end