sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mda.rb

@@ -10,12 +10,12 @@ module Sisimai
         # dovecot/src/deliver/deliver.c
         # 11: #define DEFAULT_MAIL_REJECTION_HUMAN_REASON \
         # 12: "Your message to <%t> was automatically rejected:%n%r"
-        'dovecot'    => %r/\AYour message to .+ was automatically rejected:\z/,
-        'mail.local' => %r/\Amail[.]local: /,
-        'procmail'   => %r/\Aprocmail: /,
-        'maildrop'   => %r/\Amaildrop: /,
-        'vpopmail'   => %r/\Avdelivermail: /,
-        'vmailmgr'   => %r/\Avdeliver: /,
+        :'dovecot'    => %r/\AYour message to .+ was automatically rejected:\z/,
+        :'mail.local' => %r/\Amail[.]local: /,
+        :'procmail'   => %r/\Aprocmail: /,
+        :'maildrop'   => %r/\Amaildrop: /,
+        :'vpopmail'   => %r/\Avdelivermail: /,
+        :'vmailmgr'   => %r/\Avdeliver: /,
       }
       Re2 = %r{\A(?>
          Your[ ]message[ ]to[ ].+[ ]was[ ]automatically[ ]rejected:\z
@@ -25,58 +25,58 @@ module Sisimai
 
       # dovecot/src/deliver/mail-send.c:94
       ReFailure = {
-        'dovecot' => {
-          'userunknown' => %r/\AMailbox doesn't exist: /i,
-          'mailboxfull' => %r{\A(?:
+        :'dovecot' => {
+          :userunknown => %r/\AMailbox doesn't exist: /i,
+          :mailboxfull => %r{\A(?:
              Quota[ ]exceeded # Dovecot 1.2 dovecot/src/plugins/quota/quota.c
             |Quota[ ]exceeded[ ][(]mailbox[ ]for[ ]user[ ]is[ ]full[)]  # dovecot/src/plugins/quota/quota.c
             |Not[ ]enough[ ]disk[ ]space
             )
           }xi,
         },
-        'mail.local' => {
-          'userunknown' => %r{[:][ ](?:
+        :'mail.local' => {
+          :userunknown => %r{[:][ ](?:
              unknown[ ]user[:]
             |User[ ]unknown
             |Invalid[ ]mailbox[ ]path
             |User[ ]missing[ ]home[ ]directory
             )
           }xi,
-          'mailboxfull' => %r{(?:
+          :mailboxfull => %r{(?:
              Disc[ ]quota[ ]exceeded
             |Mailbox[ ]full[ ]or[ ]quota[ ]exceeded
             )
           }xi,
-          'systemerror' => %r/Temporary file write error/i,
+          :systemerror => %r/Temporary file write error/i,
         },
-        'procmail' => {
-          'mailboxfull' => %r/Quota exceeded while writing/i,
-          'systemfull'  => %r/No space left to finish writing/i,
+        :'procmail' => {
+          :mailboxfull => %r/Quota exceeded while writing/i,
+          :systemfull  => %r/No space left to finish writing/i,
         },
-        'maildrop' => {
-          'userunknown' => %r{(?:
+        :'maildrop' => {
+          :userunknown => %r{(?:
              Invalid[ ]user[ ]specified[.]
             |Cannot[ ]find[ ]system[ ]user
             )
           }xi,
-          'mailboxfull' => %r/maildir over quota[.]\z/i,
+          :mailboxfull => %r/maildir over quota[.]\z/i,
         },
-        'vpopmail' => {
-          'userunknown' => %r/Sorry, no mailbox here by that name[.]/i,
-          'filtered'    => %r{(?:
+        :'vpopmail' => {
+          :userunknown => %r/Sorry, no mailbox here by that name[.]/i,
+          :filtered    => %r{(?:
              account[ ]is[ ]locked[ ]email[ ]bounced
             |user[ ]does[ ]not[ ]exist,[ ]but[ ]will[ ]deliver[ ]to[ ]
             )
           }xi,
-          'mailboxfull' => %r/(?:domain|user) is over quota/i,
+          :mailboxfull => %r/(?:domain|user) is over quota/i,
         },
-        'vmailmgr' => {
-          'userunknown' => %r{(?>
+        :'vmailmgr' => {
+          :userunknown => %r{(?>
              Invalid[ ]or[ ]unknown[ ](?:base[ ]user[ ]or[ ]domain|virtual[ ]user)
             |User[ ]name[ ]does[ ]not[ ]refer[ ]to[ ]a[ ]virtual[ ]user/
             )
           }ix,
-          'mailboxfull' => %r/Delivery failed due to system quota violation/i,
+          :mailboxfull => %r/Delivery failed due to system quota violation/i,
         },
       }
 
@@ -115,7 +115,7 @@ module Sisimai
             Re1.each_key do |f|
               # Detect the agent name from the line
               next unless e =~ Re1[f]
-              agentname0 = f
+              agentname0 = f.to_s
               break
             end
           end
@@ -128,12 +128,12 @@ module Sisimai
         return nil unless agentname0.size > 0
         return nil unless linebuffer.size > 0
 
-        ReFailure[agentname0].each_key do |e|
+        ReFailure[agentname0.to_sym].each_key do |e|
           # Detect an error reason from message patterns of the MDA.
           linebuffer.each do |f|
             # Try to match with each regular expression
-            next unless f =~ ReFailure[agentname0][e]
-            reasonname = e
+            next unless f =~ ReFailure[agentname0.to_sym][e]
+            reasonname = e.to_s
             bouncemesg = f
             break
           end

data/lib/sisimai/message.rb

@@ -166,8 +166,9 @@ module Sisimai
       return {} if email.empty?
 
       email = email.scrub('?')
-      email = email.gsub(/[ \t]+$/, '')
-      email = email.gsub(/^[ \t]+$/, '')
+      email = email.gsub(/\r\n/, "\n")  if email =~ /\r\n/
+      email = email.gsub(/[ \t]+$/, '') if email =~ /[ \t]+$/
+
       hasdivided = email.split("\n")
       return {} if hasdivided.empty?
 
@@ -184,9 +185,6 @@ module Sisimai
       # Split email data to headers and a body part.
       hasdivided.each do |e|
         # Split email data to headers and a body part.
-        e = e.delete("\r").delete("\n")
-        e = e.gsub(/[ \t]+\z/, '')
-
         if readcursor & Indicators[:endof] > 0
           # The body part of the email
           aftersplit['body'] += e + "\n"

data/lib/sisimai/msp/de/einsundeins.rb

@@ -19,11 +19,9 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'mesgtoobig' => %r/Mail[ ]size[ ]limit[ ]exceeded/x,
+          mesgtoobig: %r/Mail[ ]size[ ]limit[ ]exceeded/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return '1&1: http://www.1and1.de'; end
         def smtpagent;   return 'DE::EinsUndEins'; end
@@ -48,11 +46,10 @@ 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")
-          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
@@ -61,7 +58,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
@@ -76,30 +73,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 address failed:
@@ -135,19 +118,11 @@ 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::DE::EinsUndEins.smtpagent
             e['diagnosis'] ||= ''
             e['diagnosis']   = e['diagnosis'].gsub(/\A#{Re1[:error]}/, '')
             e['diagnosis']   = Sisimai::String.sweep(e['diagnosis'])
@@ -155,15 +130,12 @@ 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
-
-            e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
-            e['spec']   = 'SMTP'
-            e['agent']  = Sisimai::MSP::DE::EinsUndEins.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

data/lib/sisimai/msp/de/gmx.rb

@@ -18,11 +18,9 @@ module Sisimai
           :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'expired' => %r/delivery[ ]retry[ ]timeout[ ]exceeded/x,
+          expired: %r/delivery[ ]retry[ ]timeout[ ]exceeded/x,
         }
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'GMX: http://www.gmx.net'; end
         def smtpagent;   return 'DE::GMX'; end
@@ -48,13 +46,12 @@ module Sisimai
         def scan(mhead, mbody)
           return nil unless mhead
           return nil unless mbody
-          return nil unless mhead['x-gmx-antispam'];
+          return nil unless mhead['x-gmx-antispam']
 
-          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
@@ -63,7 +60,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
@@ -78,30 +75,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.
@@ -116,8 +99,7 @@ module Sisimai
               # 5.1.1 <shironeko@example.jp>... User Unknown
               v = dscontents[-1]
 
-              if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) ||
-                 cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
+              if cv = e.match(/\A["]([^ ]+[@][^ ]+)["]:\z/) || e.match(/\A[<]([^ ]+[@][^ ]+)[>]\z/)
                 # "shironeko@example.jp":
                 # ---- OR ----
                 # <kijitora@6jo.example.co.jp>
@@ -143,7 +125,7 @@ module Sisimai
               else
                 # Get error message
                 if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
-                  v['diagnosis'] ||= e;
+                  v['diagnosis'] ||= e
 
                 else
                   next if e =~ /\A\z/
@@ -165,28 +147,19 @@ 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::DE::GMX.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::DE::GMX.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end
 

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

@@ -19,13 +19,10 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReFailure = {
-          'filtered'    => %r/Mail Delivery Failed[.]+ User unknown/,
-          'mailboxfull' => %r/The number of messages in recipient's mailbox exceeded the local limit[.]/,
+          filtered:    %r/Mail Delivery Failed[.]+ User unknown/,
+          mailboxfull: %r/The number of messages in recipient's mailbox exceeded the local limit[.]/,
         }
-
         Indicators = Sisimai::MSP.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'BIGLOBE: http://www.biglobe.ne.jp'; end
         def smtpagent;   return 'JP::Biglobe'; end
@@ -50,11 +47,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
           v = nil
@@ -63,7 +59,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
@@ -78,30 +74,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 is a MIME-encapsulated message.
@@ -145,31 +127,20 @@ module Sisimai
 
           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::JP::Biglobe.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']   = 'SMTP'
-            e['action'] = 'failed' if e['status'] =~ /\A[45]/
-            e['agent']  = Sisimai::MSP::JP::Biglobe.smtpagent
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end