sisimai 4.25.3-java → 4.25.9-java

data/lib/sisimai/lhost/yahoo.rb

@@ -0,0 +1,101 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Yahoo parses a bounce email which created by Yahoo! MAIL.
+  # Methods in the module are called from only Sisimai::Message.
+  module Yahoo
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Yahoo.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^--- Below this line is a copy of the message[.]|.freeze
+      StartingOf = { message: ['Sorry, we were unable to deliver your message'] }.freeze
+
+      # Parse bounce messages from Yahoo! MAIL
+      # @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-YMailISG: YtyUVyYWLDsbDh...
+        # X-YMail-JAS: Pb65aU4VM1mei...
+        # X-YMail-OSG: bTIbpDEVM1lHz...
+        # X-Originating-IP: [192.0.2.9]
+        return nil unless mhead['x-ymailisg']
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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 = 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
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # Sorry, we were unable to deliver your message to the following address.
+          #
+          # <kijitora@example.org>:
+          # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
+          v = dscontents[-1]
+
+          if cv = e.match(/\A[<](.+[@].+)[>]:[ \t]*\z/)
+            # <kijitora@example.org>:
+            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['diagnosis'] = ''
+            recipients += 1
+          else
+            if e.start_with?('Remote host said:')
+              # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
+              v['diagnosis'] = e
+
+              # Get SMTP command from the value of "Remote host said:"
+              if cv = e.match(/\[([A-Z]{4}).*\]\z/) then v['command'] = cv[1] end
+            else
+              # <mailboxfull@example.jp>:
+              # Remote host said:
+              # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
+              # [RCPT_TO]
+              if v['diagnosis'].start_with?('Remote host said:')
+                # Remote host said:
+                # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
+                if cv = e.match(/\[([A-Z]{4}).*\]\z/)
+                  # [RCPT_TO]
+                  v['command'] = cv[1]
+                else
+                  # 550 5.2.2 <mailboxfull@example.jp>... Mailbox Full
+                  v['diagnosis'] = e
+                end
+              else
+                # Error message which does not start with 'Remote host said:'
+                v['diagnosis'] << ' ' << e
+              end
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
+          e['command'] ||= 'RCPT' if e['diagnosis'] =~ /[<].+[@].+[>]/
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Yahoo! MAIL: https://www.yahoo.com'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/yandex.rb

@@ -0,0 +1,123 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Yandex parses a bounce email which created by Yandex.Mail.
+  # Methods in the module are called from only Sisimai::Message.
+  module Yandex
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Yandex.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['This is the mail system at host yandex.ru.'] }.freeze
+
+      # Parse bounce messages from Yandex.Mail
+      # @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-Yandex-Front: mxback1h.mail.yandex.net
+        # X-Yandex-TimeMark: 1417885948
+        # X-Yandex-Uniq: 92309766-f1c8-4bd4-92bc-657c75766587
+        # X-Yandex-Spam: 1
+        # X-Yandex-Forward: 10104c00ad0726da5f37374723b1e0c8
+        # X-Yandex-Queue-ID: 367D79E130D
+        # X-Yandex-Sender: rfc822; shironeko@yandex.example.com
+        return nil unless mhead['x-yandex-uniq']
+        return nil unless mhead['from'] == 'mailer-daemon@yandex.ru'
+
+        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")
+        readslices = ['']
+        readcursor = 0      # (Integer) Points the current cursor position
+        recipients = 0      # (Integer) The number of 'Final-Recipient' header
+        commandset = []     # (Array) ``in reply to * command'' list
+        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.
+          readslices << e # Save the current line for the next loop
+
+          if readcursor == 0
+            # Beginning of the bounce message or message/delivery-status part
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          if f = Sisimai::RFC1894.match(e)
+            # "e" matched with any field defined in RFC3464
+            next unless o = Sisimai::RFC1894.field(e)
+            v = dscontents[-1]
+
+            if o[-1] == 'addr'
+              # Final-Recipient: rfc822; kijitora@example.jp
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              if o[0] == 'final-recipient'
+                # Final-Recipient: rfc822; 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'] = o[2]
+                recipients += 1
+              else
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                v['alias'] = o[2]
+              end
+            elsif o[-1] == 'code'
+              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+              v['spec'] = o[1]
+              v['diagnosis'] = o[2]
+            else
+              # Other DSN fields defined in RFC3464
+              next unless fieldtable[o[0]]
+              v[fieldtable[o[0]]] = o[2]
+
+              next unless f == 1
+              permessage[fieldtable[o[0]]] = o[2]
+            end
+          else
+            # The line does not begin with a DSN field defined in RFC3464
+            if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
+              # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
+              commandset << cv[1]
+
+            elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
+              # to MAIL command)
+              commandset << cv[1]
+            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]
+              readslices[-1] = 'Diagnostic-Code: ' << e
+            end
+          end
+        end
+        return nil unless recipients > 0
+
+        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'].tr("\n", ' '))
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Yandex.Mail: https://www.yandex.ru'; end
+    end
+  end
+end
+

