sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/lhost/qmail.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Qmail parses a bounce email which created by qmail.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Qmail parses a bounce email which created by qmail. Methods in the module are called
+  # from only Sisimai::Message.
   module Qmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/qmail.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^--- Below this line is a copy of the message[.]|.freeze
+      Boundaries = ['--- Below this line is a copy of the message.'].freeze
       StartingOf = {
         #  qmail-remote.c:248|    if (code >= 500) {
         #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
@@ -16,45 +15,33 @@ module Sisimai::Lhost
         #
         # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
         #  K = success, Z = temporary error, D = permanent error
-        message: ['Hi. This is the qmail'],
         error:   ['Remote host said:'],
+        message: ['Hi. This is the qmail'],
+        rhost:   ['Giving up on ', 'Connected to ', 'remote host '],
       }.freeze
-
-      ReSMTP = {
+      CommandSet = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        'conn' => %r/(?:Error:)?Connected to [^ ]+ but greeting failed[.]/,
+        'conn' => [' but greeting failed.'],
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        'ehlo' => %r/(?:Error:)?Connected to [^ ]+ but my name was rejected[.]/,
+        'ehlo' => [' but my name was rejected.'],
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        'mail' => %r/(?:Error:)?Connected to [^ ]+ but sender was rejected[.]/,
+        'mail' => [' but sender was rejected.'],
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        'rcpt' => %r/(?:Error:)?[^ ]+ does not like recipient[.]/,
+        'rcpt' => [' does not like recipient.'],
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-        'data' => %r{(?:
-           (?:Error:)?[^ ]+[ ]failed[ ]on[ ]DATA[ ]command[.]
-          |(?:Error:)?[^ ]+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
-          )
-        }x,
+        'data' => [' failed on DATA command', ' failed after I sent the message'],
       }.freeze
-      # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
-      ReHost = %r{(?:
-         Giving[ ]up[ ]on[ ]([^ ]+[0-9a-zA-Z])[.]?\z
-        |Connected[ ]to[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]
-        |remote[ ]host[ ]([-0-9a-zA-Z.]+[0-9a-zA-Z])[ ]said:
-        )
-      }x
 
       # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
       HasExpired = 'this message has been in the queue too long.'
