sisimai 4.16.0-java → 4.17.0-java

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

@@ -19,8 +19,6 @@ module Sisimai
           },
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Verizon Wireless: http://www.verizonwireless.com'; end
         def smtpagent;   return 'US::Verizon'; end
@@ -59,11 +57,10 @@ module Sisimai
 
           require 'sisimai/mime'
           require 'sisimai/address'
-          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
           senderaddr = ''     # (String) Sender address in the message body
@@ -83,11 +80,8 @@ module Sisimai
             }
             reFailure = {
               # The attempted recipient address does not exist.
-              'userunknown' => %r{
-                550[ ][-][ ]Requested[ ]action[ ]not[ ]taken:[ ]no[ ]such[ ]user[ ]here
-              }x,
+              userunknown: %r/550[ ][-][ ]Requested[ ]action[ ]not[ ]taken:[ ]no[ ]such[ ]user[ ]here/x,
             }
-            rfc822next = { 'from' => 0, 'to' => 0, 'subject' => 0 }
             boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
 
             if boundary00.size > 0
@@ -99,7 +93,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
@@ -114,30 +108,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:
@@ -180,11 +160,8 @@ module Sisimai
               :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
             }
             reFailure = {
-              'userunknown' => %r{
-                  No[ ]valid[ ]recipients[ ]for[ ]this[ ]MM
-              }x,
+              userunknown: %r/No[ ]valid[ ]recipients[ ]for[ ]this[ ]MM/x,
             }
-            rfc822next = { 'from' => 0, 'to' => 0, 'subject' => 0 }
             boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
             if boundary00.size > 0
               # Convert to regular expression
@@ -195,7 +172,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
@@ -210,30 +187,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?
 
                 # Original Message:
@@ -271,36 +234,29 @@ module Sisimai
 
           return nil if recipients == 0
 
-          # Set the value of "MAIL FROM:" or "From:", and "Subject"
-          rfc822part += sprintf("From: %s\n", senderaddr) unless rfc822part =~ /\bFrom: /
-          rfc822part += sprintf("Subject: %s\n", subjecttxt) unless rfc822part =~ /\bSubject: /
+          if !rfc822list.find { |a| a =~ /^From: / }
+            # Set the value of "MAIL FROM:" or "From:"
+            rfc822list << sprintf('From: %s', senderaddr)
 
-          require 'sisimai/string'
-          require 'sisimai/smtp/status'
+          elsif !rfc822list.find { |a| a =~ /^Subject: / }
+            # Set the value of "Subject:"
+            rfc822list << sprintf('Subject: %s', subjecttxt)
+          end
 
+          require 'sisimai/string'
           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['agent']     = Sisimai::MSP::US::Verizon.smtpagent
             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
-
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']   = Sisimai::MSP::US::Verizon.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -17,8 +17,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 'Yahoo! MAIL: https://www.yahoo.com'; end
         def smtpagent;   return 'US::Yahoo'; end
@@ -46,11 +44,10 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-ymailisg']
 
-          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
           v = nil
@@ -59,7 +56,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
@@ -74,30 +71,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?
 
               # Sorry, we were unable to deliver your message to the following address.
@@ -148,27 +131,16 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          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'] = e['diagnosis'].gsub(/\\n/, ' ')
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-            e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']  ||= 'SMTP'
-            e['agent']   = Sisimai::MSP::US::Yahoo.smtpagent
+            e['agent']     = Sisimai::MSP::US::Yahoo.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -23,11 +23,9 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'expired' => %r/Host not reachable/
+          expired: %r/Host not reachable/
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Zoho Mail: https://www.zoho.com'; end
         def smtpagent;   return 'US::Zoho'; end
@@ -54,11 +52,10 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-zohomail']
 
-          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
           qprintable = false
@@ -68,7 +65,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
@@ -83,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?
 
               # This message was created automatically by mail delivery software.
@@ -160,34 +143,23 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          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['agent']     = Sisimai::MSP::US::Zoho.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
-
-            e['status']  = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']  ||= 'SMTP'
-            e['agent']   = Sisimai::MSP::US::Zoho.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/activehunter.rb

@@ -19,8 +19,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 'TransWARE Active!hunter'; end
         def smtpagent;   return 'Activehunter'; end
@@ -43,11 +41,10 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['x-ahmailid']
 
-          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
           v = nil
@@ -56,7 +53,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
@@ -71,30 +68,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?
 
               #  ----- The following addresses had permanent fatal errors -----
@@ -123,28 +106,16 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          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'])
-            e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']      = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action']    = 'failed' if e['status'] =~ /\A[45]/
             e['agent']     = Sisimai::MTA::Activehunter.smtpagent
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end