sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/msp/uk/messagelabs.rb

@@ -20,11 +20,9 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'userunknown' => %r/No[ ]such[ ]user/x,
+          userunknown: %r/No[ ]such[ ]user/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Symantec.cloud http://www.messagelabs.com'; end
         def smtpagent;   return 'UK::MessageLabs'; end
@@ -55,12 +53,11 @@ module Sisimai
           return nil unless mhead['from']    =~ Re0[:from]
           return nil unless mhead['subject'] =~ Re0[:subject]
 
-          dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
+          dscontents = [Sisimai::MSP.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
           commandset = []     # (Array) ``in reply to * command'' list
@@ -73,12 +70,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
@@ -93,30 +91,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
@@ -203,43 +187,25 @@ 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['command'] = commandset.shift || ''
-
-            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['spec']    ||= 'SMTP'
+            e['command']   = commandset.shift || ''
             e['agent']     = Sisimai::MSP::UK::MessageLabs.smtpagent
-            e['status']  ||= ''
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             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
               break
             end
-
-            if e['status'].empty? || e['status'] =~ /\A\d[.]0[.]0\z/
-              # There is no value of Status header or the value is 5.0.0, 4.0.0
-              r = Sisimai::SMTP::Status.find(e['diagnosis'])
-              e['status'] = r if r.size > 0
-            end
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/us/amazonses.rb

@@ -20,11 +20,9 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'expired' => %r/Delivery[ ]expired/x,
+          expired: %r/Delivery[ ]expired/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Amazon SES(Sending): http://aws.amazon.com/ses/'; end
         def smtpagent;   return 'US::AmazonSES'; end
@@ -51,12 +49,11 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-aws-outgoing']
 
-          dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
+          dscontents = [Sisimai::MSP.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
           connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
@@ -67,12 +64,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
@@ -87,30 +85,17 @@ 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
+              # After "message/rfc822"
+              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
@@ -203,13 +188,6 @@ module Sisimai
             # Set default values if each value is empty.
             connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-            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'] = e['diagnosis'].gsub(/\\n/, ' ')
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
@@ -229,15 +207,15 @@ module Sisimai
             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
               break
             end
 
             e['reason'] ||= Sisimai::SMTP::Status.name(e['status'])
-            e['spec']  ||= 'SMTP'
-            e['agent']   = Sisimai::MSP::US::AmazonSES.smtpagent
+            e['agent']    = Sisimai::MSP::US::AmazonSES.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/us/amazonworkmail.rb

@@ -20,8 +20,6 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
         def smtpagent;   return 'US::AmazonWorkMail'; end
@@ -69,11 +67,10 @@ module Sisimai
             mbody = Sisimai::MIME.qprintd(mbody)
           end
 
-          dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
+          dscontents = [Sisimai::MSP.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
           connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
@@ -86,7 +83,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
@@ -101,30 +98,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
@@ -188,13 +171,6 @@ module Sisimai
             # Set default values if each value is empty.
             connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-            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 e['status'] =~ /\A[45][.][01][.]0\z/
@@ -209,11 +185,17 @@ module Sisimai
               e['status'] = pseudostatus if pseudostatus.size > 0
             end
 
+            if cv = e['diagnosis'].match(/[<]([245]\d\d)[ ].+[>]/)
+              # 554 4.4.7 Message expired: unable to deliver in 840 minutes.
+              # <421 4.4.2 Connection timed out>
+              e['replycode'] = cv[1]
+            end
+
             e['reason'] ||= Sisimai::SMTP::Status.name(e['status'])
-            e['spec']   ||= 'SMTP'
             e['agent']    = Sisimai::MSP::US::AmazonWorkMail.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/us/aol.rb

@@ -18,11 +18,9 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'hostunknown' => %r/Host[ ]or[ ]domain[ ]name[ ]not[ ]found/,
+          hostunknown: %r/Host[ ]or[ ]domain[ ]name[ ]not[ ]found/,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Aol Mail: http://www.aol.com'; end
         def smtpagent;   return 'US::Aol'; end
@@ -56,12 +54,11 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-aol-ip']
 
-          dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
+          dscontents = [Sisimai::MSP.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
           connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
@@ -73,12 +70,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
@@ -93,30 +91,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
@@ -198,20 +182,14 @@ module Sisimai
             # Set default values if each value is empty.
             connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-            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::MSP::US::Aol.smtpagent
             e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             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
               break
             end
 
@@ -220,11 +198,9 @@ module Sisimai
               pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
               e['status'] = pseudostatus if pseudostatus.size > 0
             end
-
-            e['spec']  ||= 'SMTP'
-            e['agent']   = Sisimai::MSP::US::Aol.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
       end