sisimai 4.25.4-java → 4.25.10-java

data/lib/sisimai/lhost/imailserver.rb

@@ -7,12 +7,8 @@ module Sisimai::Lhost
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/IMailServer.pm
       require 'sisimai/lhost'
 
-      Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: [''],  # Blank line
-        rfc822:  ['Original message follows.'],
-        error:   ['Body of message generated response:'],
-      }.freeze
+      ReBackbone = %r|^Original[ ]message[ ]follows[.]|.freeze
+      StartingOf = { error: ['Body of message generated response:'] }.freeze
 
       ReSMTP = {
         'conn' => %r/(?:SMTP connection failed,|Unexpected connection response from server:)/,
@@ -22,109 +18,70 @@ module Sisimai::Lhost
         'data' => %r|DATA command generated response:|,
       }.freeze
       ReFailures = {
-        'hostunknown' => %r/Unknown host/,
-        'userunknown' => %r/\A(?:Unknown user|Invalid final delivery userid)/,
-        'mailboxfull' => %r/\AUser mailbox exceeds allowed size/,
-        'securityerr' => %r/\ARequested action not taken: virus detected/,
-        'undefined'   => %r/\Aundeliverable to /,
-        'expired'     => %r/\ADelivery failed \d+ attempts/,
+        'hostunknown'   => %r/Unknown host/,
+        'userunknown'   => %r/\A(?:Unknown user|Invalid final delivery userid)/,
+        'mailboxfull'   => %r/\AUser mailbox exceeds allowed size/,
+        'securityerror' => %r/\ARequested action not taken: virus detected/,
+        'undefined'     => %r/\Aundeliverable to /,
+        'expired'       => %r/\ADelivery failed \d+ attempts/,
       }.freeze
 
-      def description; return 'IPSWITCH IMail Server'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return %w[x-mailer]; end
-
       # Parse bounce messages from IMailServer
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
+        # X-Mailer: <SMTP32 v8.22>
         match  = 0
         match += 1 if mhead['subject'] =~ /\AUndeliverable Mail[ ]*\z/
         match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        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
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          if readcursor == 0
-            # Beginning of the bounce message or delivery status part
-            if e == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          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.
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            break if readcursor & Indicators[:'message-rfc822'] > 0
+          # Unknown user: kijitora@example.com
+          #
+          # Original message follows.
+          v = dscontents[-1]
 
+          if cv = e.match(/\A([^ ]+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
             # Unknown user: kijitora@example.com
-            #
-            # Original message follows.
-            v = dscontents[-1]
-
-            if cv = e.match(/\A([^ ]+)[ ](.+)[:][ \t]*([^ ]+[@][^ ]+)/)
-              # Unknown user: kijitora@example.com
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['diagnosis'] = cv[1] + ' ' + cv[2]
-              v['recipient'] = cv[3]
-              recipients += 1
-
-            elsif cv = e.match(/\Aundeliverable[ ]+to[ ]+(.+)\z/)
-              # undeliverable to kijitora@example.com
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients += 1
-            else
-              # Other error message text
-              v['alterrors'] << ' ' << e if v['alterrors']
-              v['alterrors'] = e if e.include?(StartingOf[:error][0])
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
+            end
+            v['diagnosis'] = cv[1] + ' ' + cv[2]
+            v['recipient'] = cv[3]
+            recipients += 1
+
+          elsif cv = e.match(/\Aundeliverable[ ]+to[ ]+(.+)\z/)
+            # undeliverable to kijitora@example.com
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v['recipient'] = cv[1]
+            recipients += 1
+          else
+            # Other error message text
+            v['alterrors'] << ' ' << e if v['alterrors']
+            v['alterrors'] = e if e.include?(StartingOf[:error][0])
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent'] = self.smtpagent
-
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] = if e['diagnosis']
@@ -150,13 +107,11 @@ module Sisimai::Lhost
             e['reason'] = r
             break
           end
-          e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'IPSWITCH IMail Server'; end
     end
   end
 end

data/lib/sisimai/lhost/interscanmss.rb

@@ -6,28 +6,13 @@ module Sisimai::Lhost
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Lhost/InterScanMSS.pm
       require 'sisimai/lhost'
-
-      Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: [''],
-        rfc822:  ['Content-type: message/rfc822'],
-      }.freeze
-
-      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
+      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
 
       # Parse bounce messages from InterScanMSS
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
         match = 0
@@ -37,96 +22,66 @@ module Sisimai::Lhost
           'メール配信に失敗しました',
         ]
         match += 1 if mhead['from'].start_with?('"InterScan MSS"')
