sisimai 4.25.16-java → 5.0.2-java

data/lib/sisimai/lhost/messagelabs.rb

@@ -1,18 +1,16 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MessageLabs parses a bounce email which created by
-  # Symantec.cloud: formerly MessageLabs. Methods in the module are called
-  # from only Sisimai::Message.
+  # Sisimai::Lhost::MessageLabs parses a bounce email which created by Symantec.cloud: formerly MessageLabs.
+  # Methods in the module are called from only Sisimai::Message.
   module MessageLabs
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MessageLabs.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      Boundaries = ['Content-Type: text/rfc822-headers'].freeze
       StartingOf = { message: ['Content-Type: message/delivery-status'] }.freeze
-      ReFailures = {
-        'userunknown'   => %r/(?:542 .+ Rejected|No such user)/,
-        'securityerror' => %r/Please turn on SMTP Authentication in your mail client/,
+      MessagesOf = {
+        'userunknown'   => ['542 ', ' Rejected', 'No such user'],
+        'securityerror' => ['Please turn on SMTP Authentication in your mail client'],
       }.freeze
 
       # Parse bounce messages from Symantec.cloud(MessageLabs)
@@ -20,7 +18,7 @@ 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-Msg-Ref: server-11.tower-143.messagelabs.com!1419367175!36473369!1
         # X-Originating-IP: [10.245.230.38]
         # X-StarScan-Received:
@@ -30,13 +28,12 @@ module Sisimai::Lhost
         return nil unless mhead['from'].include?('MAILER-DAEMON@messagelabs.com')
         return nil unless mhead['subject'].start_with?('Mail Delivery Failure')
 
-        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
@@ -44,8 +41,8 @@ module Sisimai::Lhost
         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
@@ -86,14 +83,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
@@ -101,20 +98,19 @@ 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['command']   = commandset.shift || ''
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailures.each_key do |r|
+          MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailures[r]
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Symantec.cloud http://www.messagelabs.com'; end
     end

data/lib/sisimai/lhost/messagingserver.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MessagingServer parses a bounce email which created
-  # by Oracle Communications Messaging Server and Sun Java System Messaging
-  # Server. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::MessagingServer parses a bounce email which created by Oracle Communications Messaging
+  # Server and Sun Java System Messaging Server. Methods in the module are called from only Sisimai::Message.
   module MessagingServer
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MessagingServer.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r<^(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)>.freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Return-path: '].freeze
       StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
       MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
 
@@ -17,23 +15,22 @@ 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)
-        # :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
+      def inquire(mhead, mbody)
         match  = 0
         match += 1 if mhead['content-type'].include?('Boundary_(ID_')
         match += 1 if mhead['subject'].start_with?('Delivery Notification: ')
         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])
@@ -62,45 +59,49 @@ module Sisimai::Lhost
           #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25) (6jo.example.jp ESMTP SENDMAIL-VM)
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ \t]+Recipient address:[ \t]*([^ ]+[@][^ ]+)\z/)
+          if e.start_with?('  Recipient address: ') && e.index('@') > 1
             #   Recipient address: 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'] = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
             recipients += 1
 
-          elsif cv = e.match(/\A[ \t]+Original address:[ \t]*([^ ]+[@][^ ]+)\z/)
+          elsif e.start_with?('  Original address: ') && e.index('@') > 1
             #   Original address: kijitora@example.jp
-            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            v['recipient'] = Sisimai::Address.s3s4(e[e.rindex(' ') + 1, e.size])
 
-          elsif cv = e.match(/\A[ \t]+Date:[ \t]*(.+)\z/)
+          elsif e.start_with?('  Date: ')
             #   Date: Fri, 21 Nov 2014 23:34:45 +0900
-            v['date'] = cv[1]
+            v['date'] = e[e.index(':') + 2, e.size]
 
-          elsif cv = e.match(/\A[ \t]+Reason:[ \t]*(.+)\z/)
+          elsif e.start_with?('  Reason: ')
             #   Reason: Remote SMTP server has rejected address
-            v['diagnosis'] = cv[1]
+            v['diagnosis'] = e[e.index(':') + 2, e.size]
 
