sisimai 4.16.0-java → 4.17.0-java

data/lib/sisimai/mta/exim.rb

@@ -78,11 +78,11 @@ module Sisimai
         # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         ReFailure = {
           # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-          'userunknown' => %r/user[ ]not[ ]found/x,
+          userunknown: %r/user[ ]not[ ]found/x,
           # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
           # routers/dnslookup.c:331|  addr->message = US"all relevant MX records point to non-existent hosts";
           # route.c:1826|  uschar *message = US"Unrouteable address";
-          'hostunknown' => %r{(?>
+          hostunknown: %r{(?>
              all[ ](?:
                host[ ]address[ ]lookups[ ]failed[ ]permanently
               |relevant[ ]MX[ ]records[ ]point[ ]to[ ]non[-]existent[ ]hosts
@@ -93,10 +93,10 @@ module Sisimai
           # transports/appendfile.c:2567|  addr->user_message = US"mailbox is full";
           # transports/appendfile.c:3049|  addr->message = string_sprintf("mailbox is full "
           # transports/appendfile.c:3050|  "(quota exceeded while writing to file %s)", filename);
-          'mailboxfull' => %r/(?:mailbox[ ]is[ ]full:?|error:[ ]quota[ ]exceed)/x,
+          mailboxfull: %r/(?:mailbox[ ]is[ ]full:?|error:[ ]quota[ ]exceed)/x,
           # routers/dnslookup.c:328|  addr->message = US"an MX or SRV record indicated no SMTP service";
           # transports/smtp.c:3502|  addr->message = US"no host found for existing SMTP connection";
-          'notaccept' => %r{(?:
+          notaccept: %r{(?:
              an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
             |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
             )
@@ -104,14 +104,14 @@ module Sisimai
           # deliver.c:5614|  addr->message = US"delivery to file forbidden";
           # deliver.c:5624|  addr->message = US"delivery to pipe forbidden";
           # transports/pipe.c:1156|  addr->user_message = US"local delivery failed";
-          'systemerror' => %r{(?>
+          systemerror: %r{(?>
              delivery[ ]to[ ](?:file|pipe)[ ]forbidden
             |local[ ]delivery[ ]failed
             |LMTP[ ]error[ ]after[ ]
             )
           }x,
           # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
-          'contenterror' => %r/Too[ ]many[ ]["]Received["][ ]headers/x,
+          contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers/x,
         }
 
         # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
@@ -132,10 +132,7 @@ module Sisimai
           |Message[ ].+[ ](?:has[ ]been[ ]frozen|was[ ]frozen[ ]on[ ]arrival[ ]by[ ])
           )
         }x
-
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'Exim'; end
         def smtpagent;   return 'Exim'; end
@@ -160,11 +157,10 @@ module Sisimai
           return nil unless mhead['from']    =~ Re0[:from]
           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
           localhost0 = ''     # (String) Local MTA
@@ -184,7 +180,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 unless e =~ Re1[:frozen]
               end
             end
@@ -199,30 +195,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.
@@ -239,8 +221,7 @@ module Sisimai
                 # deliver.c:6811|  "recipients. This is a permanent error. The following address(es) failed:\n");
                 v['softbounce'] = 0
 
-              elsif cv = e.match(/\A[ ][ ]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)(:.+)?\z/) ||
-                    cv = e.match(Re1[:alias])
+              elsif cv = e.match(/\A[ ][ ]+([^ \t]+[@][^ \t]+[.][a-zA-Z]+)(:.+)?\z/) || e.match(Re1[:alias])
                 #   kijitora@example.jp
                 #   sabineko@example.jp: forced freeze
                 #
@@ -256,7 +237,7 @@ module Sisimai
                 recipients += 1
 
               elsif cv = e.match(/\A[ ]+[(]generated[ ]from[ ](.+)[)]\z/) ||
-                    cv = e.match(/\A[ ]+generated[ ]by[ ]([^ \t]+[@][^ \t]+)/)
+                         e.match(/\A[ ]+generated[ ]by[ ]([^ \t]+[@][^ \t]+)/)
                 #     (generated from kijitora@example.jp)
                 #  pipe to |/bin/echo "Some pipe output"
                 #    generated by userx@myhost.test.ex
@@ -457,7 +438,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
 
@@ -535,10 +516,10 @@ module Sisimai
               end
             end
             e['status'] ||= sv
-            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/imailserver.rb

@@ -9,8 +9,8 @@ module Sisimai
         require 'sisimai/rfc5322'
 
         Re0 = {
-          :'x-mailer' => %r/\A[<]SMTP32 v[\d.]+[>]\z/,
-          :'subject'  => %r/\AUndeliverable Mail\z/,
+          :'x-mailer' => %r/\A[<]SMTP32 v[\d.]+[>][ ]*\z/,
+          :'subject'  => %r/\AUndeliverable Mail[ ]*\z/,
         }
         Re1 = {
           :begin  => %r/\A\z/,    # Blank line
@@ -19,41 +19,25 @@ module Sisimai
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
         ReSMTP = {
-          'conn' => %r{(?:
+          conn: %r{(?:
                SMTP[ ]connection[ ]failed,
               |Unexpected[ ]connection[ ]response[ ]from[ ]server:
               )
           },
-          'ehlo' => %r|Unexpected response to EHLO/HELO:|,
-          'mail' => %r|Server response to MAIL FROM:|,
-          'rcpt' => %r|Additional RCPT TO generated following response:|,
-          'data' => %r|DATA command generated response:|,
+          ehlo: %r|Unexpected response to EHLO/HELO:|,
+          mail: %r|Server response to MAIL FROM:|,
+          rcpt: %r|Additional RCPT TO generated following response:|,
+          data: %r|DATA command generated response:|,
         }
         ReFailure = {
-          'hostunknown' => %r{
-              Unknown[ ]host
-          },
-          'userunknown' => %r{\A(?:
-               Unknown[ ]user
-              |Invalid[ ]final[ ]delivery[ ]userid    # Filtered ?
-              )
-          }x,
-          'mailboxfull' => %r{
-              \AUser[ ]mailbox[ ]exceeds[ ]allowed[ ]size
-          }x,
-          'securityerr' => %r{
-              \ARequested[ ]action[ ]not[ ]taken:[ ]virus[ ]detected
-          }x,
-          'undefined' => %r{
-              \Aundeliverable[ ]to[ ]
-          }x,
-          'expired' => %r{
-              \ADelivery[ ]failed[ ]\d+[ ]attempts
-          }x,
+          hostunknown: %r/Unknown[ ]host/x,
+          userunknown: %r/\A(?:Unknown[ ]user|Invalid[ ]final[ ]delivery[ ]userid)/x,
+          mailboxfull: %r/\AUser[ ]mailbox[ ]exceeds[ ]allowed[ ]size/x,
+          securityerr: %r/\ARequested[ ]action[ ]not[ ]taken:[ ]virus[ ]detected/x,
+          undefined:   %r/\Aundeliverable[ ]to[ ]/x,
+          expired:     %r/\ADelivery[ ]failed[ ]\d+[ ]attempts/x,
         }
         Indicators = Sisimai::MTA.INDICATORS
-        LongFields = Sisimai::RFC5322.LONGFIELDS
-        RFC822Head = Sisimai::RFC5322.HEADERFIELDS
 
         def description; return 'IPSWITCH IMail Server'; end
         def smtpagent;   return 'IMailServer'; end
@@ -80,11 +64,10 @@ module Sisimai
           match += 1 if mhead['x-mailer'] && mhead['x-mailer'] =~ Re0[:'x-mailer']
           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
           v = nil
@@ -93,7 +76,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
@@ -108,26 +91,12 @@ 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"
@@ -138,7 +107,7 @@ module Sisimai
               # Original message follows.
               v = dscontents[-1]
 
-              if cv = e.match(/\A(.+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)\z/)
+              if cv = e.match(/\A(.+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
                 # Unknown user: kijitora@example.com
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -169,23 +138,12 @@ 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.
             e['agent'] = Sisimai::MTA::IMailServer.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
-
             if e['alterrors'] && e['alterrors'].size > 0
               # Copy alternative error message
               if e['diagnosis']
@@ -201,23 +159,20 @@ module Sisimai
             ReSMTP.each_key do |r|
               # Detect SMTP command from the message
               next unless e['diagnosis'] =~ ReSMTP[r]
-              e['command'] = r.upcase
+              e['command'] = r.to_s.upcase
               break
             end
 
             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
 

data/lib/sisimai/mta/interscanmss.rb

@@ -26,8 +26,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 'Trend Micro InterScan Messaging Security Suite'; end
         def smtpagent;   return 'InterScanMSS'; end
@@ -54,11 +52,10 @@ module Sisimai
           match += 1 if Re0[:subject].find { |a| mhead['subject'] == a }
           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
           v = nil
@@ -67,7 +64,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
@@ -82,30 +79,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?
 
               # Sent <<< RCPT TO:<kijitora@example.co.jp>
@@ -113,16 +96,15 @@ module Sisimai
               v = dscontents[-1]
 
               if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                 cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
+                      e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
                 # Sent <<< RCPT TO:<kijitora@example.co.jp>
                 # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-                cr = cv[1]
-                if v['recipient'] && cr != v['recipient']
+                if v['recipient'] && cv[1] != v['recipient']
                   # There are multiple recipient addresses in the message body.
                   dscontents << Sisimai::MTA.DELIVERYSTATUS
                   v = dscontents[-1]
                 end
-                v['recipient'] = cr
+                v['recipient'] = cv[1]
                 recipients = dscontents.size
               end
 
@@ -133,30 +115,30 @@ module Sisimai
               elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
                 # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
                 v['diagnosis'] = cv[1]
+
+              else
+                # Error message in non-English
+                if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
+                  # >>> RCPT TO ...
+                  v['command'] = cv[1]
+
+                elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
+                  # <<< 550 5.1.1 User unknown
+                  v['diagnosis'] = cv[1]
+                end
               end
             end
           end
-
           return nil if recipients == 0
           require 'sisimai/string'
-          require 'sisimai/smtp/status'
 
           dscontents.map do |e|
-            e['agent'] = Sisimai::MTA::InterScanMSS.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::InterScanMSS.smtpagent
             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.each_key { |a| e[a] ||= '' }
           end
 
+          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
           return { 'ds' => dscontents, 'rfc822' => rfc822part }
         end