-      ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4}) /
-      ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
+      OnHoldPair = [' does not like recipient.', 'this message has been in the queue too long.'].freeze
       FailOnLDAP = {
         # qmail-ldap-1.03-20040101.patch:19817 - 19866
         'suspend'     => ['Mailaddress is administrative?le?y disabled'],   # 5.2.1
@@ -104,27 +91,31 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # Pre process email headers and the body part of the message which generated
         # by qmail, see https://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
         #         Subject: failure notice
-        tryto  = /\A[(]qmail[ ]+\d+[ ]+invoked[ ]+(?:for[ ]+bounce|from[ ]+network)[)]/
+        tryto  = [['(qmail ', 'invoked for bounce)'], ['(qmail ', 'invoked from ', 'network)']]
         match  = 0
         match += 1 if mhead['subject'] == 'failure notice'
-        match += 1 if mhead['received'].any? { |a| a =~ tryto }
+        mhead['received'].each do |e|
+          # Received: (qmail 2222 invoked for bounce);29 Apr 2017 23:34:45 +0900
+          # Received: (qmail 2202 invoked from network); 29 Apr 2018 00:00:00 +0900
+          match += 1 if tryto.any? { |a| Sisimai::String.aligned(e, a) }
+        end
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -139,14 +130,14 @@ module Sisimai::Lhost
           # Giving up on 192.0.2.153.
           v = dscontents[-1]
 
-          if cv = e.match(/\A(?:To[ ]*:)?[<](.+[@].+)[>]:[ \t]*\z/)
+          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
             # <kijitora@example.jp>:
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(e[e.index('<'), e.size])
             recipients += 1
 
           elsif dscontents.size == recipients
@@ -157,8 +148,15 @@ module Sisimai::Lhost
             v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
 
             next if v['rhost']
-            next unless cv = e.match(ReHost)
-            v['rhost'] = cv[1]
+            StartingOf[:rhost].each do |r|
+              # Find a remote host name
+              p1 = e.index(r); next unless p1
+              cm = r.size
+              p2 = e.index(' ', p1 + cm + 1) || p2 = e.rindex('.') 
+
+              v['rhost'] = e[p1 + cm, p2 - p1 - cm]
+              break
+            end
           end
         end
         return nil unless recipients > 0
@@ -169,17 +167,16 @@ module Sisimai::Lhost
 
           unless e['command']
             # Get the SMTP command name for the session
-            ReSMTP.each_key do |r|
+            CommandSet.each_key do |r|
               # Verify each regular expression of SMTP commands
-              next unless e['diagnosis'] =~ ReSMTP[r]
+              next unless CommandSet[r].any? { |a| e['diagnosis'].include?(a) }
               e['command'] = r.upcase
               break
             end
 
-            unless e['command']
-              # Verify each regular expression of patches
-              if cv = e['diagnosis'].match(ReCommands) then e['command'] = cv[1].upcase end
-              e['command'] ||= ''
+            if e['diagnosis'].include?('Sorry, no SMTP connection got far enough; most progress was ')
+              # Get the last SMTP command:from the error message
+              e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis']) || '' 
             end
           end
 
@@ -193,9 +190,8 @@ module Sisimai::Lhost
             e['reason'] = 'blocked'
           else
             # Try to match with each error message in the table
-            if e['diagnosis'] =~ ReIsOnHold
-              # To decide the reason require pattern match with
-              # Sisimai::Reason::* modules
+            if Sisimai::String.aligned(e['diagnosis'], OnHoldPair)
+              # To decide the reason require pattern match with Sisimai::Reason::* modules
               e['reason'] = 'onhold'
             else
               MessagesOf.each_key do |r|
@@ -227,10 +223,11 @@ module Sisimai::Lhost
             end
           end
 
-          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
+          e['command'] ||= Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['status']    = Sisimai::SMTP::Status.find(e['diagnosis']) || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'qmail'; end
     end

data/lib/sisimai/lhost/receivingses.rb

@@ -1,15 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::ReceivingSES parses a bounce email which created
-  # by Amazon Simple Email Service. Methods in the module are called from
-  # only Sisimai::Message.
+  # Sisimai::Lhost::ReceivingSES parses a bounce email which created by Amazon Simple Email Service.
+  # Methods in the module are called from only Sisimai::Message.
   module ReceivingSES
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/ReceivingSES.pm
       require 'sisimai/lhost'
 
       # https://aws.amazon.com/ses/
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^content-type:[ ]text/rfc822-headers|.freeze
+      Boundaries = ['Content-Type: text/rfc822-headers'].freeze
       StartingOf = { message: ['This message could not be delivered.'] }.freeze
       MessagesOf = {
         # The followings are error messages in Rule sets/*/Actions/Template
@@ -24,26 +22,25 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-SES-Outgoing: 2015.10.01-54.240.27.7
         # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
         return nil unless mhead['x-ses-outgoing']
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -84,14 +81,14 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
             # Continued line of the value of Diagnostic-Code field
             next unless readslices[-2].start_with?('Diagnostic-Code:')
-            next unless cv = e.match(/\A[ \t]+(.+)\z/)
-            v['diagnosis'] << ' ' << cv[1]
+            next unless e.start_with?(' ')
+            v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
             readslices[-1] = 'Diagnostic-Code: ' << e
           end
         end
@@ -99,18 +96,15 @@ module Sisimai::Lhost
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          e['lhost'] ||= permessage['rhost']
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
             # Get other D.S.N. value from the error message
             errormessage = e['diagnosis']
-
-            if cv = e['diagnosis'].match(/["'](\d[.]\d[.]\d.+)['"]/)
-              # 5.1.0 - Unknown address error 550-'5.7.1 ...
-              errormessage = cv[1]
-            end
+            p1 = e['diagnosis'].index("-'");  p1 = e['diagnosis'].index('-"')  unless p1
+            p2 = e['diagnosis'].rindex("' "); p2 = e['diagnosis'].rindex('" ') unless p2
+            errormessage = e['diagnosis'][p1 + 2, p2 - p1 - 2] if p1 && p2
             e['status'] = Sisimai::SMTP::Status.find(errormessage) || e['status']
           end
 
@@ -123,7 +117,7 @@ module Sisimai::Lhost
           e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Amazon SES(Receiving): https://aws.amazon.com/ses/'; end
     end

data/lib/sisimai/lhost/sendgrid.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::SendGrid parses a bounce email which created by
-  # SendGrid. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::SendGrid parses a bounce email which created by SendGrid. Methods in the module
+  # are called from only Sisimai::Message.
   module SendGrid
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/SendGrid.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['This is an automatically generated message from SendGrid.'] }.freeze
 
       # Parse bounce messages from SendGrid
@@ -15,29 +14,29 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # Return-Path: <apps@sendgrid.net>
         # X-Mailer: MIME-tools 5.502 (Entity 5.502)
         return nil unless mhead['return-path']
         return nil unless mhead['return-path'] == '<apps@sendgrid.net>'
         return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
 
-        require 'sisimai/rfc1894'
+        require 'sisimai/smtp/command'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
+        thecommand = ''     # (String) SMTP Command name begin with the string '>>>'
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -57,8 +56,7 @@ module Sisimai::Lhost
               # Fallback code for empty value or invalid formatted value
               # - Status: (empty)
               # - Diagnostic-Code: 550 5.1.1 ... (No "diagnostic-type" sub field)
-              next unless cv = e.match(/\ADiagnostic-Code:[ ]*(.+)/)
-              v['diagnosis'] = cv[1]
+              v['diagnosis'] = e[e.index(':') + 2, e.size] if e.start_with?('Diagnostic-Code: ')
               next
             end
 
@@ -84,29 +82,37 @@ module Sisimai::Lhost
               v['diagnosis'] = o[2]
             elsif o[-1] == 'date'
               # Arrival-Date: 2012-12-31 23-59-59
-              next unless cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
-              o[1] << 'Thu, ' << cv[3] + ' '
-              o[1] << Sisimai::DateTime.monthname(false)[cv[2].to_i - 1]
-              o[1] << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
+              next unless e.start_with?('Arrival-Date: ')
+              cf = e[e.index(': ') + 2, e.size].split(' '); next unless cf.size == 2
+              cw = cf[0].split('-');                        next unless cw.size == 3
+              ce = cf[1].split('-');                        next unless ce.size == 3
+
+              o[1] << 'Thu, ' << cw[2] + ' '
+              o[1] << Sisimai::DateTime.monthname(false)[cw[1].to_i - 1]
+              o[1] << ' ' << cw[0] + ' ' << ce.join(':')
               o[1] << ' ' << Sisimai::DateTime.abbr2tz('CDT')
             else
               # Other DSN fields defined in RFC3464
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
             # The line does not begin with a DSN field defined in RFC3464
-            if cv = e.match(/.+ in (?:End of )?([A-Z]{4}).*\z/)
+            if cv = Sisimai::SMTP::Command.find(e)
               # in RCPT TO, in MAIL FROM, end of DATA
-              commandtxt = cv[1]
+              thecommand = cv
+            elsif e.start_with?('Diagnostic-Code: ')
+              # Diagnostic-Code: 550 5.1.1 <kijitora@example.jp>... User Unknown
+              v['diagnosis'] = e[e.index(':') + 2, e.size]
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] ||= ''
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -116,14 +122,12 @@ module Sisimai::Lhost
         dscontents.each do |e|
           # Get the value of SMTP status code as a pseudo D.S.N.
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          if cv = e['diagnosis'].match(/\b([45])\d\d[ \t]*/)
-            # 4xx or 5xx
-            e['status'] = cv[1] + '.0.0'
-          end
+          e['replycode'] = Sisimai::SMTP::Reply.find(e['diagnosis']) || ''
+          e['status']    = e['replycode'][0, 1] + '.0.0' if e['replycode'].size == 3
+          e['command']   = thecommand
 
           if e['status'] == '5.0.0' || e['status'] == '4.0.0'
-            # Get the value of D.S.N. from the error message or the value of
-            # Diagnostic-Code header.
+            # Get the value of D.S.N. from the error message or the value of Diagnostic-Code header.
             e['status'] = Sisimai::SMTP::Status.find(e['diagnosis']) || e['status']
           end
 
@@ -131,17 +135,13 @@ module Sisimai::Lhost
             # Action: expired
             e['reason'] = 'expired'
             if !e['status'] || e['status'].end_with?('.0.0')
-              # Set pseudo Status code value if the value of Status is not
-              # defined or 4.0.0 or 5.0.0.
+              # Set pseudo Status code value if the value of Status is not defined or 4.0.0 or 5.0.0.
               e['status'] = Sisimai::SMTP::Status.code('expired') || e['status']
             end
           end
-
-          e['lhost'] ||= permessage['rhost']
-          e['command'] = commandtxt
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'SendGrid: https://sendgrid.com/'; end
     end