rims 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acc91008294ca9589a19ecb657d5a04cc9d21c17e6349e059dd371bba0f4dbb
-  data.tar.gz: f750c5ef8ea6064033d1b6e1e0329964db61e56f1e9e1535883a19fcb1738aa3
+  metadata.gz: 5f51adf08f317981cdec3bb1067edd7a6c4befcf2f3e3e9c3ab4ac97702dad80
+  data.tar.gz: d0089e4150ad0768b0267c3c34980fad6a5251f0953997bd75a8c00e590120bb
 SHA512:
-  metadata.gz: 003c20745f575ba8801f6b72956b42b3329f45fc84f70fe68146767fae15a657f9a3cb1767f759877e8cf442738873a05182c835d697c702e4fad7a575b560d3
-  data.tar.gz: 449554fe7059796dd4fbbce1c433b7abc2a411ad5ee24acccc0618bb1043e2fb6b9a006dc0e93eb5c32813409a80b2bb677c37e39437e819153c38233cbaa194
+  metadata.gz: 4be9394ccaa4e2081dcc4040f197f375444b04953706c050aad5b1e255121cfec2d49753f31160f0dc458dcac139296b37c5efe0685f749904e5a0d74c705b24
+  data.tar.gz: a1a1a3f16b3069b2fd0e2ee9016349fbb2bb43401220ed9d00beec44914b4ef0206582c41a2bfb94c895d91ea6eb62ba76dcdd342338aa5becb8670777a3343a

data/ChangeLog

@@ -1,3 +1,63 @@
+2019-07-08  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/cmd.rb: disable plug-in name list on plug-in command
+	options.
+
+	* lib/rims/cmd.rb: environment command is defined.
+
+2019-07-02  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/decoder.rb: ALERT message notified to client
+	immediately.
+
+2019-07-01  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/decoder.rb, lib/rims/protocol/parser.rb: skip
+	encoding error on SEARCH command.
+
+	* lib/rims/protocol/decoder.rb: BADCHARSET response code for
+	unknown charset on SERCH command.
+
+	See RFC 3501 / 6.4.4.  SEARCH Command
+	<https://tools.ietf.org/html/rfc3501#section-6.4.4>
+
+	    If the server does not support the specified [CHARSET], it MUST
+	    return a tagged NO response (not a BAD).  This response SHOULD
+	    contain the BADCHARSET response code, which MAY list the
+	    [CHARSET]s supported by the server.
+
+2019-06-29  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/decoder.rb: line break before error response
+	interrupting search command.
+
+2019-06-25  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/parser.rb: delete unnecessary private methods.
+
+2019-06-23  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/parser.rb: add extension data to
+	bodystructure.
+
+2019-06-21  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/rfc822.rb, rims.gemspec, test/test_rfc822.rb: repladced
+	`RIMS::RFC822' to a external rubygem.
+
+2019-06-15  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/parser.rb: not allowed empty body field
+	parameters at attribute parser.
+
+	when body field parameters are empty, a command to fetch
+	`bodystructure' should response `NIL' instead of `()'.
+
+	see RFC 3501 / 9. Formal Syntax:
+	<https://tools.ietf.org/html/rfc3501#section-9>
+
+        body-fld-param  = "(" string SP string *(SP string SP string) ")" / nil
+
 2019-06-10  TOKI Yoshinori  <toki@freedom.ne.jp>
 
 	* RIMS version 0.2.5 is released.

data/lib/rims/cmd.rb

@@ -1,13 +1,10 @@
 # -*- coding: utf-8 -*-
 
 require 'json'
-require 'logger'
 require 'net/imap'
 require 'optparse'
 require 'pp'if $DEBUG
 require 'riser'
-require 'syslog'
-require 'syslog/logger'
 require 'yaml'
 
 OptionParser.accept(JSON) do |json_data, *_|
@@ -61,7 +58,7 @@ module RIMS
       puts "commands:"
       w = CMDs.keys.map{|k| k.length }.max + 4
       fmt = "    %- #{w}s%s"
-      CMDs.each do |cmd_name, cmd_entry|
+      CMDs.sort_by{|cmd_name, _| cmd_name }.each do |cmd_name, cmd_entry|
         if ((! show_debug_command) && (cmd_name =~ /\A debug/x)) then
           next
         end
@@ -519,13 +516,7 @@ module RIMS
       end
       options.on('--meta-kvs-type=TYPE',
                  KeyValueStore::FactoryBuilder.plug_in_names,
-                 "Choose key-value store type of mailbox meta-data database" +
-                 if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
-                   ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
-                 else
-                   ''
-                 end +
-                 ". default is `" +
+                 "Choose key-value store type of mailbox meta-data database. default is `" +
                  KeyValueStore::FactoryBuilder.plug_in_names[0] +
                  "'."
                 ) do |kvs_type|