-          elsif cv = e.match(/\A[ \t]+Diagnostic code:[ \t]*([^ ]+);(.+)\z/)
+          elsif e.start_with?('  Diagnostic code: ')
             #   Diagnostic code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
-            v['spec'] = cv[1].upcase
-            v['diagnosis'] = cv[2]
+            p1 = e.index(':')
+            p2 = e.index(';')
+            v['spec'] = e[p1 + 2, p2 - p1 - 2].upcase
+            v['diagnosis'] = e[p2 + 1, e.size]
 
-          elsif cv = e.match(/\A[ \t]+Remote system:[ ]*dns;([^ ]+)[ ]*([^ ]+)[ ]*.+\z/)
+          elsif e.start_with?('  Remote system: ')
             #   Remote system: dns;mx.example.jp (TCP|17.111.174.67|47323|192.0.2.225|25)
             #     (6jo.example.jp ESMTP SENDMAIL-VM)
-            remotehost = cv[1]  # remote host
-            sessionlog = cv[2]  # smtp session
+            p1 = e.index(';')
+            p2 = e.index('(')
+            remotehost = e[p1 + 1, p2 - p1 - 2]
+            sessionlog = e[p2, e.size].split('|')
             v['rhost'] = remotehost
 
             # The value does not include ".", use IP address instead.
             # (TCP|17.111.174.67|47323|192.0.2.225|25)
-            next unless cv = sessionlog.match(/\A[(]TCP|(.+)|\d+|(.+)|\d+[)]/)
-            v['lhost'] = cv[1]
-            v['rhost'] = cv[2] unless remotehost =~ /[^.]+[.][^.]+/
+            next unless sessionlog[0] == '(TCP'
+            v['lhost'] = sessionlog[1]
+            v['rhost'] = sessionlog[3] unless remotehost.index('.') > 1
           else
             # Original-envelope-id: 0NFC009FLKOUVMA0@mr21p30im-asmtp004.me.com
             # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
@@ -114,20 +115,22 @@ module Sisimai::Lhost
             #  (6jo.example.jp ESMTP SENDMAIL-VM)
             # Diagnostic-code: smtp;550 5.1.1 <kijitora@example.jp>... User Unknown
             #
-            if cv = e.match(/\AStatus:[ ]*(\d[.]\d[.]\d)[ ]*[(](.+)[)]\z/)
+            if e.start_with?('Status: ')
               # Status: 5.1.1 (Remote SMTP server has rejected address)
-              v['status'] = cv[1]
-              v['diagnosis'] ||= cv[2]
+              p1 = e.index(':')
+              p2 = e.index('(')
+              v['status']      = e[p1 + 2, p2 - p1 - 3]
+              v['diagnosis'] ||= e[p2 + 1, e[e.index(')') - p2 - 1]]
 
-            elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
+            elsif e.start_with?('Arrival-Date: ')
               # Arrival-date: Thu, 29 Apr 2014 23:34:45 +0000 (GMT)
-              v['date'] ||= cv[1]
+              v['date'] ||= e[e.index(':') + 2, e.size]
 
-            elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+            elsif e.start_with?('Reporting-MTA: ')
               # Reporting-MTA: dns;mr21p30im-asmtp004.me.com (tcp-daemon)
-              localhost = cv[1]
+              localhost = e[e.index(';') + 1, e.size]
               v['lhost'] ||= localhost
-              v['lhost']   = localhost unless v['lhost'] =~ /[^.]+[.][^ ]+/
+              v['lhost']   = localhost unless v['lhost'].index('.') > 0
             end
           end
         end
@@ -143,7 +146,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Oracle Communications Messaging Server'; end
     end

data/lib/sisimai/lhost/mfilter.rb

@@ -1,44 +1,43 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::mFILTER parses a bounce email which created by
-  # Digital Arts m-FILTER.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::mFILTER parses a bounce email which created by Digital Arts m-FILTER. Methods in
+  # the module are called from only Sisimai::Message.
   module MFILTER
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/mFILTER.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^-------original[ ](?:message|mail[ ]info)/.freeze
+      Boundaries = ['-------original message', '-------original mail info'].freeze
       StartingOf = {
         error:   ['-------server message'],
         command: ['-------SMTP command'],
       }.freeze
