sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mta/apachejames.rb

@@ -23,8 +23,6 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Java Apache Mail Enterprise Server'; end
         def smtpagent;   return 'ApacheJames'; end
@@ -52,11 +50,10 @@ module Sisimai
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
           return if match == 0
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          blanklines = 0      # (Integer) The number of blank lines
           readcursor = 0      # (Integer) Points the current cursor position
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
           diagnostic = ''     # (String) Alternative diagnostic message
@@ -65,11 +62,10 @@ module Sisimai
           v = nil
 
           hasdivided.each do |e|
-
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -84,30 +80,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               # Message details:
@@ -164,26 +146,22 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
+
+          unless rfc822list.find { |a| a =~ /^Subject:/ }
+            # Set the value of $subjecttxt as a Subject if there is no original
+            # message in the bounce mail.
+            rfc822list << sprintf('Subject: %s', subjecttxt)
+          end
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::ApacheJames.smtpagent
-
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
+            e['agent']     = Sisimai::MTA::ApacheJames.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)
-            e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/courier.rb

@@ -34,24 +34,16 @@ module Sisimai
         }
         ReFailure = {
           # courier/module.esmtp/esmtpclient.c:526| hard_error(del, ctf, "No such domain.");
-          'hostunknown' => %r{
-            \ANo[ ]such[ ]domain[.]\z
-          }x,
+          hostunknown: %r/\ANo[ ]such[ ]domain[.]\z/x,
           # courier/module.esmtp/esmtpclient.c:531| hard_error(del, ctf,
           # courier/module.esmtp/esmtpclient.c:532|  "This domain's DNS violates RFC 1035.");
-          'systemerror' => %r{
-            \AThis[ ]domain's[ ]DNS[ ]violates[ ]RFC[ ]1035[.]\z
-          }x,
+          systemerror: %r/\AThis[ ]domain's[ ]DNS[ ]violates[ ]RFC[ ]1035[.]\z/x,
         }
         ReDelayed = {
           # courier/module.esmtp/esmtpclient.c:535| soft_error(del, ctf, "DNS lookup failed.");
-          'networkerror' => %r{
-            \ADNS[ ]lookup[ ]failed[.]\z
-          },
+          networkerror: %r/\ADNS[ ]lookup[ ]failed[.]\z/x,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Courier MTA'; end
         def smtpagent;   return 'Courier'; end
@@ -82,12 +74,11 @@ module Sisimai
           end
           return nil if match == 0
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          havepassed = [''];
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          havepassed = ['']
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          blanklines = 0      # (Integer) The number of blank lines
           readcursor = 0      # (Integer) Points the current cursor position
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
           commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
@@ -101,12 +92,13 @@ module Sisimai
 
           hasdivided.each do |e|
             # Save the current line for the next loop
-            havepassed << e; p = havepassed[-2]
+            havepassed << e
+            p = havepassed[-2]
 
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -121,30 +113,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if e.empty?
 
               if connvalues == connheader.keys.size
@@ -159,7 +137,7 @@ module Sisimai
                   # Final-Recipient: rfc822; kijitora@example.co.jp
                   if v['recipient']
                     # There are multiple recipient addresses in the message body.
-                    dscontents << Sisimai::MTA.DELIVERYSTATUS;
+                    dscontents << Sisimai::MTA.DELIVERYSTATUS
                     v = dscontents[-1]
                   end
                   v['recipient'] = cv[1]
@@ -250,28 +228,18 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
             # Set default values if each value is empty.
             connheader.each_key { |a| e[a] ||= connheader[a] || '' }
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
-
             ReFailure.each_key do |r|
               # Verify each regular expression of session errors
               next unless e['diagnosis'] =~ ReFailure[r]
-              e['reason'] = r
+              e['reason'] = r.to_s
               e['softbounce'] = 0
               break
             end
@@ -280,23 +248,18 @@ module Sisimai
               ReDelayed.each_key do |r|
                 # Verify each regular expression of session errors
                 next unless e['diagnosis'] =~ ReDelayed[r]
-                e['reason'] = r
+                e['reason'] = r.to_s
                 e['softbounce'] = 1
                 break
               end
             end
 
-            if !e['status'] || e['status'] =~ /\d[.]0[.]0\z/
-              # Get the status code from the respnse of remote MTA.
-              f = Sisimai::SMTP::Status.find(e['diagnosis'])
-              e['status'] = f if f.size > 0
-            end
-            e['spec']      = '' unless e['spec'] =~ /\A(?:SMTP|X-UNIX)\z/
             e['agent']     = Sisimai::MTA::Courier.smtpagent
             e['command'] ||= commandtxt || ''
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/domino.rb

@@ -17,7 +17,7 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'userunknown' => %r{(?>
+          userunknown: %r{(?>
              not[ ]listed[ ]in[ ](?:
                Domino[ ]Directory
               |public[ ]Name[ ][&][ ]Address[ ]Book
@@ -25,16 +25,10 @@ module Sisimai
             |Domino[ ]ディレクトリには見つかりません
             )
           }x,
-          'filtered' => %r{
-              Cannot[ ]route[ ]mail[ ]to[ ]user
-          }x,
-          'systemerror' => %r{
-              Several[ ]matches[ ]found[ ]in[ ]Domino[ ]Directory
-          }x,
+          filtered:    %r/Cannot[ ]route[ ]mail[ ]to[ ]user/x,
+          systemerror: %r/Several[ ]matches[ ]found[ ]in[ ]Domino[ ]Directory/x,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'IBM Domino Server'; end
         def smtpagent;   return 'Domino'; end
@@ -57,25 +51,23 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['subject'] =~ Re0[:subject]
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          require 'sisimai/address'
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          blanklines = 0      # (Integer) The number of blank lines
           readcursor = 0      # (Integer) Points the current cursor position
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
           subjecttxt = ''     # (String) The value of Subject:
           v = nil
 
-          require 'sisimai/address'
-
           hasdivided.each do |e|
             next if e.empty?
 
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -90,30 +82,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
 
               # Your message
               #
@@ -167,38 +145,28 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            # Set default values if each value is empty.
-            e['agent'] = Sisimai::MTA::Domino.smtpagent
-
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
+            e['agent']     = Sisimai::MTA::Domino.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
             ReFailure.each_key do |r|
               # Check each regular expression of Domino error messages
               next unless e['diagnosis'] =~ ReFailure[r]
-              e['reason'] = r
-              pseudostatus = Sisimai::SMTP::Status.code(r, false)
+              e['reason'] = r.to_s
+              pseudostatus = Sisimai::SMTP::Status.code(r.to_s, false)
               e['status'] = pseudostatus if pseudostatus.size > 0
               break
             end
-
-            e['spec'] = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-
-            unless rfc822part =~ /\bSubject:/
-              # Fallback: Add the value of Subject as a Subject header
-              rfc822part += sprintf("Subject: %s\n", subjecttxt)
-            end
             e.each_key { |a| e[a] ||= '' }
           end
 
+          unless rfc822list.find { |a| a =~ /^Subject:/ }
+            # Set the value of $subjecttxt as a Subject if there is no original
+            # message in the bounce mail.
+            rfc822list << sprintf('Subject: %s', subjecttxt)
+          end
+
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/exchange.rb

@@ -27,35 +27,33 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         CodeTable = {
-          'onhold' => [
+          onhold: [
             '000B099C', # Host Unknown, Message exceeds size limit, ...
             '000B09AA', # Unable to relay for, Message exceeds size limit,...
             '000B09B6', # Error messages by remote MTA
           ],
-          'userunknown' => [
+          userunknown: [
             '000C05A6', # Unknown Recipient,
           ],
-          'systemerror' => [
+          systemerror: [
             '00010256', # Too many recipients.
             '000D06B5', # No proxy for recipient (non-smtp mail?)
           ],
-          'networkerror' => [
+          networkerror: [
             '00120270', # Too Many Hops
           ],
-          'contenterr' => [
+          contenterr: [
             '00050311', # Conversion to Internet format failed
             '000502CC', # Conversion to Internet format failed
           ],
-          'securityerr' => [
+          securityerr: [
             '000B0981', # 502 Server does not support AUTH
           ],
-          'filtered' => [
+          filtered: [
             '000C0595', # Ambiguous Recipient
           ],
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Microsoft Exchange Server'; end
         def smtpagent;   return 'Exchange'; end
@@ -108,11 +106,10 @@ module Sisimai
           end
           return nil if match == 0
 
-          dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+          dscontents = [Sisimai::MTA.DELIVERYSTATUS]
           hasdivided = mbody.split("\n")
-          rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
-          rfc822part = ''     # (String) message/rfc822-headers part
-          previousfn = ''     # (String) Previous field name
+          rfc822list = []     # (Array) Each line in message/rfc822 part string
+          blanklines = 0      # (Integer) The number of blank lines
           readcursor = 0      # (Integer) Points the current cursor position
           recipients = 0      # (Integer) The number of 'Final-Recipient' header
           statuspart = false  # (Boolean) Flag, true = have got delivery status part.
@@ -128,7 +125,7 @@ module Sisimai
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               if e =~ Re1[:begin]
-                readcursor |= Indicators[:'deliverystatus']
+                readcursor |= Indicators[:deliverystatus]
                 next
               end
             end
@@ -143,30 +140,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Get required headers only
-                lhs = cv[1].downcase
-                previousfn = ''
-                next unless RFC822Head.key?(lhs)
-
-                previousfn  = lhs
-                rfc822part += e + "\n"
-
-              elsif e =~ /\A[ \t]+/
-                # Continued line from the previous line
-                next if rfc822next[previousfn]
-                rfc822part += e + "\n" if LongFields.key?(previousfn)
-
-              else
-                # Check the end of headers in rfc822 part
-                next unless LongFields.key?(previousfn)
-                next unless e.empty?
-                rfc822next[previousfn] = true
+              if e.empty?
+                blanklines += 1
+                break if blanklines > 1
+                next
               end
+              rfc822list << e
 
             else
               # Before "message/rfc822"
-              next if readcursor & Indicators[:'deliverystatus'] == 0
+              next if readcursor & Indicators[:deliverystatus] == 0
               next if statuspart
 
               if connvalues == connheader.keys.size
@@ -185,7 +168,7 @@ module Sisimai
                 v = dscontents[-1]
 
                 if cv = e.match(/\A[ \t]*([^ ]+[@][^ ]+) on[ \t]*.*\z/) ||
-                   cv = e.match(/\A[ \t]*.+(?:SMTP|smtp)=([^ ]+[@][^ ]+) on[ \t]*.*\z/)
+                        e.match(/\A[ \t]*.+(?:SMTP|smtp)=([^ ]+[@][^ ]+) on[ \t]*.*\z/)
                   # 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']
@@ -254,15 +237,6 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            if mhead['received'].size > 0
-              # Get localhost and remote host name from Received header.
-              r0 = mhead['received']
-              %w|lhost rhost|.each { |a| e[a] ||= '' }
-              e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
-              e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
-            end
-            e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
             if cv = e['diagnosis'].match(/\AMSEXCH:.+[ \t]*[(]([0-9A-F]{8})[)][ \t]*(.*)\z/)
               #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
               capturedcode = cv[1]
@@ -272,8 +246,8 @@ module Sisimai
               CodeTable.each_key do |r|
                 # Find captured code from the error code table
                 next unless CodeTable[r].index(capturedcode)
-                e['reason'] = r
-                pseudostatus = Sisimai::SMTP::Status.code(r)
+                e['reason'] = r.to_s
+                pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
                 e['status'] = pseudostatus if pseudostatus.size > 0
                 break
               end
@@ -289,21 +263,19 @@ module Sisimai
                 e.delete('alterrors')
               end
             end
-
-            e['spec']   = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']  = Sisimai::MTA::Exchange.smtpagent
+            e['agent'] = Sisimai::MTA::Exchange.smtpagent
             e.delete('msexch')
             e.each_key { |a| e[a] ||= '' }
           end
 
-          if rfc822part.empty?
+          if rfc822list.empty?
             # When original message does not included in the bounce message
-            rfc822part += sprintf("From: %s\n", connheader['to'])
-            rfc822part += sprintf("Date: %s\n", connheader['date'])
-            rfc822part += sprintf("Subject: %s\n", connheader['subject'])
+            rfc822list << sprintf('From: %s', connheader['to'])
+            rfc822list << sprintf('Date: %s', connheader['date'])
+            rfc822list << sprintf('Subject: %s', connheader['subject'])
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end