rims 0.2.5 → 0.2.6

data/lib/rims/service.rb

@@ -780,22 +780,22 @@ module RIMS
         end
       end
 
-      services = Riser::DRbServices.new(drb_process_num)
-      services.add_sticky_process_service(:engine,
-                                          Riser::ResourceSet.build{|builder|
-                                            builder.at_create{|unique_user_id|
-                                              mail_store = MailStore.build(unique_user_id, kvs_meta_open, kvs_text_open)
-                                              Protocol::Decoder::Engine.new(unique_user_id, mail_store, logger,
-                                                                            bulk_response_count: @config.bulk_response_count,
-                                                                            read_lock_timeout_seconds: @config.read_lock_timeout_seconds,
-                                                                            write_lock_timeout_seconds: @config.write_lock_timeout_seconds,
-                                                                            cleanup_write_lock_timeout_seconds: @config.cleanup_write_lock_timeout_seconds)
-                                            }
-                                            builder.at_destroy{|engine|
-                                              engine.destroy
-                                            }
-                                            builder.alias_unref(:destroy)
-                                          })
+      drb_services = Riser::DRbServices.new(drb_process_num)
+      drb_services.add_sticky_process_service(:engine,
+                                              Riser::ResourceSet.build{|builder|
+                                                builder.at_create{|unique_user_id|
+                                                  mail_store = MailStore.build(unique_user_id, kvs_meta_open, kvs_text_open)
+                                                  Protocol::Decoder::Engine.new(unique_user_id, mail_store, logger,
+                                                                                bulk_response_count: @config.bulk_response_count,
+                                                                                read_lock_timeout_seconds: @config.read_lock_timeout_seconds,
+                                                                                write_lock_timeout_seconds: @config.write_lock_timeout_seconds,
+                                                                                cleanup_write_lock_timeout_seconds: @config.cleanup_write_lock_timeout_seconds)
+                                                }
+                                                builder.at_destroy{|engine|
+                                                  engine.destroy
+                                                }
+                                                builder.alias_unref(:destroy)
+                                              })
 
       server.before_start{|server_socket|
         logger.info('start server.')
@@ -906,11 +906,11 @@ module RIMS
         logger.info("authorization parameter: mail_delivery_user=#{@config.mail_delivery_user}")
 
         logger.info('dRuby services: start server.')
-        services.start_server
+        drb_services.start_server
       }
       server.at_fork{
         logger.info('dRuby services: detach server.')
-        services.detach_server
+        drb_services.detach_server
       }
       server.at_stop{|stop_state|
         case (stop_state)
@@ -926,7 +926,7 @@ module RIMS
       }
       server.preprocess{
         logger.info('dRuby services: start client.')
-        services.start_client
+        drb_services.start_client
         auth.start_plug_in(logger)
       }
       server.dispatch{|socket|
@@ -947,7 +947,7 @@ module RIMS
                   stream = Riser::WriteBufferStream.new(socket, @config.send_buffer_limit_size)
                 end
                 stream = Riser::LoggingStream.new(stream, protocol_logger)
-                decoder = Protocol::Decoder.new_decoder(services, auth, logger, mail_delivery_user: @config.mail_delivery_user)
+                decoder = Protocol::Decoder.new_decoder(drb_services, auth, logger, mail_delivery_user: @config.mail_delivery_user)
                 Protocol::Decoder.repl(decoder, conn_limits, stream, stream, logger)
               ensure
                 if (stream) then
@@ -980,7 +980,7 @@ module RIMS
       }
       server.after_stop{
         logger.info('dRuby services: stop server.')
-        services.stop_server
+        drb_services.stop_server
         logger.info('stop server.')
       }
 

data/lib/rims/test.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+require 'digest'
 require 'fileutils'
 require 'set'
 
@@ -68,16 +69,22 @@ module RIMS
 
     module ProtocolFetchMailSample
       def make_mail_simple