-      MarkingsOf = { message: %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/ }.freeze
 
       # Parse bounce messages from Digital Arts m-FILTER
       # @param  [Hash] mhead    Message headers of a bounce email
       # @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-Mailer: m-FILTER
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
         return nil unless mhead['subject'] == 'failure notice'
 
         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
         markingset = { 'diagnosis' => false, 'command' => false }
         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 =~ MarkingsOf[:message]
+            if e.include?('@') && e.include?(' ') == false && Sisimai::Address.is_emailaddress(e)
+              readcursor |= Indicators[:deliverystatus]
+            end
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
           next if e.empty?
@@ -60,7 +59,7 @@ module Sisimai::Lhost
           # -------original message
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+[@][^ ]+)\z/)
+          if e.include?('@') && e.include?(' ') == false
             # 以下のメールアドレスへの送信に失敗しました。
             # kijitora@example.jp
             if v['recipient']
@@ -68,10 +67,10 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = e
             recipients += 1
 
-          elsif e =~ /\A[A-Z]{4}/
+          elsif e.size == 4 && e.index(' ').nil?
             # -------SMTP command
             # DATA
             next if v['command']
@@ -105,13 +104,13 @@ module Sisimai::Lhost
           rhosts = Sisimai::RFC5322.received(rheads[-1])
 
           e['lhost'] ||= Sisimai::RFC5322.received(rheads[0]).shift
-          while ee = rhosts.shift do
+          [rhosts[0], rhosts[1]].each do |ee|
             # Avoid "... by m-FILTER"
             next unless ee.include?('.')
             e['rhost'] = ee
           end
         end
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Digital Arts m-FILTER'; end
     end

data/lib/sisimai/lhost/mxlogic.rb

@@ -1,22 +1,20 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::MXLogic parses a bounce email which created by
-  # McAfee SaaS (formerly MX Logic).
+  # Sisimai::Lhost::MXLogic parses a bounce email which created by McAfee SaaS (formerly MX Logic).
   # Methods in the module are called from only Sisimai::Message.
   module MXLogic
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/MXLogic.pm
       # Based on Sisimai::Lhost::Exim
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Included is a copy of the message header:|.freeze
+      Boundaries = ['Included is a copy of the message header:'].freeze
       StartingOf = { message: ['This message was created automatically by mail delivery software.'] }.freeze
       ReCommands = [
         %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})/,
       ].freeze
       MessagesOf = {
-        # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
+        # % find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
         'userunknown' => ['user not found'],
         # transports/smtp.c:3524|  addr->message = US"all host address lookups failed permanently";
@@ -74,7 +72,7 @@ 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-MX-Bounce: mta/src/queue/bounce
         # X-MXL-NoteHash: ffffffffffffffff-0000000000000000000000000000000000000000
         # X-MXL-Hash: 4c9d4d411993da17-bbd4212b6c887f6c23bab7db4bd87ef5edc00758
@@ -83,25 +81,19 @@ module Sisimai::Lhost
         match += 1 if mhead['x-mxl-hash']
         match += 1 if mhead['x-mxl-notehash']
         match += 1 if mhead['from'].start_with?('Mail Delivery System')
-        match += 1 if mhead['subject'] =~ %r{(?:
-             Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-            |Warning:[ ]message[ ][^ ]+[ ]delayed[ ]+
-            |Delivery[ ]Status[ ]Notification
-            )
-        }x
+        match += 1 if ['Delivery Status Notification', 'Mail delivery failed', 'Warning: message '].any? { |a| mhead['subject'].include?(a) }
         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
-        localhost0 = ''     # (String) Local MTA
         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 == StartingOf[:message][0]
@@ -120,7 +112,7 @@ module Sisimai::Lhost
           #    host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ \t]*[<]([^ ]+[@][^ ]+)[>]:(.+)\z/)
+          if e.start_with?('  <') && e.include?('@') && e.include?('>:')
             # A message that you have sent could not be delivered to one or more
             # recipients.  This is a permanent error.  The following address failed:
             #
@@ -130,8 +122,8 @@ module Sisimai::Lhost
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
-            v['diagnosis'] = cv[2]
+            v['recipient'] = e[3, e.index('>:') - 3]
+            v['diagnosis'] = e[e.index('>:') + 3, e.size]
             recipients += 1
 
           elsif dscontents.size == recipients
@@ -142,25 +134,24 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        unless mhead['received'].empty?
-          # Get the name of local MTA
-          # Received: from marutamachi.example.org (c192128.example.net [192.0.2.128])
-          if cv = mhead['received'][-1].match(/from[ ]([^ ]+) /) then localhost0 = cv[1] end
-        end
+        # Get the name of the local MTA
+        # Received: from marutamachi.example.org (c192128.example.net [192.0.2.128])
+        receivedby = mhead['received'] || []
+        recvdtoken = Sisimai::RFC5322.received(receivedby[-1])
 
         dscontents.each do |e|
-          e['lhost'] = localhost0
+          # Check the error message, the rhost, the lhost, and the smtp command.
+          e['lhost'] = recvdtoken[0]
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/[-]{2}.*\z/, ''))
 
           unless e['rhost']
             # Get the remote host name
