sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/msp/jp/ezweb.rb

@@ -27,28 +27,26 @@ module Sisimai
           :endof    => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          #'notaccept' => [ %r/The following recipients did not receive this message:/ ],
-          'mailboxfull' => [
+          # notaccept: [ %r/The following recipients did not receive this message:/ ],
+          mailboxfull: [
             %r/The user[(]s[)] account is temporarily over quota/,
           ],
-          'suspend' => [
+          suspend: [
             # http://www.naruhodo-au.kddi.com/qa3429203.html
             # The recipient may be unpaid user...?
             %r/The user[(]s[)] account is disabled[.]/,
             %r/The user[(]s[)] account is temporarily limited[.]/,
           ],
-          'expired' => [
+          expired: [
             # Your message was not delivered within 0 days and 1 hours.
             # Remote host is not responding.
             %r/Your message was not delivered within /,
           ],
-          'onhold' => [
+          onhold: [
             %r/Each of the following recipients was rejected by a remote mail server/,
           ],
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
         def smtpagent;   return 'JP::EZweb'; end
@@ -81,11 +79,10 @@ module Sisimai
 
           require 'sisimai/string'
           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
           rxboundary = %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/
@@ -108,7 +105,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
 
@@ -122,30 +119,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 user(s) account is disabled.
@@ -162,8 +145,8 @@ module Sisimai
               v = dscontents[-1]
 
               if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                 cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
-                 cv = e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
+                      e.match(/\A[<]([^ ]+[@][^ ]+)[>]:?(.*)\z/) ||
+                      e.match(/\A[ \t]+Recipient: [<]([^ ]+[@][^ ]+)[>]/)
 
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -217,19 +200,9 @@ module Sisimai
               end
             end
           end
-
           return nil if recipients == 0
-          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
-
             if e['alterrors'] && e['alterrors'].size > 0
               # Copy alternative error message
               e['diagnosis'] ||= e['alterrors']
@@ -259,7 +232,7 @@ module Sisimai
                     ReFailure[r].each do |rr|
                       # Check each regular expression
                       next unless e['diagnosis'] =~ rr
-                      e['reason'] = r
+                      e['reason'] = r.to_s
                       throw :SESSION
                     end
                   end
@@ -276,13 +249,10 @@ module Sisimai
                 e['reason'] = 'userunknown'
               end
             end
-
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']  = Sisimai::MSP::JP::EZweb.smtpagent
+            e['agent'] = Sisimai::MSP::JP::EZweb.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/jp/kddi.rb

@@ -24,15 +24,12 @@ module Sisimai
           :error  => %r/Could not be delivered to:? /,
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
-
         ReFailure = {
-          'mailboxfull' => %r/As[ ]their[ ]mailbox[ ]is[ ]full/x,
-          'norelaying'  => %r/Due[ ]to[ ]the[ ]following[ ]SMTP[ ]relay[ ]error/x,
-          'hostunknown' => %r/As[ ]the[ ]remote[ ]domain[ ]doesnt[ ]exist/x,
+          mailboxfull: %r/As[ ]their[ ]mailbox[ ]is[ ]full/x,
+          norelaying:  %r/Due[ ]to[ ]the[ ]following[ ]SMTP[ ]relay[ ]error/x,
+          hostunknown: %r/As[ ]the[ ]remote[ ]domain[ ]doesnt[ ]exist/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'au by KDDI: http://www.au.kddi.com'; end
         def smtpagent;   return 'JP::KDDI'; end
@@ -63,11 +60,10 @@ module Sisimai
           require 'sisimai/string'
           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
           v = nil
@@ -76,7 +72,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 +87,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?
 
               v = dscontents[-1]
@@ -150,13 +132,7 @@ module Sisimai
           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::JP::KDDI.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
             if mhead['x-spasign'] && mhead['x-spasign'] == 'NG'
@@ -174,18 +150,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
               end
             end
 
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']  = Sisimai::MSP::JP::KDDI.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/ru/mailru.rb

@@ -33,15 +33,13 @@ module Sisimai
           %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
         ]
         ReFailure = {
-          'expired' => %r{(?:
+          expired: %r{(?:
                retry[ ]timeout[ ]exceeded
               |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
               )
           }x,
-          'userunknown' => %r{
-              user[ ]not[ ]found
-          }x,
-          'hostunknown' => %r{(?>
+          userunknown: %r/user[ ]not[ ]found/x,
+          hostunknown: %r{(?>
                all[ ](?:
                    host[ ]address[ ]lookups[ ]failed[ ]permanently
                   |relevant[ ]MX[ ]records[ ]point[ ]to[ ]non[-]existent[ ]hosts
@@ -49,28 +47,20 @@ module Sisimai
               |Unrouteable[ ]address
               )
           }x,
-          'mailboxfull' => %r{(?:
-               mailbox[ ]is[ ]full:?
-              |error:[ ]quota[ ]exceed
-              )
-          }x,
-          'notaccept' => %r{(?:
+          mailboxfull: %r/(?:mailbox[ ]is[ ]full:?|error:[ ]quota[ ]exceed)/x,
+          notaccept: %r{(?:
                an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
               |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
               )
           }x,
-          'systemerror' => %r{(?:
+          systemerror: %r{(?:
                delivery[ ]to[ ](?:file|pipe)[ ]forbidden
               |local[ ]delivery[ ]failed
               )
           }x,
-          'contenterror' => %r{
-              Too[ ]many[ ]["]Received["][ ]headers[ ]
-          }x,
+          contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers[ ]/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return '@mail.ru: https://mail.ru'; end
         def smtpagent;   return 'RU::MailRu'; end
@@ -95,11 +85,10 @@ module Sisimai
           return nil unless mhead['subject']    =~ Re0[:subject]
           return nil unless mhead['message-id'] =~ Re0[:'message-id']
 
-          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
           localhost0 = ''     # (String) Local MTA
@@ -109,7 +98,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
@@ -124,30 +113,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?
 
               # Это письмо создано автоматически
@@ -226,7 +202,6 @@ module Sisimai
             end
           end
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
             # Set default values if each value is empty.
@@ -283,19 +258,16 @@ module Sisimai
                 ReFailure.each_key do |r|
                   # Check each regular expression
                   next unless e['diagnosis'] =~ ReFailure[r]
-                  e['reason'] = r
+                  e['reason'] = r.to_s
                   break
                 end
               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['command'] ||= ''
             e['agent']     = Sisimai::MSP::RU::MailRu.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/ru/yandex.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 'Yandex.Mail: http://www.yandex.ru'; end
         def smtpagent;   return 'RU::Yandex'; end
@@ -50,12 +48,11 @@ module Sisimai
           return nil unless mhead['x-yandex-uniq']
           return nil unless mhead['from'] =~ Re0[:from]
 
-          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
@@ -68,12 +65,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
@@ -88,30 +86,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,37 +184,19 @@ module Sisimai
 
             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['command']   = commandset.shift || ''
             e['diagnosis'] = e['diagnosis'].gsub(/\\n/, '')
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-            e['status'] ||= ''
-            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
-
-            e['spec']  = 'SMTP'
-            e['agent'] = Sisimai::MSP::RU::Yandex.smtpagent
+            e['agent']     = Sisimai::MSP::RU::Yandex.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end