sisimai 4.16.0-java → 4.17.0-java

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

@@ -24,18 +24,16 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         CodeTable = {
-          '4.4.7'   => 'expired',
-          '5.1.0'   => 'rejected',
-          '5.1.1'   => 'userunknown',
-          '5.1.10'  => 'filtered',
-          '5.4.1'   => 'networkerror',
-          '5.4.14'  => 'networkerror',
-          '5.7.1'   => 'rejected',
-          '5.7.133' => 'rejected',
+          :'4.4.7'   => 'expired',
+          :'5.1.0'   => 'rejected',
+          :'5.1.1'   => 'userunknown',
+          :'5.1.10'  => 'filtered',
+          :'5.4.1'   => 'networkerror',
+          :'5.4.14'  => 'networkerror',
+          :'5.7.1'   => 'rejected',
+          :'5.7.133' => 'rejected',
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Microsoft Office 365: http://office.microsoft.com/'; end
         def smtpagent;   return 'US::Office365'; end
@@ -98,11 +96,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
           connheader = {}
@@ -114,7 +111,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
@@ -129,30 +126,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?
 
               # kijitora@example.com<mailto:kijitora@example.com>
@@ -239,17 +222,8 @@ 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['spec']    ||= 'SMTP'
-            e['status']  ||= ''
             e['agent']     = Sisimai::MSP::US::Office365.smtpagent
+            e['status']  ||= ''
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
             if e['status'].empty? || e['status'] =~ /\A\d[.]0[.]0\z/
@@ -259,10 +233,11 @@ module Sisimai
             end
 
             if e['status']
-              e['reason'] = CodeTable[e['status']] || ''
+              e['reason'] = CodeTable[e['status'].to_sym] || ''
             end
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -20,12 +20,10 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'hostunknown' => %r/The mail could not be delivered to the recipient because the domain is not reachable/,
-          'userunknown' => %r/Requested action not taken: mailbox unavailable/,
+          hostunknown: %r/The mail could not be delivered to the recipient because the domain is not reachable/,
+          userunknown: %r/Requested action not taken: mailbox unavailable/,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
         def smtpagent;   return 'US::Outlook'; end
@@ -57,12 +55,11 @@ module Sisimai
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
           return nil if match < 2
 
-          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
@@ -74,12 +71,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
@@ -94,30 +92,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
@@ -184,24 +168,12 @@ 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] || '' }
-
-            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['agent']     = Sisimai::MSP::US::Outlook.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
 
@@ -221,17 +193,12 @@ 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
-
-            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
-              pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
-              e['status'] = pseudostatus if pseudostatus.size > 0
-            end
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -21,14 +21,12 @@ module Sisimai
         }
         ReFailure = {
           # The followings are error messages in Rule sets/*/Actions/Template
-          'filtered'      => %r/Mailbox does not exist/,
-          'mesgtoobig'    => %r/Message too large/,
-          'mailboxfull'   => %r/Mailbox full/,
-          'contenterror'  => %r/Message content rejected/,
+          filtered:     %r/Mailbox does not exist/,
+          mesgtoobig:   %r/Message too large/,
+          mailboxfull:  %r/Mailbox full/,
+          contenterror: %r/Message content rejected/,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Amazon SES(Receiving): http://aws.amazon.com/ses/'; end
         def smtpagent;   return 'US::ReceivingSES'; end
@@ -54,12 +52,11 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-ses-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
@@ -71,12 +68,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
@@ -91,30 +89,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
@@ -136,7 +120,7 @@ module Sisimai
                   recipients += 1
 
                 elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                      cv = e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+                           e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                   # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                   # Original-Recipient: rfc822; kijitora@example.co.jp
                   v['alias'] = cv[1]
@@ -203,13 +187,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'])
 
@@ -228,15 +205,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::ReceivingSES.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/us/sendgrid.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 'SendGrid: http://sendgrid.com/'; end
         def smtpagent;   return 'US::SendGrid'; end
@@ -50,12 +48,11 @@ module Sisimai
           return nil unless mhead['subject']     =~ Re0[:'subject']
 
           require 'sisimai/datetime'
-          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
+          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 '>>>'
@@ -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,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
@@ -234,19 +218,11 @@ module Sisimai
               end
             end
 
-            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['agent']   = Sisimai::MSP::US::SendGrid.smtpagent
             e['command'] = commandtxt
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end