-            # host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
-            if cv = e['diagnosis'].match(/host[ ]+([^ \t]+)[ ]\[.+\]:[ ]/) then e['rhost'] = cv[1] end
+            p1 = e['diagnosis'].index('host ') || -1
+            p2 = e['diagnosis'].index(' ', p1 + 5)
 
-            unless e['rhost']
-              # Get localhost and remote host name from Received header.
-              e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop unless mhead['received'].empty?
-            end
+            # host neko.example.jp [192.0.2.222]: 550 5.1.1 <kijitora@example.jp>... User Unknown
+            e['rhost']   = e['diagnosis'][p1 + 5, p2 - p1 - 5] if p1 > -1
+            e['rhost'] ||= recvdtoken[1]
           end
 
           unless e['command']
@@ -198,7 +189,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'McAfee SaaS'; end
     end

data/lib/sisimai/lhost/notes.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus
-  # Notes Server. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Notes parses a bounce email which created by Lotus Notes Server. Methods in the
+  # module are called from only Sisimai::Message.
   module Notes
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Notes.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^-------[ ]Returned[ ]Message[ ]--------|.freeze
+      Boundaries = ['------- Returned Message --------'].freeze
       StartingOf = { message: ['------- Failure Reasons '] }.freeze
       MessagesOf = {
         'userunknown' => [
@@ -22,12 +21,12 @@ 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 nil unless mhead['subject'].start_with?('Undeliverable message')
 
         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
         characters = ''     # (String) Character set name of the bounce mail
@@ -35,15 +34,14 @@ module Sisimai::Lhost
         encodedmsg = ''
         v = nil
 
-        if cv = mhead['content-type'].match(/\A.+;[ ]*charset=(.+)\z/)
-          # Get character set name
-          # Content-Type: text/plain; charset=ISO-2022-JP
-          characters = cv[1].downcase
+        if mhead['content-type'].include?('charset=')
+          # Get character set name, Content-Type: text/plain; charset=ISO-2022-JP
+          characters = mhead['content-type'][mhead['content-type'].index('charset=') + 8, mhead['content-type'].size].downcase
         end
 
         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])
@@ -58,7 +56,7 @@ module Sisimai::Lhost
           #
           # ------- Returned Message --------
           v = dscontents[-1]
-          if e =~ /\A[^ ]+[@][^ ]+/
+          if e.include?('@') && e.index(' ').nil?
             # kijitora@notes.example.jp
             if v['recipient']
               # There are multiple recipient addresses in the message body.
@@ -97,8 +95,10 @@ module Sisimai::Lhost
 
         unless recipients > 0
           # Fallback: Get the recpient address from RFC822 part
-          if cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
-            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+          p1 = emailparts[1].index("\nTo: ")     || -1
+          p2 = emailparts[1].index("\n", p1 + 6) || -1
+          if p1 > 0
+            v['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1 + 5, p2 - p1 - 5]) || ''
             recipients += 1 unless v['recipient'].empty?
           end
         end
@@ -117,7 +117,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Lotus Notes'; end
     end