sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mta/userdefined.rb

@@ -28,8 +28,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 'Module description'; end
         def smtpagent;   return 'Module name'; end
@@ -64,11 +62,10 @@ module Sisimai
 
           # 2. Parse message body(mbody) of the bounce message. See some modules
           #    in lib/sisimai/mta or lib/sisimai/msp directory to implement codes.
-          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
 
@@ -76,7 +73,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
@@ -91,30 +88,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?
 
             end
@@ -129,15 +112,16 @@ module Sisimai
           dscontents[0]['agent']     = Sisimai::MTA::UserDefined.smtpagent
           recipients = 1 if dscontents[0]['recipient']
 
-          rfc822part += 'From: shironeko@example.org' + "\n"
-          rfc822part += 'Subject: Nyaaan' + "\n"
-          rfc822part += 'Message-Id: 000000000000@example.jp' + "\n"
+          rfc822list << 'From: shironeko@example.org'
+          rfc822list << 'Subject: Nyaaan'
+          rfc822list << 'Message-Id: 000000000000@example.jp'
 
           # 3. Return undef when there is no recipient address which is failed to
           #    delivery in the bounce message
           return nil if recipients == 0
 
           # 4. Return the following variable.
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/v5sendmail.rb

@@ -39,8 +39,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 'Sendmail version 5'; end
         def smtpagent;   return 'V5sendmail'; end
@@ -63,11 +61,10 @@ module Sisimai
           return nil unless mbody
           return nil unless mhead['subject'] =~ Re0[:subject]
 
-          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
           responding = []     # (Array) Responses from remote server
@@ -80,7 +77,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
@@ -95,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?
 
               #    ----- Transcript of session follows -----
@@ -178,10 +161,13 @@ module Sisimai
 
           if recipients == 0
             # Get the recipient address from the original message
-            if cv = rfc822part.match(/^To: (.+)$/m)
-              # The value of To: header in the original message
-              dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
-              recipients = 1
+            rfc822list.each do |e|
+              if cv = e.match(/^To: (.+)$/m)
+                # The value of To: header in the original message
+                dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
+                recipients = 1
+                break
+              end
             end
           end
           return nil if recipients == 0
@@ -189,15 +175,6 @@ module Sisimai
 
           dscontents.map do |e|
             errorindex += 1
-
-            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::MTA::V5sendmail.smtpagent
             e['command'] = commandset[errorindex] || ''
 
@@ -222,6 +199,7 @@ module Sisimai
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/x1.rb

@@ -18,8 +18,6 @@ module Sisimai
           :rfc822  => %r/\AReceived: from \d+[.]\d+[.]\d+[.]\d/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Unknown MTA #1'; end
         def smtpagent;   return 'X1'; end
@@ -43,11 +41,10 @@ module Sisimai
           return nil unless mhead['subject'] =~ Re0[:subject]
           return nil unless mhead['from']    =~ Re0[:from]
 
-          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
           datestring = ''     # (String) Date string
@@ -57,7 +54,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
@@ -72,30 +69,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 original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
@@ -123,29 +106,17 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::X1.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::X1.smtpagent
             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['date']      = datestring || ''
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/x2.rb

@@ -22,8 +22,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 'Unknown MTA #2'; end
         def smtpagent;   return 'X2'; end
@@ -47,11 +45,10 @@ module Sisimai
           return nil unless mhead['subject'] =~ Re0[:subject]
           return nil unless mhead['from']    =~ Re0[:from]
 
-          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
@@ -60,7 +57,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
@@ -75,30 +72,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 > 2
+                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 from example.com.
@@ -125,28 +108,16 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::X2.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::X2.smtpagent
             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.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/x3.rb

@@ -18,8 +18,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 'Unknown MTA #3'; end
         def smtpagent;   return 'X3'; end
@@ -43,11 +41,10 @@ module Sisimai
           return nil unless mhead['subject'] =~ Re0[:subject]
           return nil unless mhead['from']    =~ Re0[:from]
 
-          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?
 
               # ============================================================================
@@ -144,24 +127,14 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::X3.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::X3.smtpagent
             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.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
-
         end
 
       end