sisimai 4.16.0 → 4.17.0

data/lib/sisimai/rfc3834.rb

@@ -82,9 +82,8 @@ module Sisimai
 
         require 'sisimai/mta'
         require 'sisimai/address'
-        require 'sisimai/rfc5322'
 
-        dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
+        dscontents = [Sisimai::MTA.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
         maxmsgline = 5  # (Integer) Max message length(lines)
@@ -133,14 +132,6 @@ module Sisimai
         v['date']      = mhead['date']
         v['status']    = ''
 
-        if mhead['received'].size > 0
-          # Get localhost and remote host name from Received header.
-          r = mhead['received']
-          %w|lhost rhost|.each { |a| v[a] ||= '' }
-          v['lhost'] = Sisimai::RFC5322.received(r[0]).shift if v['lhost'].empty?
-          v['rhost'] = Sisimai::RFC5322.received(r[-1]).pop  if v['rhost'].empty?
-        end
-
         v.each_key { |a| v[a] ||= '' }
         return { 'ds' => dscontents, 'rfc822' => '' }
       end

data/lib/sisimai/rfc5322.rb

@@ -4,15 +4,15 @@ module Sisimai
     # Imported from p5-Sisimail/lib/Sisimai/RFC5322.pm
     class << self
       HeaderTable = {
-        'messageid' => ['Message-Id'],
-        'subject'   => ['Subject'],
-        'listid'    => ['List-Id'],
-        'date'      => ['Date', 'Posted-Date', 'Posted', 'Resent-Date'],
-        'addresser' => [
+        :messageid => ['Message-Id'],
+        :subject   => ['Subject'],
+        :listid    => ['List-Id'],
+        :date      => ['Date', 'Posted-Date', 'Posted', 'Resent-Date'],
+        :addresser => [
           'From', 'Return-Path', 'Reply-To', 'Errors-To', 'Reverse-Path',
           'X-Postfix-Sender', 'Envelope-From', 'X-Envelope-From',
         ],
-        'recipient' => [
+        :recipient => [
           'To', 'Delivered-To', 'Forward-Path', 'Envelope-To',
           'X-Envelope-To', 'Resent-To', 'Apparently-To'
         ],
@@ -30,7 +30,7 @@ module Sisimai
         #                     %d33-90 /       ; The rest of the US-ASCII
         #                     %d94-126        ;  characters not including "[",
         #                                     ;  "]", or "\"
-        re             = { 'rfc5322' => nil, 'ignored' => nil, 'domain' => nil }
+        re             = { rfc5322: nil, ignored: nil, domain: nil }
         atom           = %r([a-zA-Z0-9_!#\$\%&'*+/=?\^`{}~|\-]+)o
         quoted_string  = %r/"(?:\\[^\r\n]|[^\\"])*"/o
         domain_literal = %r/\[(?:\\[\x01-\x09\x0B-\x0c\x0e-\x7f]|[\x21-\x5a\x5e-\x7e])*\]/o
@@ -38,9 +38,9 @@ module Sisimai
         local_part     = %r/(?:#{dot_atom}|#{quoted_string})/o
         domain         = %r/(?:#{dot_atom}|#{domain_literal})/o
 
-        re['rfc5322']  = %r/#{local_part}[@]#{domain}/o
-        re['ignored']  = %r/#{local_part}[.]*[@]#{domain}/o
-        re['domain']   = %r/#{domain}/o
+        re[:rfc5322]   = %r/#{local_part}[@]#{domain}/o
+        re[:ignored]   = %r/#{local_part}[.]*[@]#{domain}/o
+        re[:domain]    = %r/#{domain}/o
 
         return re
       end
@@ -61,7 +61,7 @@ module Sisimai
       HeaderIndex = build_flatten_rfc822header_list.call
 
       # Grouped RFC822 headers
-      # @param    [String] group  RFC822 Header group name
+      # @param    [Symbol] group  RFC822 Header group name
       # @return   [Array,Hash]    RFC822 Header list
       def HEADERFIELDS(group = '')
         return HeaderIndex unless group.size > 0
@@ -74,6 +74,7 @@ module Sisimai
       def LONGFIELDS
         return { 'to' => 1, 'from' => 1, 'subject' => 1, 'message-id' => 1 }
       end
+      LongHeaders = Sisimai::RFC5322.LONGFIELDS
 
       # Check that the argument is an email address or not
       # @param    [String] email  Email address string
@@ -82,7 +83,7 @@ module Sisimai
       def is_emailaddress(email)
         return false unless email.is_a?(::String)
         return false if email =~ %r/(?:[\x00-\x1f]|\x1f)/
-        return true  if email =~ Re['ignored']
+        return true  if email =~ Re[:ignored]
         return false
       end
 
@@ -94,7 +95,7 @@ module Sisimai
         return false unless dpart.is_a?(::String)
         return false if dpart =~ /(?:[\x00-\x1f]|\x1f)/
         return false if dpart =~ /[@]/
-        return true  if dpart =~ Re['domain']
+        return true  if dpart =~ Re[:domain]
         return false
       end
 
@@ -106,12 +107,12 @@ module Sisimai
         return false unless email.is_a?(::String)
 
         re = %r/(?:
-               mailer-daemon[@]
-              |[<(]mailer-daemon[)>]
-              |\Amailer-daemon\z
-              |[ ]?mailer-daemon[ ]
-              )
-        /xi
+           (?:mailer-daemon|postmaster)[@]
+          |[<(](?:mailer-daemon|postmaster)[)>]
+          |\A(?:mailer-daemon|postmaster)\z
+          |[ ]?mailer-daemon[ ]
+          )
+        /xi;
         return true if email =~ re
         return false
       end
@@ -198,6 +199,43 @@ module Sisimai
         return hosts
       end
 
+      # Weed out rfc822/message header fields excepct necessary fields
+      # @param    [Array] argv1  each line divided message/rc822 part
+      # @return   [String]       Selected fields
+      def weedout(argv1)
+        return nil unless argv1.is_a?(Array)
+
+        rfc822next = { from: false, to: false, subject: false }
+        rfc822part = '' # (String) message/rfc822-headers part
+        previousfn = '' # (String) Previous field name
+
+        argv1.each do |e|
+          # After "message/rfc822"
+          if cv = e.match(/\A([-0-9A-Za-z]+?)[:][ ]*.+\z/)
+            # Get required headers
+            lhs = cv[1].downcase
+            previousfn = ''
+            next unless HeaderIndex.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 LongHeaders.key?(previousfn)
+
+          else
+            # Check the end of headers in rfc822 part
+            next unless LongHeaders.key?(previousfn)
+            next unless e.empty?
+            rfc822next[previousfn] = true
+          end
+        end
+
+        return rfc822part
+      end
+
     end
   end
 end

data/lib/sisimai/rhost/googleapps.rb

@@ -7,81 +7,81 @@ module Sisimai
       class << self
         # Imported from p5-Sisimail/lib/Sisimai/Rhost/GoogleApps.pm
         SMTPErrorSet = {
-          'X.1.1' => [
+          :'X.1.1' => [
             {
-              'reason' => 'userunknown',
-              'regexp' => [%r/The email account that you tried to reach does not exist[.]/],
+              :reason => 'userunknown',
+              :regexp => [%r/The email account that you tried to reach does not exist[.]/],
             }
           ],
-          'X.1.2' => [
+          :'X.1.2' => [
             {
-              'reason' => 'hostunknown',
-              'regexp' => [%r/We weren't able to find the recipient domain[.]/],
+              :reason => 'hostunknown',
+              :regexp => [%r/We weren't able to find the recipient domain[.]/],
             },
           ],
-          'X.2.1' => [
+          :'X.2.1' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [
+              :reason => 'undefined',
+              :regexp => [
                 %r/The user you are trying to contact is receiving mail too quickly[.]/,
                 %r/The user you are trying to contact is receiving mail at a rate/,
               ],
             },
             {
-              'reason' => 'suspend',
-              'regexp' => [%r/The email account that you tried to reach is disabled[.]/],
+              :reason => 'suspend',
+              :regexp => [%r/The email account that you tried to reach is disabled[.]/],
             },
           ],
-          'X.2.2' => [
+          :'X.2.2' => [
             {
-              'reason' => 'mailboxfull',
-              'regexp' => [%r/The email account that you tried to reach is over quota[.]/],
+              :reason => 'mailboxfull',
+              :regexp => [%r/The email account that you tried to reach is over quota[.]/],
             },
           ],
-          'X.2.3' => [
+          :'X.2.3' => [
             {
-              'reason' => 'exceedlimit',
-              'regexp' => [%r/Your message exceeded Google's message size limits[.]/],
+              :reason => 'exceedlimit',
+              :regexp => [%r/Your message exceeded Google's message size limits[.]/],
             },
           ],
-          'X.3.0' => [
+          :'X.3.0' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [
+              :reason => 'undefined',
+              :regexp => [
                 %r/Mail server temporarily rejected message[.]/,
                 %r/Multiple destination domains per transaction is unsupported[.]/,
               ],
             },
           ],
-          'X.4.2' => [
+          :'X.4.2' => [
             {
-              'reason' => 'expired',
-              'regexp' => [%r/Timeout [-] closing connection[.]/],
+              :reason => 'expired',
+              :regexp => [%r/Timeout [-] closing connection[.]/],
             },
           ],
-          'X.4.5' => [
+          :'X.4.5' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [%r/Server busy, try again later[.]/],
+              :reason => 'undefined',
+              :regexp => [%r/Server busy, try again later[.]/],
             },
             {
-              'reason' => 'exceedlimit',
-              'regexp' => [%r/Daily sending quota exceeded[.]/],
+              :reason => 'exceedlimit',
+              :regexp => [%r/Daily sending quota exceeded[.]/],
             },
           ],
-          'X.5.0' => [
+          :'X.5.0' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [
+              :reason => 'undefined',
+              :regexp => [
                 %r/SMTP protocol violation, see RFC 2821[.]/,
                 %r/SMTP protocol violation, no commands allowed to pipeline after STARTTLS/,
               ],
             },
           ],
-          'X.5.1' => [
+          :'X.5.1' => [
             {
-              'reason' => 'syntaxerror',
-              'regexp' => [
+              :reason => 'syntaxerror',
+              :regexp => [
                 %r/STARTTLS may not be repeated[.]/,
                 %r/Too many unrecognized commands, goodbye[.]/,
                 %r/Unimplemented command[.]/,
@@ -92,62 +92,62 @@ module Sisimai
               ],
             },
             {
-              'reason' => 'securityerror',
-              'regexp' => [%r/Authentication Required[.]/],
+              :reason => 'securityerror',
+              :regexp => [%r/Authentication Required[.]/],
             },
           ],
-          'X.5.2' => [
+          :'X.5.2' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [%r/Cannot Decode response[.]/],
+              :reason => 'undefined',
+              :regexp => [%r/Cannot Decode response[.]/],
             },
             {
-              'reason' => 'syntaxerror',
-              'regexp' => [%r/Syntax error[.]/],
+              :reason => 'syntaxerror',
+              :regexp => [%r/Syntax error[.]/],
             },
           ],
-          'X.5.3' => [
+          :'X.5.3' => [
             {
-              'reason' => 'undefined',
-              'regexp' => [
+              :reason => 'undefined',
+              :regexp => [
                 %r/Domain policy size per transaction exceeded[,]/,
                 %r/Your message has too many recipients[.]/,
               ],
             },
           ],
-          'X.5.4' => [
+          :'X.5.4' => [
             {
-              'reason' => 'syntaxerror',
-              'regexp' => [%r/Optional Argument not permitted for that AUTH mode[.]/],
+              :reason => 'syntaxerror',
+              :regexp => [%r/Optional Argument not permitted for that AUTH mode[.]/],
             },
           ],
-          'X.6.0' => [
+          :'X.6.0' => [
             {
-              'reason' => 'contenterror',
-              'regexp' => [
+              :reason => 'contenterror',
+              :regexp => [
                 %r/Mail message is malformed[.]/,
                 %r/Message exceeded 50 hops/,
               ],
             },
           ],
-          'X.7.0' => [
+          :'X.7.0' => [
             {
-              'reason' => 'blocked',
-              'regexp' => [
+              :reason => 'blocked',
+              :regexp => [
                 %r/IP not in whitelist for RCPT domain, closing connection[.]/,
                 %r/Our system has detected an unusual rate of unsolicited mail originating from your IP address[.]/,
               ],
             },
             {
-              'reason' => 'expired',
-              'regexp' => [
+              :reason => 'expired',
+              :regexp => [
                 %r/Temporary System Problem. Try again later[.]/,
                 %r/Try again later, closing connection[.]/,
               ],
             },
             {
-              'reason' => 'securityerror',
-              'regexp' => [
+              :reason => 'securityerror',
+              :regexp => [
                 %r/TLS required for RCPT domain, closing connection[.]/,
                 %r/No identity changes permitted[.]/,
                 %r/Must issue a STARTTLS command first[.]/,
@@ -155,55 +155,55 @@ module Sisimai
               ],
             },
             {
-              'reason' => 'systemerror',
-              'regexp' => [%r/Cannot authenticate due to temporary system problem[.]/],
+              :reason => 'systemerror',
+              :regexp => [%r/Cannot authenticate due to temporary system problem[.]/],
             },
             {
-              'reason' => 'norelaying',
-              'regexp' => [%r/Mail relay denied[.]/],
+              :reason => 'norelaying',
+              :regexp => [%r/Mail relay denied[.]/],
             },
             {
-              'reason' => 'rejected',
-              'regexp' => [%r/Mail Sending denied[.]/],
+              :reason => 'rejected',
+              :regexp => [%r/Mail Sending denied[.]/],
             },
           ],
-          'X.7.1' => [
+          :'X.7.1' => [
             {
-              'reason' => 'securityerror',
-              'regexp' => [
+              :reason => 'securityerror',
+              :regexp => [
                 %r/Application-specific password required[.]/,
                 %r/Please log in with your web browser and then try again[.]/,
                 %r/Username and Password not accepted[.]/,
               ],
             },
             {
-              'reason' => 'mailboxfull',
-              'regexp' => [%r/Email quota exceeded[.]/],
+              :reason => 'mailboxfull',
+              :regexp => [%r/Email quota exceeded[.]/],
             },
             {
-              'reason' => 'blocked',
-              'regexp' => [
+              :reason => 'blocked',
+              :regexp => [
                 %r/Our system has detected an unusual rate of unsolicited mail originating from your IP address[.]/,
                 %r/The IP you[']re using to send mail is not authorized to send email directly to our servers[.]/,
               ],
             },
             {
-              'reason' => 'contenterror',
-              'regexp' => [%r/Our system has detected that this message is likely unsolicited mail[.]/],
+              :reason => 'contenterror',
+              :regexp => [%r/Our system has detected that this message is likely unsolicited mail[.]/],
             },
             {
-              'reason' => 'filtered',
-              'regexp' => [%r/The user or domain that you are sending to [(]or from[)] has a policy/],
+              :reason => 'filtered',
+              :regexp => [%r/The user or domain that you are sending to [(]or from[)] has a policy/],
             },
             {
-              'reason' => 'rejected',
-              'regexp' => [%r/Unauthenticated email is not accepted from this domain[.]/],
+              :reason => 'rejected',
+              :regexp => [%r/Unauthenticated email is not accepted from this domain[.]/],
             },
           ],
-          'X.7.4' => [
+          :'X.7.4' => [
             {
-              'reason' => 'securityerror',
-              'regexp' => [%r/Unrecognized Authentication Type[.]/],
+              :reason => 'securityerror',
+              :regexp => [%r/Unrecognized Authentication Type[.]/],
             },
           ],
         }
@@ -220,12 +220,12 @@ module Sisimai
           statuscode = argvs.deliverystatus.sub(/\A\d[.](\d+[.]\d+)\z/, 'X.\1')
           statusmesg = argvs.diagnosticcode
           reasontext = ''
-          errortable = SMTPErrorSet[statuscode] || []
+          errortable = SMTPErrorSet[statuscode.to_sym] || []
 
           errortable.each do |e|
             # Try to match
-            next unless e['regexp'].find { |a| statusmesg =~ a }
-            reasontext = e['reason']
+            next unless e[:regexp].find { |a| statusmesg =~ a }
+            reasontext = e[:reason]
             break if reasontext.size > 0
           end
           return reasontext