sisimai 5.1.0-java → 5.2.0-java

data/lib/sisimai/lhost/apachejames.rb

@@ -6,13 +6,12 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['Content-Type: message/rfc822'].freeze
+      Boundaries = ["Content-Type: message/rfc822"].freeze
       StartingOf = {
         # apache-james-2.3.2/src/java/org/apache/james/transport/mailets/
         #   AbstractNotify.java|124:  out.println("Error message below:");
         #   AbstractNotify.java|128:  out.println("Message details:");
-        message: [''],
-        error:   ['Error message below:'],
+        message: ["Message details:"],
       }.freeze
 
       # @abstract decodes the bounce message from Apache James
@@ -22,28 +21,31 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         match  = 0
-        match += 1 if mhead['subject'] == '[BOUNCE]'
-        match += 1 if mhead['message-id'].to_s.include?('.JavaMail.')
-        match += 1 if mhead['received'].any? { |a| a.include?('JAMES SMTP Server') }
+        match += 1 if mhead["subject"] == "[BOUNCE]"
+        match += 1 if mhead["message-id"].to_s.include?(".JavaMail.")
+        match += 1 if mhead["received"].any? { |a| a.include?("JAMES SMTP Server") }
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
-        readcursor = 0      # (Integer) Points the current cursor position
-        recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        issuedcode = ''     # (String) Alternative diagnostic message
-        subjecttxt = nil    # (String) Alternative Subject text
-        gotmessage = nil    # (Boolean) Flag for error message
-        v = nil
+        readcursor = 0                # Points the current cursor position
+        recipients = 0                # The number of 'Final-Recipient' header
+        alternates = ["", "", "", ""] # [Envelope-From, Header-From, Date, Subject]
+        v          = dscontents[-1]
 
         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.
-
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            if e.start_with?(StartingOf[:message][0])
+              # Message details:
+              #   Subject: Nyaaan
+              readcursor |= Indicators[:deliverystatus]
+              next
+            end
+            v["diagnosis"] << e << " " if e != ""
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -58,58 +60,53 @@ module Sisimai::Lhost
           #   To: kijitora@example.org
           #   Size (in bytes): 1024
           #   Number of lines: 64
-          v = dscontents[-1]
-
-          if e.start_with?('  RCPT TO: ')
+          if e.start_with?("  RCPT TO: ")
             #   RCPT TO: kijitora@example.org
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = e[12, e.size]
+            v["recipient"] = e[12, e.size]
             recipients += 1
 
-          elsif e.start_with?('  Sent date: ')
+          elsif e.start_with?("  Sent date: ")
             #   Sent date: Thu Apr 29 01:20:50 JST 2015
-            v['date'] = e[13, e.size]
+            v["date"]     = e[13, e.size]
+            alternates[2] = v["date"]
 
-          elsif e.start_with?('  Subject: ')
+          elsif e.start_with?("  Subject: ")
             #   Subject: Nyaaan
-            subjecttxt = e[11, e.size]
-          else
-            next if gotmessage
-            if v['diagnosis']
-              # Get an error message text
-              if e.start_with?('Message details:')
-                # Message details:
-                #   Subject: nyaan
-                #   ...
-                gotmessage = true
-              else
-                # Append error message text like the followng:
-                #   Error message below:
-                #   550 - Requested action not taken: no such user here
-                v['diagnosis'] << ' ' << e
-              end
-            else
-              # Error message below:
-              # 550 - Requested action not taken: no such user here
-              v['diagnosis'] = e if e == StartingOf[:error][0]
-              unless gotmessage
-                v['diagnosis'] ||= ''
-                v['diagnosis'] << ' ' + e
-              end
-            end
+            alternates[3] = e[11, e.size]
+
+          elsif e.start_with?("  MAIL FROM: ")
+            #   MAIL FROM: shironeko@example.jp
+            alternates[0] = e[13, e.size]
+
+          elsif e.start_with?("  From: ")
+            #   From: Neko <shironeko@example.jp>
+            alternates[1] = e[8, e.size]
+
           end
         end
         return nil unless recipients > 0
 