-        @simple_mail = RIMS::RFC822::Message.new(<<-'EOF')
+        @simple_mail_body = <<-'EOF'
+Hello world.
+        EOF
+
+        md5_digest = Digest::MD5.digest(@simple_mail_body)
+        @simple_mail = RIMS::RFC822::Message.new(<<-"EOF" + @simple_mail_body)
 To: foo@nonet.org
 From: bar@nonet.org
 Subject: test
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
+Content-MD5: #{[ md5_digest ].pack('m').strip}
+Content-Language: en-US, en
 Date: Fri,  8 Nov 2013 06:47:50 +0900 (JST)
 
-Hello world.
         EOF
       end
       private :make_mail_simple
@@ -97,6 +104,9 @@ Content-Type: text/plain; charset=us-ascii
 Multipart test.
 --1383.905529.351297
 Content-Type: application/octet-stream
+Content-Disposition: attachment
+  ; filename=test.dat
+  ; modification-date="Wed, 12 Feb 1997 16:29:51 -0500"
 
 0123456789
 --1383.905529.351297
@@ -108,6 +118,9 @@ Subject: inner multipart
 MIME-Version: 1.0
 Date: Fri, 8 Nov 2013 19:31:03 +0900
 Content-Type: multipart/mixed; boundary="1383.905529.351298"
+Content-Disposition: attachment; filename=hello.txt
+Content-Language: en
+Content-Location: test
 
 --1383.905529.351298
 Content-Type: text/plain; charset=us-ascii
@@ -123,7 +136,9 @@ Content-Type: multipart/mixed; boundary="1383.905529.351299"
 
 --1383.905529.351299
 Content-Type: image/gif
+Content-Disposition: inline
 
+GIF image...
 --1383.905529.351299
 Content-Type: message/rfc822
 
@@ -136,6 +151,7 @@ Content-Type: multipart/mixed; boundary="1383.905529.351300"
 
 --1383.905529.351300
 Content-Type: text/plain; charset=us-ascii
+Content-Location: foo
 
 HALO
 --1383.905529.351300
@@ -143,10 +159,12 @@ Content-Type: multipart/alternative; boundary="1383.905529.351301"
 
 --1383.905529.351301
 Content-Type: text/plain; charset=us-ascii
+Content-Location: bar
 
 alternative message.
 --1383.905529.351301
 Content-Type: text/html; charset=us-ascii
+Content-Location: baz
 
 <html>
 <body><p>HTML message</p></body>
@@ -186,7 +204,7 @@ Hello world.
       private :make_mail_empty
 
       def make_mail_no_body
-        @no_body_mail = RIMS::RFC822::Message.new('foo')
+        @no_body_mail = RIMS::RFC822::Message.new("Subject: foo\r\n\r\n")
       end
       private :make_mail_no_body
 

data/lib/rims/version.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 module RIMS
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
   MAILBOX_DATA_STRUCTURE_VERSION = 'mailbox.2'
 end
 

data/rims.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
+  spec.add_runtime_dependency "rims-rfc822", '>= 0.2.0'
   spec.add_runtime_dependency "riser", '>= 0.1.8'
   spec.add_runtime_dependency "logger-joint"
   spec.add_development_dependency "bundler"

data/test/cmd/test_command.rb

@@ -334,6 +334,35 @@ module RIMS::Test
       assert_equal(0, status.exitstatus)
     end
 
