sisimai 4.16.0 → 4.17.0

data/lib/sisimai/mta/mfilter.rb

@@ -21,8 +21,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 'Digital Arts m-FILTER'; end
         def smtpagent;   return 'm-FILTER'; end
@@ -47,11 +45,10 @@ module Sisimai
           return nil unless mhead['x-mailer'] =~ Re0[:'x-mailer']
           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
           markingset = { 'diagnosis' => false, 'command' => false }
@@ -60,7 +57,7 @@ module Sisimai
           hasdivided.each do |e|
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
-              readcursor |= Indicators[:'deliverystatus'] if e =~ Re1[:begin]
+              readcursor |= Indicators[:deliverystatus] if e =~ Re1[:begin]
             end
 
             if readcursor & Indicators[:'message-rfc822'] == 0
@@ -73,30 +70,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?
 
               # このメールは「m-FILTER」が自動的に生成して送信しています。
@@ -152,14 +135,10 @@ 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::MFILTER.smtpagent
-
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               rheads = mhead['received']
@@ -172,14 +151,12 @@ module Sisimai
                 e['rhost'] = ee
               end
             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::MFILTER.smtpagent
             e.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/mxlogic.rb

@@ -28,12 +28,11 @@ module Sisimai
           %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
           %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
         ]
-
         ReFailure = {
-          'userunknown' => %r{
+          userunknown: %r{
               user[ ]not[ ]found
           }x,
-          'hostunknown' => %r{(?>
+          hostunknown: %r{(?>
                all[ ](?:
                    host[ ]address[ ]lookups[ ]failed[ ]permanently
                   |relevant[ ]MX[ ]records[ ]point[ ]to[ ]non[-]existent[ ]hosts
@@ -41,27 +40,26 @@ module Sisimai
               |Unrouteable[ ]address
               )
           }x,
-          'mailboxfull' => %r{(?:
+          mailboxfull: %r{(?:
                mailbox[ ]is[ ]full:?
               |error:[ ]quota[ ]exceed
               )
           }x,
-          'notaccept' => %r{(?:
+          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
               |LMTP[ ]error[ ]after[ ]
               )
           }x,
-          'contenterror' => %r{
+          contenterror: %r{
               Too[ ]many[ ]["]Received["][ ]headers
           }x,
         }
-
         ReDelayed = %r{(?:
            retry[ ]timeout[ ]exceeded
           |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
@@ -72,8 +70,6 @@ module Sisimai
           )
         }x
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'McAfee SaaS'; end
         def smtpagent;   return 'MXLogic'; end
@@ -106,11 +102,10 @@ module Sisimai
           match += 1 if mhead['from']    =~ Re0[:from]
           return nil if match == 0
 
-          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
           localhost0 = ''     # (String) Local MTA
@@ -120,7 +115,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
@@ -135,30 +130,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.
@@ -208,8 +189,6 @@ module Sisimai
           end
 
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
-
           dscontents.map do |e|
             e['agent'] = Sisimai::MTA::MXLogic.smtpagent
             e['lhost'] = localhost0
@@ -256,7 +235,7 @@ 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
 
@@ -266,13 +245,10 @@ module Sisimai
                 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.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/mta/notes.rb

@@ -17,16 +17,14 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'userunknown' => %r{(?:
+          userunknown: %r{(?:
              User[ ]not[ ]listed[ ]in[ ]public[ ]Name[ ][&][ ]Address[ ]Book
             |ディレクトリのリストにありません
             )
           }x,
-          'networkerror' => %r/Message has exceeded maximum hop count/,
+          networkerror: %r/Message has exceeded maximum hop count/,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Lotus Notes'; end
         def smtpagent;   return 'Notes'; end
@@ -49,11 +47,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
           characters = ''     # (String) Character set name of the bounce mail
@@ -65,7 +62,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
@@ -88,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
 
               # ------- Failure Reasons  --------
               #
@@ -161,9 +144,12 @@ module Sisimai
 
           if recipients == 0
             # Fallback: Get the recpient address from RFC822 part
-            if cv = rfc822part.match(/^To:[ ]*(.+)$/m)
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-              recipients += 1 if v['recipient'].size > 0
+            rfc822list.each do |e|
+              if cv = e.match(/^To:[ ]*(.+)$/m)
+                v['recipient'] = Sisimai::Address.s3s4(cv[1])
+                recipients += 1 if v['recipient'].size > 0
+                break
+              end
             end
           end
 
@@ -172,31 +158,22 @@ module Sisimai
           require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::Notes.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::Notes.smtpagent
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e['recipient'] = Sisimai::Address.s3s4(e['recipient'])
 
             ReFailure.each_key do |r|
               # Check each regular expression of Notes error messages
               next unless e['diagnosis'] =~ ReFailure[r]
-              e['reason'] = r
-              pseudostatus = Sisimai::SMTP::Status.code(r)
+              e['reason'] = r.to_s
+              pseudostatus = Sisimai::SMTP::Status.code(r.to_s)
               e['status'] = pseudostatus if pseudostatus.size > 0
               break
             end
-            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/opensmtpd.rb

@@ -44,22 +44,22 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'expired' => %r{
+          expired: %r{
             # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
             Envelope[ ]expired
           }x,
-          'hostunknown' => %r{(?:
+          hostunknown: %r{(?:
             # smtpd/mta.c:976|  relay->failstr = "Invalid domain name";
              Invalid[ ]domain[ ]name
             # smtpd/mta.c:980|  relay->failstr = "Domain does not exist";
             |Domain[ ]does[ ]not[ ]exist
             )
           }x,
-          'notaccept' => %r{
+          notaccept: %r{
             # smtp/mta.c:1085|  relay->failstr = "Destination seem to reject all mails";
             Destination[ ]seem[ ]to[ ]reject[ ]all[ ]mails
           }x,
-          'networkerror' => %r{(?>
+          networkerror: %r{(?>
             #  smtpd/mta.c:972|  relay->failstr = "Temporary failure in MX lookup";
              Address[ ]family[ ]mismatch[ ]on[ ]destination[ ]MXs
             |All[ ]routes[ ]to[ ]destination[ ]blocked
@@ -74,14 +74,12 @@ module Sisimai
             |Temporary[ ]failure[ ]in[ ]MX[ ]lookup
             )
           }x,
-          'securityerror' => %r{
+          securityerror: %r{
             # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
             Could[ ]not[ ]retrieve[ ]credentials
           }x,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'OpenSMTPD'; end
         def smtpagent;   return 'OpenSMTPD'; end
@@ -106,11 +104,10 @@ module Sisimai
           return nil unless mhead['from']    =~ Re0[:from]
           return nil unless mhead['received'].find { |a| a =~ Re0[:received] }
 
-          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
@@ -119,7 +116,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
@@ -134,30 +131,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?
 
               #    Hi!
@@ -185,36 +168,23 @@ 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::OpenSMTPD.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::OpenSMTPD.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.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end