-        # Set the value of subjecttxt as a Subject if there is no original message in the bounce mail.
-        emailparts[1] << ('Subject: ' << subjecttxt << "\n") unless emailparts[1].index("\nSubject:")
+        if emailparts[1].empty?
+          # The original message is empty
+          emailparts[1] << sprintf("From: %s\n", alternates[1]) if alternates[1] != ""
+          emailparts[1] << sprintf("Date: %s\n", alternates[2]) if alternates[2] != ""
+        end
+        if emailparts[1].include?("Return-Path: ") == false
+          # Set the envelope from address as a Return-Path: header
+          emailparts[1] << sprintf("Return-Path: <%s>\n", alternates[0]) if alternates[0] != ""
+        end
+        if emailparts[1].include?("\nSubject: ") == false
+          # Set the envelope from address as a Return-Path: header
+          emailparts[1] << sprintf("Subject: %s\n", alternates[3]) if alternates[3] != ""
+        end
 
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || issuedcode) }
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        dscontents.each { |e| e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"]) }
+        return { "ds" => dscontents, "rfc822" => emailparts[1] }
       end
       def description; return 'Java Apache Mail Enterprise Server'; end
     end

data/lib/sisimai/lhost/biglobe.rb

@@ -63,7 +63,7 @@ module Sisimai::Lhost
           if e.include?('@') && e.include?(' ') == false
             #    ----- The following addresses had delivery problems -----
             # ********@***.biglobe.ne.jp
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -74,7 +74,6 @@ module Sisimai::Lhost
             recipients += 1
           else
             next if e.include?('--')
-            v['diagnosis'] ||= ''
             v['diagnosis'] << e + ' '
           end
         end

data/lib/sisimai/lhost/courier.rb

@@ -12,7 +12,6 @@ module Sisimai::Lhost
         # courier/module.dsn/dsn*.txt
         message: ['DELAYS IN DELIVERING YOUR MESSAGE', 'UNDELIVERABLE MAIL'],
       }.freeze
-
       MessagesOf = {
         # courier/module.esmtp/esmtpclient.c:526| hard_error(del, ctf, "No such domain.");
         'hostunknown'  => ['No such domain.'],
@@ -39,8 +38,9 @@ module Sisimai::Lhost
         end
         return nil unless match > 0
 
-        require 'sisimai/smtp/command'
+        require 'sisimai/rfc1123'
         require 'sisimai/rfc1894'
+        require 'sisimai/smtp/command'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
@@ -68,17 +68,18 @@ module Sisimai::Lhost
           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
             next unless o = Sisimai::RFC1894.field(e)
             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]
@@ -89,16 +90,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
@@ -126,7 +128,7 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Set default values if each value is empty.
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
-          e['command'] ||= thecommand || ''
+          e['command']   = thecommand if e["command"].empty?
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
           MessagesOf.each_key do |r|

data/lib/sisimai/lhost/domino.rb

@@ -9,15 +9,15 @@ module Sisimai::Lhost
       Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Your message'] }.freeze
       MessagesOf = {
-        'userunknown' => [
-          'not listed in Domino Directory',
-          'not listed in public Name & Address Book',
+        "filtered"    => ["Cannot route mail to user"],
+        "systemerror" => ["Several matches found in Domino Directory"],
+        "userunknown" => [
+          "not listed in Domino Directory",
+          "not listed in public Name & Address Book",
           "non répertorié dans l'annuaire Domino",
-          'no se encuentra en el Directorio de Domino',
-          'Domino ディレクトリには見つかりません',
+          "no se encuentra en el Directorio de Domino",
+          "Domino ディレクトリには見つかりません",
         ],
-        'filtered' => ['Cannot route mail to user'],
-        'systemerror' => ['Several matches found in Domino Directory'],
       }.freeze
 
       # @abstract Decodes the bounce message from HCL Domino (formerly IBM Domino Server (formerly Lotus Domino))
@@ -28,6 +28,7 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
 
+        require 'sisimai/rfc1123'
         require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
@@ -68,12 +69,13 @@ module Sisimai::Lhost
 
           if e.start_with?('was not delivered to:')
             # was not delivered to:
-            if v['recipient']
+            #   kijitora@example.net
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] ||= e
+            v['recipient'] = e if v["recipient"].empty?
             recipients += 1
 
           elsif e.start_with?('  ') && e.include?('@') && e.index(' ', 3).nil?
@@ -83,9 +85,10 @@ module Sisimai::Lhost
 
           elsif e.start_with?('because:')
             # because:
+            #   User some.name (kijitora@example.net) not listed in Domino Directory
             v['diagnosis'] = e
           else
-            if v['diagnosis'].to_s == 'because:'
+            if v['diagnosis'] == "because:"
               # Error message, continued from the line "because:"
               v['diagnosis'] = e
 
@@ -93,28 +96,25 @@ module Sisimai::Lhost
               #   Subject: Nyaa
               subjecttxt = e[11, e.size]
 
-            elsif f = Sisimai::RFC1894.match(e)
-              # There are some fields defined in RFC3464, try to match 
-              o = Sisimai::RFC1894.field(e) || next
-              next if o[-1] == 'addr'
+            else
+              # Other fields defined in RFC3464
+              f = Sisimai::RFC1894.match(e); next if f < 1
+              o = Sisimai::RFC1894.field(e); next if o.nil?
+              next if o[3] == 'addr'
 
-              if o[-1] == 'code'
+              if o[3] == 'code'
                 # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec']      = o[1] if v['spec'].to_s.empty?