+    data('default'            => [ false, %w[] ],
+         '-r'                 => [ false, %w[ -r prime ] ],
+         '--required-feature' => [ false, %w[ --required-feature=prime ] ],
+         '--format=yaml'      => [ false, %w[ --format=yaml ] ],
+         '--format=json'      => [ false, %w[ --format=json ] ],
+
+         # deplicated options
+         'deplicated:--load-library' => [ true, %w[ --load-library=prime ] ])
+    def test_environment(data)
+      deplicated, options = data
+
+      stdout, stderr, status = Open3.capture3('rims', 'environment', *options)
+      pp [ stdout, stderr, status ] if $DEBUG
+
+      assert_equal(0, status.exitstatus)
+      if (deplicated) then
+        assert_match(/^warning:/, stderr)
+      else
+        assert_equal('', stderr)
+      end
+
+      assert_match(/RIMS Environment/, stdout)
+      assert_match(/RUBY VERSION.*#{Regexp.quote(RUBY_DESCRIPTION)}/, stdout)
+      assert_match(/RIMS VERSION.*#{Regexp.quote(RIMS::VERSION)}/, stdout)
+      assert_match(/AUTHENTICATION PLUG-IN.*plain/m, stdout)
+      assert_match(/AUTHENTICATION PLUG-IN.*hash/m, stdout)
+      assert_match(/KEY-VALUE STORE PLUG-IN.*gdbm/m, stdout)
+    end
+
     tls_dir = Pathname(__FILE__).parent.parent / "tls"
     TLS_CA_CERT     = tls_dir / 'ca.cert'
     TLS_SERVER_CERT = tls_dir / 'server_localhost.cert'
@@ -1277,49 +1306,112 @@ Hello world.
           envelope = lambda{|mail|
             Net::IMAP::Envelope.new(mail.header['Date'],
                                     mail.header['Subject'],
-                                    mail.from     ? mail.from.map{|addr| Net::IMAP::Address.new(*addr) }     : nil,
-                                    mail.reply_to ? mail.reply_to.map{|addr| Net::IMAP::Address.new(*addr) } : nil,
-                                    mail.sender   ? mail.sender.map{|addr| Net::IMAP::Address.new(*addr) }   : nil,
-                                    mail.to       ? mail.to.map{|addr| Net::IMAP::Address.new(*addr) }       : nil,
-                                    mail.cc       ? mail.cc.map{|addr| Net::IMAP::Address.new(*addr) }       : nil,
-                                    mail.bcc      ? mail.bcc.map{|addr| Net::IMAP::Address.new(*addr) }      : nil,
+                                    mail.from     ? mail.from.map{|addr| Net::IMAP::Address.new(*addr.to_a) }     : nil,
+                                    mail.reply_to ? mail.reply_to.map{|addr| Net::IMAP::Address.new(*addr.to_a) } : nil,
+                                    mail.sender   ? mail.sender.map{|addr| Net::IMAP::Address.new(*addr.to_a) }   : nil,
+                                    mail.to       ? mail.to.map{|addr| Net::IMAP::Address.new(*addr.to_a) }       : nil,
+                                    mail.cc       ? mail.cc.map{|addr| Net::IMAP::Address.new(*addr.to_a) }       : nil,
+                                    mail.bcc      ? mail.bcc.map{|addr| Net::IMAP::Address.new(*addr.to_a) }      : nil,
                                     mail.header['In-Reply-To'],
                                     mail.header['Message-Id'])
           }
-          body_type = lambda{|mail|
-            case (mail.media_main_type_upcase)
-            when 'TEXT'
+          body_type = lambda{|mail, extension=false|
+            body_params = lambda{|params|
+              if (params && ! params.empty?) then
+                Hash[params.map{|n, v| [ n.upcase, v ] }]
+              end
+            }
+            body_disposition = lambda{|mail|
+              if (mail.content_disposition) then
+                Net::IMAP::ContentDisposition.new(mail.content_disposition_upcase,
+                                                  body_params[mail.content_disposition_parameter_list])
+              end
+            }
+            body_language = lambda{|mail|
+              if (mail.content_language) then
+                if (mail.content_language.length > 1) then
+                  mail.content_language_upcase
+                else
+                  mail.content_language_upcase[0]
+                end
+              end
+            }
+            if (mail.text?) then
               Net::IMAP::BodyTypeText.new(mail.media_main_type_upcase,
                                           mail.media_sub_type_upcase,
-                                          Hash[mail.content_type_parameters.map{|n, v| [ n.upcase, v ] }],
+                                          body_params[mail.content_type_parameter_list],
                                           mail.header['Content-Id'],
                                           mail.header['Content-Description'],
                                           mail.header.fetch_upcase('Content-Transfer-Encoding'),
                                           mail.raw_source.bytesize,
-                                          mail.raw_source.each_line.count)
-            when 'MESSAGE'
+                                          mail.raw_source.each_line.count,
+                                          *(
+                                            if (extension) then
+                                              [ mail.header['Content-MD5'],
+                                                body_disposition[mail],
+                                                body_language[mail],
+                                                [ mail.header['Content-Location'] ]
+                                              ]
+                                            else
+                                              []
+                                            end
+                                          ))
+            elsif (mail.message?) then
               Net::IMAP::BodyTypeMessage.new(mail.media_main_type_upcase,
                                              mail.media_sub_type_upcase,
-                                             Hash[mail.content_type_parameters.map{|n, v| [ n.upcase, v ] }],
+                                             body_params[mail.content_type_parameter_list],
                                              mail.header['Content-Id'],
                                              mail.header['Content-Description'],
                                              mail.header.fetch_upcase('Content-Transfer-Encoding'),
                                              mail.raw_source.bytesize,
                                              envelope[mail.message],
-                                             body_type[mail.message],
-                                             mail.raw_source.each_line.count)
-            when 'MULTIPART'
+                                             body_type[mail.message, extension],
+                                             mail.raw_source.each_line.count,
+                                             *(
+                                               if (extension) then
+                                                 [ mail.header['Content-MD5'],
+                                                   body_disposition[mail],
+                                                   body_language[mail],
+                                                   [ mail.header['Content-Location'] ]
+                                                 ]
+                                               else
+                                                 []
+                                               end
+                                             ))
+            elsif (mail.multipart?) then
               Net::IMAP::BodyTypeMultipart.new(mail.media_main_type_upcase,
                                                mail.media_sub_type_upcase,
-                                               mail.parts.map{|m| body_type[m] })
+                                               mail.parts.map{|m| body_type[m, extension] },
+                                               *(
+                                                 if (extension) then
+                                                   [ body_params[mail.content_type_parameter_list],
+                                                     body_disposition[mail],
+                                                     body_language[mail],
+                                                     [ mail.header['Content-Location'] ]
+                                                   ]
+                                                 else
+                                                   []
+                                                 end
+                                               ))
             else
               Net::IMAP::BodyTypeBasic.new(mail.media_main_type_upcase,
                                            mail.media_sub_type_upcase,
-                                           Hash[mail.content_type_parameters.map{|n, v| [ n.upcase, v ] }],
+                                           body_params[mail.content_type_parameter_list],
                                            mail.header['Content-Id'],
                                            mail.header['Content-Description'],
                                            mail.header.fetch_upcase('Content-Transfer-Encoding'),
-                                           mail.raw_source.bytesize)
+                                           mail.raw_source.bytesize,
+                                           *(
+                                             if (extension) then
+                                               [ mail.header['Content-MD5'],
+                                                 body_disposition[mail],
+                                                 body_language[mail],
+                                                 [ mail.header['Content-Location'] ]
+                                               ]
+                                             else
+                                               []
+                                             end
+                                           ))
             end
           }
 