data/lib/sisimai/lhost/zoho.rb

@@ -0,0 +1,109 @@
+module Sisimai::Lhost
+  # Sisimai::Lhost::Zoho parses a bounce email which created by Zoho Mail.
+  # Methods in the module are called from only Sisimai::Message.
+  module Zoho
+    class << self
+      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Zoho.pm
+      require 'sisimai/lhost'
+
+      Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Received:[ ]*from[ ]mail[.]zoho[.]com[ ]by[ ]mx[.]zohomail[.]com|.freeze
+      StartingOf = { message: ['This message was created automatically by mail delivery'] }.freeze
+      MessagesOf = { 'expired' => ['Host not reachable'] }.freeze
+
+      # Parse bounce messages from Zoho Mail
+      # @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-ZohoMail: Si CHF_MF_NL SS_10 UW48 UB48 FMWL UW48 UB48 SGR3_1_09124_42
+        # X-Zoho-Virus-Status: 2
+        # X-Mailer: Zoho Mail
+        return nil unless mhead['x-zohomail']
+
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        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
+        qprintable = 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.
+          if readcursor == 0
+            # Beginning of the bounce message or delivery status part
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
+          end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+
+          # This message was created automatically by mail delivery software.
+          # A message that you sent could not be delivered to one or more of its recip=
+          # ients. This is a permanent error.=20
+          #
+          # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
+          # 1 <kijitora@example.co.jp>... User Unknown
+
+          # This message was created automatically by mail delivery software.
+          # A message that you sent could not be delivered to one or more of its recipients. This is a permanent error.
+          #
+          # shironeko@example.org Invalid Address, ERROR_CODE :550, ERROR_CODE :Requested action not taken: mailbox unavailable
+          v = dscontents[-1]
+
+          if cv = e.match(/\A([^ ]+[@][^ ]+)[ \t]+(.+)\z/)
+            # kijitora@example.co.jp Invalid Address, ERROR_CODE :550, ERROR_CODE :5.1.=
+            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['diagnosis'] = cv[2]
+
+            if v['diagnosis'].end_with?('=')
+              # Quoted printable
+              v['diagnosis'] = v['diagnosis'].chomp('=')
+              qprintable = true
+            end
+            recipients += 1
+
+          elsif cv = e.match(/\A\[Status: .+[<]([^ ]+[@][^ ]+)[>],/)
+            # Expired
+            # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
+            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['diagnosis'] = e
+            recipients += 1
+          else
+            # Continued line
+            next unless qprintable
+            v['diagnosis'] << e
+          end
+        end
+        return nil unless recipients > 0
+
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
+          MessagesOf.each_key do |r|
+            # Verify each regular expression of session errors
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            e['reason'] = r
+            break
+          end
+        end
+
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+      end
+      def description; return 'Zoho Mail: https://www.zoho.com'; end
+    end
+  end
+end
+

data/lib/sisimai/mail.rb

@@ -1,31 +1,30 @@
 module Sisimai
-  # Sisimai::Mail is a handler of UNIX mbox or Maildir for reading each mail. It is
-  # wrapper class of Sisimai::Mail::Mbox and Sisimai::Mail::Maildir classes.
+  # Sisimai::Mail is a handler of UNIX mbox or Maildir for reading each mail.
+  # It is a wrapper class of Sisimai::Mail::Mbox, Sisimai::Mail::Maildir, and
+  # Sisimai::Mail::Memory classes.
   class Mail
     # Imported from p5-Sisimail/lib/Sisimai/Mail.pm
-    @@roaccessors = [
-      :path,  # [String] path to mbox or Maildir/
-      :type,  # [String] Data type: mailbox, maildir, or stdin
-    ]
-    @@rwaccessors = [
-      :mail,  # [Sisimai::Mail::[Mbox,Maildir,Memory,STDIN]] Object
-    ]
-    @@roaccessors.each { |e| attr_reader   e }
-    @@rwaccessors.each { |e| attr_accessor e }
+    Until = 'v4.25.10'
+
+    # :path [String] path to mbox or Maildir/
+    # :kind [String] Data type: mailbox, maildir, or stdin
+    # :data [Sisimai::Mail::[Mbox,Maildir,Memory,STDIN]] Object
+    attr_reader   :path, :kind
+    attr_accessor :data
 
     # Constructor of Sisimai::Mail
     # @param    [String] argv1        Path to mbox or Maildir/
     # @return   [Sisimai::Mail, Nil]  Object or nil if the argument was wrong
     def initialize(argv1)
       classname = nil
-      parameter = { 'path' => argv1, 'type' => nil, 'mail' => nil }
+      parameter = { 'path' => argv1, 'kind' => nil, 'data' => nil }
 
       if argv1.is_a?(::String)
         # Path to mail or '<STDIN>' ?
         if argv1 == '<STDIN>'
           # Sisimai::Mail.new('<STDIN>')
           classname = self.class.to_s << '::STDIN'
-          parameter['type'] = 'stdin'
+          parameter['kind'] = 'stdin'
           parameter['path'] = $stdin
         else
           # The argumenet is a mailbox or a Maildir/.
@@ -34,17 +33,17 @@ module Sisimai
           if mediatype == 'file'
             # The argument is a file, it is an mbox or email file in Maildir/
             classname = self.class.to_s << '::Mbox'
-            parameter['type'] = 'mailbox'
+            parameter['kind'] = 'mailbox'
 
           elsif mediatype == 'directory'
             # The agument is not a file, it is a Maildir/
             classname = self.class.to_s << '::Maildir'
-            parameter['type'] = 'maildir'
+            parameter['kind'] = 'maildir'
 
           elsif mediatype == 'memory'
             # The argument is an email string
             classname = self.class.to_s << '::Memory'
-            parameter['type'] = 'memory'
+            parameter['kind'] = 'memory'
             parameter['path'] = 'MEMORY'
           end
         end
@@ -52,33 +51,45 @@ module Sisimai
         # Read from STDIN
         # The argument neither a mailbox nor a Maildir/.
         classname = self.class.to_s << '::STDIN'
-        parameter['type'] = 'stdin'
+        parameter['kind'] = 'stdin'
       end
       return nil unless classname
 
       classpath = classname.gsub('::', '/').downcase
       require classpath
-      parameter['mail'] = Module.const_get(classname).new(argv1)
+      parameter['data'] = Module.const_get(classname).new(argv1)
 
       @path = parameter['path']
-      @type = parameter['type']
-      @mail = parameter['mail']
+      @kind = parameter['kind']
+      @data = parameter['data']
+    end
+
+    def mail
+      warn " ***warning: Sisimai::Mail.mail will be removed at #{Until}. Use Sisimai::Mail.data instead"
+      return data
     end
 
-    # Mbox/Maildir reader, works as an iterator.
+    def type
+      warn " ***warning: Sisimai::Mail.type will be removed at #{Until}. Use Sisimai::Mail.kind instead"
+      return kind
+    end
+
+    # Alias method of Sisimai::Mail.data.read()
     # @return   [String] Contents of mbox/Maildir
     def read
-      return nil unless mail
-      return mail.read
+      return nil unless data
+      return data.read
     end
 
     # Close the handle
     # @return   [True,False]  true:  Successfully closed the handle
     #                         false: Mail handle is not defined
     def close
-      return false unless mail.handle
-      mail.handle = nil
+      warn " ***warning: Sisimai::Mail.close will be removed at #{Until}. The handle automatically closes at the EOF"
+      return false unless data.handle
+      data.handle = nil
       return true
     end
   end
 end
+