sisimai 4.16.0-java → 4.17.0-java

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

@@ -19,8 +19,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 'Bigfoot: http://www.bigfoot.com'; end
         def smtpagent;   return 'US::Bigfoot'; end
@@ -48,12 +46,11 @@ module Sisimai
           return nil if match == 0
 
           require 'sisimai/address'
-          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
           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
@@ -200,39 +184,22 @@ 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['agent']     = Sisimai::MSP::US::Bigfoot.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
             e['command']   = commandtxt
             if e['command'].empty?
               e['command'] = 'EHLO' if esmtpreply.size > 0
             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
-
-            e['spec']  ||= 'SMTP'
-            e['agent']   = Sisimai::MSP::US::Bigfoot.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -21,63 +21,63 @@ module Sisimai
         # http://postmaster.facebook.com/response_codes
         # NOT TESTD EXCEPT RCP-P2
         ReFailure = {
-          'userunknown' => [
-            'RCP-P1',   # The attempted recipient address does not exist.
-            'INT-P1',   # The attempted recipient address does not exist.
-            'INT-P3',   # The attempted recpient group address does not exist.
-            'INT-P4',   # The attempted recipient address does not exist.
+          userunknown: [
+            'RCP-P1', # The attempted recipient address does not exist.
+            'INT-P1', # The attempted recipient address does not exist.
+            'INT-P3', # The attempted recpient group address does not exist.
+            'INT-P4', # The attempted recipient address does not exist.
           ],
-          'filtered' => [
-            'RCP-P2',   # The attempted recipient's preferences prevent messages from being delivered.
-            'RCP-P3',   # The attempted recipient's privacy settings blocked the delivery.
+          filtered: [
+            'RCP-P2', # The attempted recipient's preferences prevent messages from being delivered.
+            'RCP-P3', # The attempted recipient's privacy settings blocked the delivery.
           ],
-          'mesgtoobig' => [
-            'MSG-P1',   # The message exceeds Facebook's maximum allowed size.
-            'INT-P2',   # The message exceeds Facebook's maximum allowed size.
+          mesgtoobig: [
+            'MSG-P1', # The message exceeds Facebook's maximum allowed size.
+            'INT-P2', # The message exceeds Facebook's maximum allowed size.
           ],
-          'contenterror' => [
-            'MSG-P2',   # The message contains an attachment type that Facebook does not accept.
-            'MSG-P3',   # The message contains multiple instances of a header field that can only be present once. Please see RFC 5322, section 3.6 for more information
-            'POL-P6',   # The message contains a url that has been blocked by Facebook.
-            'POL-P7',   # The message does not comply with Facebook's abuse policies and will not be accepted.
+          contenterror: [
+            'MSG-P2', # The message contains an attachment type that Facebook does not accept.
+            'MSG-P3', # The message contains multiple instances of a header field that can only be present once. Please see RFC 5322, section 3.6 for more information
+            'POL-P6', # The message contains a url that has been blocked by Facebook.
+            'POL-P7', # The message does not comply with Facebook's abuse policies and will not be accepted.
           ],
-          'securityerror' => [
-            'POL-P1',   # Your mail server's IP Address is listed on the Spamhaus PBL.
-            'POL-P2',   # Facebook will no longer accept mail from your mail server's IP Address.
-            'POL-P5',   # The message contains a virus.
-            'POL-P7',   # The message does not comply with Facebook's Domain Authentication requirements.
+          securityerror: [
+            'POL-P1', # Your mail server's IP Address is listed on the Spamhaus PBL.
+            'POL-P2', # Facebook will no longer accept mail from your mail server's IP Address.
+            'POL-P5', # The message contains a virus.
+            'POL-P7', # The message does not comply with Facebook's Domain Authentication requirements.
           ],
-          'notaccept' => [
-            'POL-P3',   # Facebook is not accepting messages from your mail server. This will persist for 4 to 8 hours.
-            'POL-P4',   # Facebook is not accepting messages from your mail server. This will persist for 24 to 48 hours.
-            'POL-T1',   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 1 to 2 hours.
-            'POL-T2',   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 4 to 8 hours.
-            'POL-T3',   # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 24 to 48 hours.
+          notaccept: [
+            'POL-P3', # Facebook is not accepting messages from your mail server. This will persist for 4 to 8 hours.
+            'POL-P4', # Facebook is not accepting messages from your mail server. This will persist for 24 to 48 hours.
+            'POL-T1', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 1 to 2 hours.
+            'POL-T2', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 4 to 8 hours.
+            'POL-T3', # Facebook is not accepting messages from your mail server, but they may be retried later. This will persist for 24 to 48 hours.
           ],
-          'rejected' => [
-            'DNS-P1',   # Your SMTP MAIL FROM domain does not exist.
-            'DNS-P2',   # Your SMTP MAIL FROM domain does not have an MX record.
-            'DNS-T1',   # Your SMTP MAIL FROM domain exists but does not currently resolve.
-            'DNS-P3',   # Your mail server does not have a reverse DNS record.
-            'DNS-T2',   # You mail server's reverse DNS record does not currently resolve.
+          rejected: [
+            'DNS-P1', # Your SMTP MAIL FROM domain does not exist.
+            'DNS-P2', # Your SMTP MAIL FROM domain does not have an MX record.
+            'DNS-T1', # Your SMTP MAIL FROM domain exists but does not currently resolve.
+            'DNS-P3', # Your mail server does not have a reverse DNS record.
+            'DNS-T2', # You mail server's reverse DNS record does not currently resolve.
           ],
-          'systemerror' => [
-            'CON-T1',   # Facebook's mail server currently has too many connections open to allow another one.
+          systemerror: [
+            'CON-T1', # Facebook's mail server currently has too many connections open to allow another one.
           ],
-          'undefined' => [
-            'RCP-T1',   # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
-            'MSG-T1',   # The number of recipients on the message exceeds Facebook's allowed maximum.
-            'CON-T2',   # Your mail server currently has too many connections open to Facebook's mail servers.
-            'CON-T3',   # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
-            'CON-T4',   # Your mail server has exceeded the maximum number of recipients for its current connection.
+          toomanyconn: [
+            'CON-T3', # Your mail server has opened too many new connections to Facebook's mail servers in a short period of time.
           ],
-          'suspend' => [
-            'RCP-T4',   # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
+          suspend: [
+            'RCP-T4', # The attempted recipient address is currently deactivated. The user may or may not reactivate it.
+          ],
+          undefined: [
+            'RCP-T1', # The attempted recipient address is not currently available due to an internal system issue. This is a temporary condition.
+            'MSG-T1', # The number of recipients on the message exceeds Facebook's allowed maximum.
+            'CON-T2', # Your mail server currently has too many connections open to Facebook's mail servers.
+            'CON-T4', # Your mail server has exceeded the maximum number of recipients for its current connection.
           ],
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Facebook: https://www.facebook.com'; end
         def smtpagent;   return 'US::Facebook'; end
@@ -101,12 +101,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
           fbresponse = ''     # (String) Response code from Facebook
@@ -119,12 +118,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
@@ -139,30 +139,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,21 +220,12 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['lhost'] ||= connheader['lhost']
-
-            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['lhost']   ||= connheader['lhost']
+            e['agent']     = Sisimai::MSP::US::Facebook.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             if cv = e['diagnosis'].match(/\b([A-Z]{3})[-]([A-Z])(\d)\b/)
@@ -257,7 +234,7 @@ module Sisimai
               rhs = cv[2]
               num = cv[3]
 
-              fbresponse = sprintf("%s-%s%d", lhs, rhs, num)
+              fbresponse = sprintf('%s-%s%d', lhs, rhs, num)
               e['softbounce'] = rhs == 'P' ? 0 : 1
             end
 
@@ -267,7 +244,7 @@ module Sisimai
                 ReFailure[r].each do |rr|
                   # Check each regular expression
                   next unless fbresponse == rr
-                  e['reason'] = r
+                  e['reason'] = r.to_s
                   throw :SESSION
                 end
               end
@@ -289,13 +266,9 @@ module Sisimai
                 e['softbounce'] = 1
               end
             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::Facebook.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -24,13 +24,13 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'expired' => %r{(?:
+          expired: %r{(?:
                DNS[ ]Error:[ ]Could[ ]not[ ]contact[ ]DNS[ ]servers
               |Delivery[ ]to[ ]the[ ]following[ ]recipient[ ]has[ ]been[ ]delayed
               |The[ ]recipient[ ]server[ ]did[ ]not[ ]accept[ ]our[ ]requests[ ]to[ ]connect
               )
           }x,
-          'hostunknown' => %r{DNS[ ]Error:[ ](?:
+          hostunknown: %r{DNS[ ]Error:[ ](?:
                Domain[ ]name[ ]not[ ]found
               |DNS[ ]server[ ]returned[ ]answer[ ]with[ ]no[ ]data
               )
@@ -110,8 +110,6 @@ module Sisimai
           '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Google Gmail: https://mail.google.com'; end
         def smtpagent;   return 'US::Google'; end
@@ -184,11 +182,10 @@ module Sisimai
           return nil unless mhead['subject'] =~ Re0[:subject]
 
           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
           statecode0 = 0      # (Integer) The value of (state *) in the error message
@@ -198,7 +195,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]
               end
             end
 
@@ -212,33 +209,16 @@ module Sisimai
 
             if readcursor & Indicators[:'message-rfc822'] > 0
               # After "message/rfc822"
-              if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
-                # Skip if DKIM-Signature header
-                next if e =~ /\ADKIM-Signature[:]/
-
-                # 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?
 
               # Technical details of permanent failure:=20
@@ -289,6 +269,7 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
+            e['agent']     = Sisimai::MSP::US::Google.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             unless e['rhost']
@@ -308,14 +289,6 @@ 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
-
             if cv = e['diagnosis'].match(/[(]state[ ](\d+)[)][.]/)
               statecode0 = cv[1]
             end
@@ -329,7 +302,7 @@ 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
             end
@@ -342,11 +315,9 @@ module Sisimai
                 e['reason'] = Sisimai::SMTP::Status.name(e['status'])
               end
             end
-            e['spec']   = e['reason'] == 'mailererror' ? 'X-UNIX' : 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']  = Sisimai::MSP::US::Google.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end