@@ -1406,9 +1498,9 @@ Hello world.
                        imap_fetch.call(msg_set[1..-1], 'BODY'))
 
           assert_equal(fetch_data[
-                         [ 1, { 'BODYSTRUCTURE' => body_type[@simple_mail] } ],
-                         [ 2, { 'BODYSTRUCTURE' => body_type[@mpart_mail] } ],
-                         [ 3, { 'BODYSTRUCTURE' => body_type[@mime_subject_mail] } ]
+                         [ 1, { 'BODYSTRUCTURE' => body_type[@simple_mail, true] } ],
+                         [ 2, { 'BODYSTRUCTURE' => body_type[@mpart_mail, true] } ],
+                         [ 3, { 'BODYSTRUCTURE' => body_type[@mime_subject_mail, true] } ]
                        ],
                        imap_fetch.call(msg_set[1..-1], 'BODYSTRUCTURE'))
 

data/test/test_protocol_decoder.rb

@@ -135,8 +135,10 @@ module RIMS::Test
           output = StringIO.new('', 'w')
           input_gets = input.method(:gets)
           output_write = lambda{|res|
-            for line in res
-              output << line
+            for data in res
+              if (data != :flush) then
+                output << data
+              end
             end
           }
           inout_args = [ input_gets, output_write ]