@@ -568,13 +559,7 @@ module RIMS
       end
       options.on('--text-kvs-type=TYPE',
                  KeyValueStore::FactoryBuilder.plug_in_names,
-                 "Choose key-value store type of mailbox text-data database" +
-                 if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
-                   ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
-                 else
-                   ''
-                 end +
-                 ". default is `" +
+                 "Choose key-value store type of mailbox text-data database. default is `" +
                  KeyValueStore::FactoryBuilder.plug_in_names[0] +
                  "'."
                 ) do |kvs_type|
@@ -627,7 +612,7 @@ module RIMS
       end
       options.on('--passwd-config=TYPE_JSONDATA',
                  /([^:]+)(?::(.*))?/,
-                 "Password source type (#{Authentication.plug_in_names.join(',')}) and configuration. format is `[type]:[json_data]'."
+                 "Password source type and configuration. format is `[type]:[json_data]'."
                 ) do |_, type, json_data|
         build.chain{|c|
           c.load(authentication: {
@@ -641,7 +626,7 @@ module RIMS
       end
       options.on('--passwd-file=TYPE_FILE',
                  /([^:]+):(.+)/,
-                 "Password source type (#{Authentication.plug_in_names.join(',')}) and configuration file. format is `[type]:[file]'."
+                 "Password source type and configuration file. format is `[type]:[file]'."
                 ) do |_, type, path|
         build.chain{|c|
           c.load(authentication: {
@@ -907,14 +892,7 @@ module RIMS
       def key_value_store_option
         @conf[:key_value_store_type] = GDBM_KeyValueStore
         @options.on('--kvs-type=TYPE',
-                    KeyValueStore::FactoryBuilder.plug_in_names,
-                    "Choose key-value store type of mailbox database" +
-                    if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
-                      ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
-                    else
-                      ''
-                    end +
-                    ". default is `" +
+                    "Choose key-value store type of mailbox database. default is `" +
                     KeyValueStore::FactoryBuilder.plug_in_names[0] +
                     "'."
                    ) do |kvs_type|
@@ -1145,6 +1123,44 @@ module RIMS
     end
     command_function :cmd_daemon, "Daemon start/stop/status tool."
 
+    def cmd_environment(options, args)
+      format = {
+        yaml: lambda{|env|
+          YAML.dump(env)
+        },
+        json: lambda{|env|
+          JSON.pretty_generate(env)
+        }
+      }
+
+      conf = Config.new(options,
+                        [ [ :format_type,
+                            format.keys.first,
+                            '--format=FORMAT',
+                            format.keys,
+                            "Choose display format (#{format.keys.join(' ')})."
+                          ]
+                        ])
+      conf.required_feature_option
+      conf.setup_option_list
+      conf.parse_options!(args)
+
+      env = {
+        'RIMS Environment' => [
+          { 'RUBY VERSION' => RUBY_DESCRIPTION },
+          { 'RIMS VERSION' => RIMS::VERSION },
+          { 'AUTHENTICATION PLUG-IN' => Authentication.plug_in_names },
+          { 'KEY-VALUE STORE PLUG-IN' => KeyValueStore::FactoryBuilder.plug_in_names }
+        ]
+      }
+
+      formatter = format[conf[:format_type]]
+      puts formatter.call(env)
+
+      0
+    end
+    command_function :cmd_environment, 'Show rims environment.'
+
     def imap_append(imap, mailbox, message, store_flags: [], date_time: nil, verbose: false)
       puts "message date: #{date_time}" if (verbose && date_time)
       store_flags = nil if store_flags.empty?

data/lib/rims/protocol/decoder.rb

@@ -26,9 +26,13 @@ module RIMS
         output_write = lambda{|res|
           last_line = nil
           for data in res
-            logger.debug("response data: #{Protocol.io_data_log(data)}") if logger.debug?
-            output << data
-            last_line = data
+            if (data == :flush) then
+              output.flush
+            else
+              logger.debug("response data: #{Protocol.io_data_log(data)}") if logger.debug?
+              output << data
+              last_line = data
+            end
           end
           output.flush
 
@@ -252,13 +256,13 @@ module RIMS
         end
         private :imap_command
 
-        def make_engine_and_recovery_if_needed(services, username,
+        def make_engine_and_recovery_if_needed(drb_services, username,
                                                logger: Logger.new(STDOUT))
           unique_user_id = Authentication.unique_user_id(username)
           logger.debug("unique user ID: #{username} -> #{unique_user_id}") if logger.debug?
 
           logger.info("open mail store: #{unique_user_id} [ #{username} ]")
-          engine = services[:engine, unique_user_id]
+          engine = drb_services[:engine, unique_user_id]
 
           begin
             engine.recovery_if_needed(username) {|msg| yield(msg) }
@@ -321,10 +325,10 @@ module RIMS
         private :imap_command
       end
 
-      def initialize(services, auth, logger,
+      def initialize(drb_services, auth, logger,
                      mail_delivery_user: Service::DEFAULT_CONFIG.mail_delivery_user)
         super(auth, logger)
-        @services = services
+        @drb_services = drb_services
         @mail_delivery_user = mail_delivery_user
       end
 
@@ -360,9 +364,9 @@ module RIMS
         case (username)
         when @mail_delivery_user
           @logger.info("mail delivery user: #{username}")
-          MailDeliveryDecoder.new(self, @services, @auth, @logger)
+          MailDeliveryDecoder.new(self, @drb_services, @auth, @logger)
         else
-          engine = self.class.make_engine_and_recovery_if_needed(@services, username, logger: @logger) {|msg| yield(msg) }
+          engine = self.class.make_engine_and_recovery_if_needed(@drb_services, username, logger: @logger) {|msg| yield(msg) }
           UserMailboxDecoder.new(self, engine, @auth, @logger)
         end
       end
@@ -375,7 +379,7 @@ module RIMS
           if (username != :*) then
             yield response_stream(tag) {|res|
               @logger.info("authentication OK: #{username}")
-              @next_decoder = accept_authentication(username) {|msg| res << msg }
+              @next_decoder = accept_authentication(username) {|msg| res << msg << :flush }
               res << "#{tag} OK AUTHENTICATE #{auth_type} success\r\n"
             }
           else
@@ -392,7 +396,7 @@ module RIMS
         if (@auth.authenticate_login(username, password)) then
           yield response_stream(tag) {|res|
             @logger.info("login authentication OK: #{username}")
-            @next_decoder = accept_authentication(username) {|msg| res << msg }
+            @next_decoder = accept_authentication(username) {|msg| res << msg << :flush }
             res << "#{tag} OK LOGIN completed\r\n"
           }
         else
@@ -1242,7 +1246,12 @@ module RIMS
             cond_args.shift
             charset_string = cond_args.shift or raise SyntaxError, 'need for a charset string of CHARSET'
             charset_string.is_a? String or raise SyntaxError, "CHARSET charset string expected as <String> but was <#{charset_string.class}>."
-            parser.charset = charset_string
+            begin
+              parser.charset = charset_string
+            rescue ArgumentError
+              @logger.warn("unknown charset: #{charset_string}")
+              return yield([ "#{tag} NO [BADCHARSET (#{Encoding.list.map(&:to_s).join(' ')})] unknown charset\r\n" ])
+            end
           end
 
           if (cond_args.empty?) then
@@ -1278,21 +1287,36 @@ module RIMS
           }
 
           res << '* SEARCH'
-          for msg in msg_src
-            if (cond.call(msg)) then
-              if (uid) then
-                res << " #{msg.uid}"
-              else
-                res << " #{msg.num}"
-              end
-              if (res.length >= @bulk_response_count) then
-                yield(res)
-                res = []
+          begin
+            begin
+              for msg in msg_src
+                begin
+                  if (cond.call(msg)) then
+                    if (uid) then
+                      res << " #{msg.uid}"
+                    else
+                      res << " #{msg.num}"
+                    end
+                    if (res.length >= @bulk_response_count) then
+                      yield(res)
+                      res = []
+                    end
+                  end
+                rescue EncodingError
+                  @logger.warn("encoding error at the message: uidvalidity(#{folder.mbox_id}) uid(#{msg.uid})")
+                  @logger.warn("#{$!} (#{$!.class})")
+                end
               end
+            ensure
+              res << "\r\n"
             end
+          rescue
+            # flush bulk response
+            yield(res)
+            res = []
+            raise
           end
 
-          res << "\r\n"
           res << "#{tag} OK SEARCH completed\r\n"
           yield(res)
         end
@@ -1756,10 +1780,10 @@ module RIMS
     end
 
     class MailDeliveryDecoder < AuthenticatedDecoder
-      def initialize(parent_decoder, services, auth, logger)
+      def initialize(parent_decoder, drb_services, auth, logger)
         super(auth, logger)
         @parent_decoder = parent_decoder
-        @services = services
+        @drb_services = drb_services
         @auth = auth
         @last_user_cache_key_username = nil
         @last_user_cache_value_engine = nil
@@ -1802,7 +1826,7 @@ module RIMS
       private :release_engine_cache
 
       def auth?
-        @services != nil
+        @drb_services != nil
       end
 
       def selected?
@@ -1811,7 +1835,7 @@ module RIMS
 
       def cleanup
         release_engine_cache
-        @services = nil unless @services.nil?
+        @drb_services = nil unless @drb_services.nil?
         @auth = nil unless @auth.nil?
 
         unless (@parent_decoder.nil?) then
@@ -1924,9 +1948,9 @@ module RIMS
             engine = engine_cache(username)
             deliver_to_user(tag, username, mbox_name, opt_args, msg_text, engine, res)
           else
-            res = Enumerator.new{|stream_res|
+            res = response_stream(tag) {|stream_res|
               engine = store_engine_cache(username) {
-                self.class.make_engine_and_recovery_if_needed(@services, username, logger: @logger) {|msg| stream_res << msg }
+                self.class.make_engine_and_recovery_if_needed(@drb_services, username, logger: @logger) {|msg| stream_res << msg << :flush }
               }
               deliver_to_user(tag, username, mbox_name, opt_args, msg_text, engine, stream_res)
             }

data/lib/rims/protocol/parser.rb

@@ -244,8 +244,21 @@ module RIMS
       end
       private :get_mail
 
-      attr_accessor :charset
+      attr_reader :charset
 
+      def charset=(new_charset)
+        @charset = Encoding.find(new_charset)
+      end
+
+      def force_string_charset(string)
+        string = string.dup
+        string.force_encoding(@charset)
+        string.valid_encoding? or raise SyntaxError, "invalid #{@charset} string: #{string.inspect}"
+        string
+      end
+      private :force_string_charset
+
+      # should set `search_string' encoding to `@charset'
       def string_include?(search_string, text)
         if (search_string.ascii_only?) then
           unless (text.encoding.ascii_compatible?) then
@@ -253,7 +266,6 @@ module RIMS
           end
         else
           if (@charset) then
-            search_string = search_string.dup.force_encoding(@charset)
             text = text.encode(@charset)
           end
         end
@@ -266,7 +278,7 @@ module RIMS
         if (mail.text? || mail.message?) then
           body_txt = mail.body.raw_source
           if (charset = mail.charset) then
-            if (body_txt.encoding != Encoding.find(charset)) then
+            if (body_txt.encoding != charset) then
               body_txt = body_txt.dup.force_encoding(charset)
             end
           end
@@ -310,6 +322,7 @@ module RIMS
       private :parse_msg_flag_enabled
 
       def parse_search_header(field_name, search_string)
+        search_string = force_string_charset(search_string) if @charset
         proc{|next_cond|
           proc{|msg|
             mail = get_mail(msg)
@@ -359,6 +372,7 @@ module RIMS
       private :parse_mail_bytesize
 
       def parse_body(search_string)
+        search_string = force_string_charset(search_string) if @charset
         proc{|next_cond|
           proc{|msg|
             if (text = mail_body_text(get_mail(msg))) then
@@ -421,6 +435,7 @@ module RIMS
       private :parse_or
 
       def parse_text(search_string)
+        search_string = force_string_charset(search_string) if @charset
         search_text = proc{|message_text| string_include?(search_string, message_text) }
         search_mail = proc{|mail|
           if (mail.multipart?) then
@@ -690,14 +705,10 @@ module RIMS
           if ((array.length > 0) && (array.first.is_a? Array)) then
             s = '('.b
             array = array.dup
-            while (object = array.shift)
-              case (object)
-              when Array
-                s << encode_bodystructure(object)
-              else
-                s << ' '.b << encode_value(object)
-              end
-            end
+            begin
+              s << encode_bodystructure(array.shift)
+            end while ((array.length > 0) && (array.first.is_a? Array))
+            s << ' '.b << array.map{|i| encode_value(i) }.join(' '.b)
             s << ')'.b
           elsif ((array.length > 0) && (array.first.upcase == 'MESSAGE')) then
             msg_body_list = array[0..7].map{|v| encode_value(v) }
@@ -760,7 +771,6 @@ module RIMS
       def initialize(mail_store, folder)
         @mail_store = mail_store
         @folder = folder
-        @charset = nil
         @mail_cache = Hash.new{|hash, uid|
           if (msg_txt = @mail_store.msg_text(@folder.mbox_id, uid)) then
             hash[uid] = RFC822::Message.new(msg_txt)
@@ -773,29 +783,6 @@ module RIMS
       end
       private :get_mail
 
-      def make_array(value)
-        if (value) then
-          if (value.is_a? Array) then
-            list = value
-          else
-            list = [ value ]
-          end
-
-          if (block_given?) then
-            yield(list)
-          else
-            list
-          end
-        end
-      end
-      private :make_array
-
-      def make_address_list(email_address)
-        mailbox, host = email_address.split(/@/, 2)
-        [ nil, nil, mailbox, host ]
-      end
-      private :make_address_list
-
       def expand_macro(cmd_list)
         func_list = cmd_list.map{|name| parse_cached(name) }
         proc{|msg|
@@ -804,76 +791,116 @@ module RIMS
       end
       private :expand_macro
 
-      def get_header_field(mail, name, default=nil)
-        if (field = mail[name]) then
-          if (block_given?) then
-            yield(field)
-          else
-            field
-          end
+      def make_body_params(name_value_pair_list)
+        if (name_value_pair_list && ! name_value_pair_list.empty?) then
+          name_value_pair_list.flatten
+        else
+          # not allowed empty body field parameters.
+          # RFC 3501 / 9. Formal Syntax:
+          #     body-fld-param  = "(" string SP string *(SP string SP string) ")" / nil
+          nil
+        end
+      end
+      private :make_body_params
+
+      def get_body_disposition(mail)
+        if (disposition_type = mail.content_disposition_upcase) then
+          [ disposition_type,
+            make_body_params(mail.content_disposition_parameter_list)
+          ]
         else
-          default
+          # not allowed empty body field disposition.
+          # RFC 3501 / 9. Formal Syntax:
+          #     body-fld-dsp    = "(" string SP body-fld-param ")" / nil
+          nil
         end
       end
-      private :get_header_field
+      private :get_body_disposition
 
-      def get_bodystructure_data(mail)
+      def get_body_lang(mail)
+        if (tag_list = mail.content_language_upcase) then
+          unless (tag_list.empty?) then
+            if (tag_list.length == 1) then
+              tag_list[0]
+            else
+              tag_list
+            end
+          end
+        end
+      end
+      private :get_body_lang
+
+      def get_bodystructure_data(mail, extension: false)
+        body_data = []
         if (mail.multipart?) then       # body_type_mpart
-          mpart_data = []
-          mpart_data.concat(mail.parts.map{|part_msg| get_bodystructure_data(part_msg) })
-          mpart_data << mail.media_sub_type_upcase
-        elsif (mail.text?) then         # body_type_text
-          text_data = []
-
-          # media_text
-          text_data << mail.media_main_type_upcase
-          text_data << mail.media_sub_type_upcase
-
-          # body_fields
-          text_data << mail.content_type_parameters.flatten
-          text_data << mail.header['Content-Id']
-          text_data << mail.header['Content-Description']
-          text_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
-          text_data << mail.raw_source.bytesize
-
-          # body_fld_lines
-          text_data << mail.raw_source.each_line.count
-        elsif (mail.message?) then      # body_type_msg
-          msg_data = []
-
-          # message_media
-          msg_data << mail.media_main_type_upcase
-          msg_data << mail.media_sub_type_upcase
-
-          # body_fields
-          msg_data << mail.content_type_parameters.flatten
-          msg_data << mail.header['Content-Id']
-          msg_data << mail.header['Content-Description']
-          msg_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
-          msg_data << mail.raw_source.bytesize
-
-          # envelope
-          msg_data << get_envelope_data(mail.message)
-
-          # body
-          msg_data << get_bodystructure_data(mail.message)
-
-          # body_fld_lines
-          msg_data << mail.raw_source.each_line.count
-        else                            # body_type_basic
-          basic_data = []
-
-          # media_basic
-          basic_data << mail.media_main_type_upcase
-          basic_data << mail.media_sub_type_upcase
-
-          # body_fields
-          basic_data << mail.content_type_parameters.flatten
-          basic_data << mail.header['Content-Id']
-          basic_data << mail.header['Content-Description']
-          basic_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
-          basic_data << mail.raw_source.bytesize
+          body_data.concat(mail.parts.map{|part_msg| get_bodystructure_data(part_msg, extension: extension) })
+          body_data << mail.media_sub_type_upcase
+
+          # body_ext_mpart
+          if (extension) then
+            body_data << make_body_params(mail.content_type_parameter_list)
+            body_data << get_body_disposition(mail)
+            body_data << get_body_lang(mail)
+            body_data << mail.header['Content-Location']
+          end
+        else
+          if (mail.text?) then          # body_type_text
+            # media_text
+            body_data << mail.media_main_type_upcase
+            body_data << mail.media_sub_type_upcase
+
+            # body_fields
+            body_data << make_body_params(mail.content_type_parameter_list)
+            body_data << mail.header['Content-Id']
+            body_data << mail.header['Content-Description']
+            body_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
+            body_data << mail.raw_source.bytesize
+
+            # body_fld_lines
+            body_data << mail.raw_source.each_line.count
+          elsif (mail.message?) then    # body_type_msg
+            # message_media
+            body_data << mail.media_main_type_upcase
+            body_data << mail.media_sub_type_upcase
+
+            # body_fields
+            body_data << make_body_params(mail.content_type_parameter_list)
+            body_data << mail.header['Content-Id']
+            body_data << mail.header['Content-Description']
+            body_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
+            body_data << mail.raw_source.bytesize
+
+            # envelope
+            body_data << get_envelope_data(mail.message)
+
+            # body
+            body_data << get_bodystructure_data(mail.message, extension: extension)
+
+            # body_fld_lines
+            body_data << mail.raw_source.each_line.count
+          else                          # body_type_basic
+            # media_basic
+            body_data << mail.media_main_type_upcase
+            body_data << mail.media_sub_type_upcase
+
+            # body_fields
+            body_data << make_body_params(mail.content_type_parameter_list)
+            body_data << mail.header['Content-Id']
+            body_data << mail.header['Content-Description']
+            body_data << mail.header.fetch_upcase('Content-Transfer-Encoding')
+            body_data << mail.raw_source.bytesize
+          end
+
+          # body_ext_1part
+          if (extension) then
+            body_data << mail.header['Content-MD5']
+            body_data << get_body_disposition(mail)
+            body_data << get_body_lang(mail)
+            body_data << mail.header['Content-Location']
+          end
         end
+
+        body_data
       end
       private :get_bodystructure_data
 
@@ -881,12 +908,12 @@ module RIMS
         env_data = []
         env_data << mail.header['Date']
         env_data << mail.header['Subject']
-        env_data << mail.from
-        env_data << mail.sender
-        env_data << mail.reply_to
-        env_data << mail.to
-        env_data << mail.cc
-        env_data << mail.bcc
+        env_data << mail.from&.map(&:to_a)
+        env_data << mail.sender&.map(&:to_a)
+        env_data << mail.reply_to&.map(&:to_a)
+        env_data << mail.to&.map(&:to_a)
+        env_data << mail.cc&.map(&:to_a)
+        env_data << mail.bcc&.map(&:to_a)
         env_data << mail.header['In-Reply-To']
         env_data << mail.header['Message-Id']
       end
@@ -1034,9 +1061,9 @@ module RIMS
       end
       private :parse_body
 
-      def parse_bodystructure(msg_att_name)
+      def parse_bodystructure(msg_att_name, extension: false)
         proc{|msg|
-          ''.b << msg_att_name << ' '.b << encode_bodystructure(get_bodystructure_data(get_mail(msg)))
+          ''.b << msg_att_name << ' '.b << encode_bodystructure(get_bodystructure_data(get_mail(msg), extension: extension))
         }
       end
       private :parse_bodystructure
@@ -1095,9 +1122,9 @@ module RIMS
         when 'ALL'
           fetch = expand_macro(%w[ FLAGS INTERNALDATE RFC822.SIZE ENVELOPE ])
         when 'BODY'
-          fetch = parse_bodystructure(fetch_att)
+          fetch = parse_bodystructure(fetch_att, extension: false)
         when 'BODYSTRUCTURE'
-          fetch = parse_bodystructure(fetch_att)
+          fetch = parse_bodystructure(fetch_att, extension: true)
         when 'ENVELOPE'
           fetch = parse_envelope(fetch_att)
         when 'FAST'