-                v['diagnosis'] = o[2] if v['diagnosis'].to_s.empty?
+                v['spec']      = o[1] if v['spec'].empty?
+                v['diagnosis'] = o[2] if v['diagnosis'].empty?
               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
-              if v['diagnosis'] && e.start_with?("\s", "\t")
-                # The line is a continued line of "Diagnostic-Code:" field
-                v['diagnosis'] += e.sub(/\A[\s\t]+/, '')
-              end
             end
           end
         end
@@ -128,8 +128,8 @@ module Sisimai::Lhost
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason']   = r
-            e['status'] ||= Sisimai::SMTP::Status.code(r.to_s, false) || ''
+            e['reason'] = r
+            e['status'] = Sisimai::SMTP::Status.code(r, false) if e["status"].empty?
             break
           end
         end

data/lib/sisimai/lhost/dragonfly.rb

@@ -72,7 +72,7 @@ module Sisimai::Lhost
           if e.start_with?('There was an error delivering your mail to <')
             # email.example.jp [192.0.2.25] did not like our RCPT TO:
             # 552 5.2.2 <kijitora@example.com>: Recipient address rejected: Mailbox full
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -81,17 +81,16 @@ module Sisimai::Lhost
             recipients += 1
           else
             # Pick the error message
-            v['diagnosis'] ||= ''
             v['diagnosis'] << ' ' << e
 
             # Pick the remote hostname, and the SMTP command
             # net.c:500| snprintf(errmsg, sizeof(errmsg), "%s [%s] did not like our %s:\n%s",
             next unless e.include?(' did not like our ')
-            next if v['rhost']
+            next if v['rhost'] != ""
 
             p = e.split(' ', 3)
             v['rhost']   = if p[0].include?('.') then p[0] else p[1] end
-            v['command'] = Sisimai::SMTP::Command.find(e) || ''
+            v['command'] = Sisimai::SMTP::Command.find(e)
           end
         end
         return nil unless recipients > 0

data/lib/sisimai/lhost/einsundeins.rb

@@ -54,7 +54,7 @@ module Sisimai::Lhost
           if cv = e.match(/\A\s*([^ ]+[@][^ ]+?)[:]?\z/)
             # general@example.eu OR
             # the line begin with 4 space characters, end with ":" like "    neko@example.eu:"
-            if v['recipient']
+            if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
@@ -82,9 +82,8 @@ module Sisimai::Lhost
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
-          e['diagnosis'] ||= ''
-          e['diagnosis']   = e['alterrors'] if e['diagnosis'].empty?
-          e['command']     = Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['diagnosis'] = e['alterrors'] if e['diagnosis'].empty?
+          e['command']   = Sisimai::SMTP::Command.find(e['diagnosis'])
 
           if Sisimai::String.aligned(e['diagnosis'], ['host: ', ' reason:'])
             # SMTP error from remote server for TEXT command,

data/lib/sisimai/lhost/exchange2003.rb

@@ -126,7 +126,7 @@ module Sisimai::Lhost
             if Sisimai::String.aligned(e, ['@', ' on '])
               # kijitora@example.co.jp on Thu, 29 Apr 2007 16:51:51 -0500
               #   kijitora@example.com on 4/29/99 9:19:59 AM
-              if v['recipient']
+              if v["recipient"] != ""
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
@@ -139,11 +139,10 @@ module Sisimai::Lhost
 
             elsif e.start_with?(' ') && e.include?('MSEXCH:')
               #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-              v['diagnosis'] ||= ''
               v['diagnosis'] << e[e.index('MSEXCH:'), e.size]
             else
               next if v['msexch']
-              if v['diagnosis'].to_s.start_with?('MSEXCH:')
+              if v['diagnosis'].start_with?('MSEXCH:')
                 # Continued from MEEXCH in the previous line
                 v['msexch'] = true
                 v['diagnosis'] << ' ' << e
@@ -186,7 +185,7 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           e.delete('msexch')
-          e['diagnosis'] ||= ''
+          
           if e['diagnosis'].start_with?('MSEXCH:')
             #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
             p1 = e['diagnosis'].index('(') || -1
@@ -198,16 +197,15 @@ module Sisimai::Lhost
               # Find captured code from the error code table
               next unless ErrorCodes[r].index(capturedcode)
               e['reason'] = r
-              e['status'] = Sisimai::SMTP::Status.code(r.to_s) || ''
+              e['status'] = Sisimai::SMTP::Status.code(r) || ""
               break
             end
             e['diagnosis'] = errormessage
           end
 
-          unless e['reason']
+          if e["reason"].empty?
             # Could not detect the reason from the value of "diagnosis".
-            next unless e['alterrors']
-            next if e['alterrors'].empty?
+            next if e["alterrors"].empty?
 
             # Copy alternative error message
             e['diagnosis'] = e['alterrors'] + ' ' + e['diagnosis']