@@ -158,7 +160,9 @@ module RIMS::Test
             response_message << output.string
           end
           for response in responses
-            response_message << response
+            if (response != :flush) then
+              response_message << response
+            end
           end
           response_lines = StringIO.new(response_message, 'r').each_line
           ret_val = yield(response_lines)
@@ -242,7 +246,7 @@ module RIMS::Test
     extend Forwardable
 
     def open_mail_store
-      @services.call_service(:engine, @unique_user_id) {|engine|
+      @drb_services.call_service(:engine, @unique_user_id) {|engine|
         begin
           @mail_store = engine.mail_store
           @mail_store.write_synchronize{
@@ -256,7 +260,7 @@ module RIMS::Test
     private :open_mail_store
 
     def make_decoder
-      RIMS::Protocol::Decoder.new_decoder(@services, @auth, @logger)
+      RIMS::Protocol::Decoder.new_decoder(@drb_services, @auth, @logger)
     end
     private :make_decoder
 
@@ -288,20 +292,22 @@ module RIMS::Test
       }
       @unique_user_id = RIMS::Authentication.unique_user_id('foo')
 
-      @services = Riser::DRbServices.new(0)
-      @services.add_sticky_process_service(:engine,
-                                           Riser::ResourceSet.build{|builder|
-                                             builder.at_create{|unique_user_id|
-                                               mail_store = RIMS::MailStore.build(unique_user_id, @kvs_open, @kvs_open)
-                                               RIMS::Protocol::Decoder::Engine.new(unique_user_id, mail_store, @logger)
-                                             }
-                                             builder.at_destroy{|engine|
-                                               engine.destroy
-                                             }
-                                             builder.alias_unref(:destroy)
-                                           })
-      @services.start_server
-      @services.start_client
+      @bulk_response_count = 10
+      @drb_services = Riser::DRbServices.new(0)
+      @drb_services.add_sticky_process_service(:engine,
+                                               Riser::ResourceSet.build{|builder|
+                                                 builder.at_create{|unique_user_id|
+                                                   mail_store = RIMS::MailStore.build(unique_user_id, @kvs_open, @kvs_open)
+                                                   RIMS::Protocol::Decoder::Engine.new(unique_user_id, mail_store, @logger,
+                                                                                       bulk_response_count: @bulk_response_count)
+                                                 }
+                                                 builder.at_destroy{|engine|
+                                                   engine.destroy
+                                                 }
+                                                 builder.alias_unref(:destroy)
+                                               })
+      @drb_services.start_server
+      @drb_services.start_client
 
       open_mail_store{
         @inbox_id = @mail_store.mbox_id('INBOX')
@@ -328,8 +334,8 @@ module RIMS::Test
     end
 
     def teardown
-      assert_equal(0, @services.get_service(:engine, @unique_user_id).proxy_count)
-      @services.stop_server
+      assert_equal(0, @drb_services.get_service(:engine, @unique_user_id).proxy_count)
+      @drb_services.stop_server
       pp @kvs if $DEBUG
     end
 
@@ -2439,11 +2445,6 @@ module RIMS::Test
           assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
-        if (command_test?) then
-          assert_equal(false, @decoder.auth?)
-          assert_equal(false, @decoder.selected?)
-        end
-
         assert_imap_command('LOGIN foo open_sesame') {|assert|
           assert.equal("#{tag} OK LOGIN completed")
         }
@@ -2591,15 +2592,10 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
-        if (command_test?) then
-          assert_equal(false, @decoder.auth?)
-          assert_equal(false, @decoder.selected?)
-        end
-
         assert_imap_command('LOGIN foo open_sesame') {|assert|
           assert.equal("#{tag} OK LOGIN completed")
         }
@@ -2609,7 +2605,7 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
@@ -2623,17 +2619,17 @@ module RIMS::Test
           assert_equal(true, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.equal("* SEARCH 1 2 3 4 5\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
-        assert_imap_command('SEARCH CHARSET utf-8 BODY foo') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii BODY foo') {|assert|
           assert.equal("* SEARCH 1 2 3\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
-        assert_imap_command('SEARCH CHARSET utf-8 BODY bar') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii BODY bar') {|assert|
           assert.equal("* SEARCH\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
@@ -2645,6 +2641,15 @@ module RIMS::Test
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
+        assert_imap_command("SEARCH CHARSET euc-jp BODY {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+          assert.match(/^\+ /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET x-nothing BODY foo') {|assert|
+          assert.match(/^#{tag} NO \[BADCHARSET \(\S+( \S+)*\)\] unknown charset/)
+        }
+
         assert_imap_command('SEARCH CHARSET') {|assert|
           assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
@@ -2679,6 +2684,7 @@ module RIMS::Test
 
         open_mail_store{
           add_msg("Content-Type: text/plain\r\n" +
+                  "\r\n" +
                   "foo")
           add_msg("Content-Type: text/plain; charset=utf-8\r\n" +
                   "X-foo: dummy\r\n" +
@@ -2705,15 +2711,10 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.match(/^#{tag} NO /, peek_next_line: true).match(/not auth/)
         }
 
-        if (command_test?) then
-          assert_equal(false, @decoder.auth?)
-          assert_equal(false, @decoder.selected?)
-        end
-
         assert_imap_command('LOGIN foo open_sesame') {|assert|
           assert.equal("#{tag} OK LOGIN completed")
         }
@@ -2723,7 +2724,7 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.match(/^#{tag} NO /, peek_next_line: true).match(/not selected/)
         }
 
@@ -2737,12 +2738,12 @@ module RIMS::Test
           assert_equal(true, @decoder.selected?)
         end
 
-        assert_imap_command('SEARCH CHARSET utf-8 ALL') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii ALL') {|assert|
           assert.equal("* SEARCH 1 2 3 4 5\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
-        assert_imap_command('SEARCH CHARSET utf-8 TEXT foo') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii TEXT foo') {|assert|
           assert.equal("* SEARCH 1 2 3\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
@@ -2752,7 +2753,7 @@ module RIMS::Test
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
-        assert_imap_command('SEARCH CHARSET utf-8 TEXT baz') {|assert|
+        assert_imap_command('SEARCH CHARSET us-ascii TEXT baz') {|assert|
           assert.equal("* SEARCH\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
@@ -2764,6 +2765,15 @@ module RIMS::Test
           assert.equal("#{tag} OK SEARCH completed\r\n")
         }
 
+        assert_imap_command("SEARCH CHARSET euc-jp TEXT {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+          assert.match(/^\+ /)
+          assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
+        }
+
+        assert_imap_command('SEARCH CHARSET x-nothing TEXT foo') {|assert|
+          assert.match(/^#{tag} NO \[BADCHARSET \(\S+( \S+)*\)\] unknown charset/)
+        }
+
         assert_imap_command('SEARCH CHARSET') {|assert|
           assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
@@ -2788,6 +2798,140 @@ module RIMS::Test
       test_search_charset_text
     end
 
+    def test_search_charset_skip_encoding_error
+      imap_decode_engine_evaluate{
+        if (stream_test?) then
+          assert_untagged_response{|assert|
+            assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+          }
+        end
+
+        open_mail_store{
+          add_msg("Content-Type: text/plain\r\n" +
+                  "\r\n" +
+                  "foo")
+          add_msg("Content-Type: text/plain; charset=iso-2022-jp\r\n" +
+                  "\r\n" +
+                  # utf-8
+                  "\u3053\u3093\u306B\u3061\u306F\r\n" +
+                  "\u3044\u308D\u306F\u306B\u307B\u3078\u3068\r\n" +
+                  "\u3042\u3044\u3046\u3048\u304A\r\n" +
+                  "foo\r\n")
+
+          assert_msg_uid(1, 2)
+        }
+
+        if (command_test?) then
+          assert_equal(false, @decoder.auth?)
+          assert_equal(false, @decoder.selected?)
+        end
+
+        assert_imap_command('LOGIN foo open_sesame') {|assert|
+          assert.equal("#{tag} OK LOGIN completed")
+        }
+
+        if (command_test?) then
+          assert_equal(true, @decoder.auth?)
+          assert_equal(false, @decoder.selected?)
+        end
+
+        assert_imap_command('SELECT INBOX') {|assert|
+          assert.skip_while{|line| line =~ /^\* / }
+          assert.equal("#{tag} OK [READ-WRITE] SELECT completed")
+        }
+
+        if (command_test?) then
+          assert_equal(true, @decoder.auth?)
+          assert_equal(true, @decoder.selected?)
+        end
+
+        assert_imap_command('SEARCH CHARSET us-ascii BODY foo') {|assert|
+          assert.equal("* SEARCH 1\r\n")
+          assert.equal("#{tag} OK SEARCH completed\r\n")
+        }
+
+        utf8_msg = "\u306F\u306B\u307B"
+        assert_imap_command("SEARCH CHARSET utf-8 TEXT {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+          assert.match(/^\+ /)
+          assert.equal("* SEARCH\r\n")
+          assert.equal("#{tag} OK SEARCH completed\r\n")
+        }
+
+        assert_imap_command('LOGOUT') {|assert|
+          assert.match(/^\* BYE /)
+          assert.equal("#{tag} OK LOGOUT completed")
+        }
+      }
+    end
+
+    def test_search_charset_skip_encoding_error_stream
+      use_imap_stream_decode_engine
+      test_search_charset_skip_encoding_error
+    end
+
+    def test_search_interrupt_by_bad_response
+      imap_decode_engine_evaluate{
+        if (stream_test?) then
+          assert_untagged_response{|assert|
+            assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+          }
+        end
+
+        open_mail_store{
+          @bulk_response_count.times do
+            add_msg("Content-Type: text/plain\r\n" +
+                    "\r\n" +
+                    "foo")
+          end
+
+          add_msg("Content-Type: text/plain; charset=x-nothing\r\n" +
+                  "\r\n" +
+                  "foo")
+
+          assert_msg_uid(*(1..(@bulk_response_count.succ)).to_a)
+        }
+
+        if (command_test?) then
+          assert_equal(false, @decoder.auth?)
+          assert_equal(false, @decoder.selected?)
+        end
+
+        assert_imap_command('LOGIN foo open_sesame') {|assert|
+          assert.equal("#{tag} OK LOGIN completed")
+        }
+
+        if (command_test?) then
+          assert_equal(true, @decoder.auth?)
+          assert_equal(false, @decoder.selected?)
+        end
+
+        assert_imap_command('SELECT INBOX') {|assert|
+          assert.skip_while{|line| line =~ /^\* / }
+          assert.equal("#{tag} OK [READ-WRITE] SELECT completed")
+        }
+
+        if (command_test?) then
+          assert_equal(true, @decoder.auth?)
+          assert_equal(true, @decoder.selected?)
+        end
+
+        assert_imap_command('SEARCH TEXT foo') {|assert|
+          assert.match(/\A\* SEARCH( \d+)+\r\n\z/, peek_next_line: true).no_match(/ #{@bulk_response_count.succ}/)
+          assert.equal("#{tag} BAD internal server error\r\n")
+        }
+
+        assert_imap_command('LOGOUT') {|assert|
+          assert.match(/^\* BYE /)
+          assert.equal("#{tag} OK LOGOUT completed")
+        }
+      }
+    end
+
+    def test_search_interrupt_by_bad_response_stream
+      use_imap_stream_decode_engine
+      test_search_interrupt_by_bad_response
+    end
+
     def test_fetch
       imap_decode_engine_evaluate{
         if (stream_test?) then