+        match += 1 if mhead['from'].start_with?('"InterScan Notification"')
         match += 1 if tryto.any? { |a| mhead['subject'] == a }
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        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
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          if readcursor == 0
-            # Beginning of the bounce message or delivery status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          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.
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e.start_with?(StartingOf[:rfc822][0])
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          v = dscontents[-1]
+          if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
+                  e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)   ||
+                  e.match(/\A(?:Reason:[ ]+)?Unable[ ]to[ ]deliver[ ]message[ ]to[ ][<](.+)[>]/)
+            # Sent <<< RCPT TO:<kijitora@example.co.jp>
+            # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            # Unable to deliver message to <kijitora@neko.example.jp>
+            if v['recipient'] && cv[1] != v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
+            v['recipient'] = cv[1]
+            v['diagnosis'] = e if e =~ /Unable[ ]to[ ]deliver[ ]/
+            recipients = dscontents.size
           end
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
+          if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
             # Sent <<< RCPT TO:<kijitora@example.co.jp>
-            # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-            v = dscontents[-1]
-
-            if cv = e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]\z/) ||
-                    e.match(/\A.+[<>]{3}[ \t]+.+[<]([^ ]+[@][^ ]+)[>]/)
-              # Sent <<< RCPT TO:<kijitora@example.co.jp>
-              # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
-              if v['recipient'] && cv[1] != v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              recipients = dscontents.size
-            end
+            v['command'] = cv[1]
 
-            if cv = e.match(/\ASent[ ]+[<]{3}[ ]+([A-Z]{4})[ ]/)
-              # Sent <<< RCPT TO:<kijitora@example.co.jp>
+          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(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
-              # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
+            elsif cv = e.match(/[ ][<]{3}[ ](.+)/)
+              # <<< 550 5.1.1 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 unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          e.each_key { |a| e[a] ||= '' }
+          e['reason'] = 'userunknown' if e['diagnosis'] =~ /Unable[ ]to[ ]deliver/
         end
-
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'Trend Micro InterScan Messaging Security Suite'; end
     end
   end
 end

data/lib/sisimai/lhost/kddi.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = { rfc822: ['Content-Type: message/rfc822'] }.freeze
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
       MarkingsOf = {
         message: %r/\AYour[ ]mail[ ](?:
              sent[ ]on:?[ ][A-Z][a-z]{2}[,]
@@ -21,21 +21,11 @@ module Sisimai::Lhost
         'hostunknown' => ['As the remote domain doesnt exist'],
       }.freeze
 
-      def description; return 'au by KDDI: https://www.au.kddi.com'; end
-      def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
-      def headerlist;  return []; end
-
       # Parse bounce messages from au by KDDI
-      # @param         [Hash] mhead       Message headers of a bounce email
-      # @options mhead [String] from      From header
-      # @options mhead [String] date      Date header
-      # @options mhead [String] subject   Subject header
-      # @options mhead [Array]  received  Received headers
-      # @options mhead [String] others    Other required headers
-      # @param         [String] mbody     Message body of a bounce email
-      # @return        [Hash, Nil]        Bounce data list and message/rfc822
-      #                                   part or nil if it failed to parse or
-      #                                   the arguments are missing
+      # @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)
         # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
@@ -46,72 +36,50 @@ module Sisimai::Lhost
         return nil unless match > 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        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.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e =~ MarkingsOf[:message]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
+          v = dscontents[-1]
+          if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            #     Could not be delivered to: <******@**.***.**>
+            #     As their mailbox is full.
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-          end
+            r = Sisimai::Address.s3s4(cv[1])
+            next unless Sisimai::RFC5322.is_emailaddress(r)
+            v['recipient'] = r
+            recipients += 1
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
+          elsif cv = e.match(/Your mail sent on: (.+)\z/)
+            # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
+            v['date'] = cv[1]
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            v = dscontents[-1]
-            if cv = e.match(/\A[ \t]+Could not be delivered to: [<]([^ ]+[@][^ ]+)[>]/)
-              # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-              #     Could not be delivered to: <******@**.***.**>
-              #     As their mailbox is full.
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              r = Sisimai::Address.s3s4(cv[1])
-              next unless Sisimai::RFC5322.is_emailaddress(r)
-              v['recipient'] = r
-              recipients += 1
-
-            elsif cv = e.match(/Your mail sent on: (.+)\z/)
-              # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
-              v['date'] = cv[1]
-            else
-              #     As their mailbox is full.
-              v['diagnosis'] ||= ''
-              v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
-            end
+            #     As their mailbox is full.
+            v['diagnosis'] ||= ''
+            v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
           end
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
-          e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           if mhead['x-spasign'].to_s == 'NG'
@@ -136,10 +104,9 @@ module Sisimai::Lhost
 
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
-
+      def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end
   end
 end