rims 0.2.9 → 0.3.0

data/lib/rims/protocol/parser.rb

@@ -33,21 +33,7 @@ module RIMS
     end
 
     class RequestReader
-      def initialize(input, output, logger)
-        @input = input
-        @output = output
-        @logger = logger
-      end
-
-      def read_line
-        line = @input.gets or return
-        @logger.debug("read line: #{Protocol.io_data_log(line)}") if @logger.debug?
-        line.chomp!("\n")
-        line.chomp!("\r")
-        scan_line(line)
-      end
-
-      def scan_line(line)
+      def self.scan(line)
         atom_list = line.scan(/BODY(?:\.\S+)?\[.*?\](?:<\d+\.\d+>)?|[\[\]()]|".*?"|[^\[\]()\s]+/i).map{|s|
           case (s)
           when '(', ')', '[', ']', /\A NIL \z/ix
@@ -77,22 +63,14 @@ module RIMS
           end
         }
         if ((atom_list[-1].is_a? String) && (atom_list[-1] =~ /\A {\d+} \z/x)) then
-          next_size = $&[1..-2].to_i
-          @logger.debug("found literal: #{next_size} octets.") if @logger.debug?
-          @output.write("+ continue\r\n")
-          @output.flush
-          @logger.debug('continue literal.') if @logger.debug?
-          literal_string = @input.read(next_size) or raise 'unexpected client close.'
-          @logger.debug("read literal: #{Protocol.io_data_log(literal_string)}") if @logger.debug?
-          atom_list[-1] = literal_string
-          next_atom_list = read_line or raise 'unexpected client close.'
-          atom_list += next_atom_list
+          literal_size = $&[1..-2].to_i
+          atom_list[-1] = [ :literal, literal_size ]
         end
 
         atom_list
       end
 
-      def parse(atom_list, last_atom=nil)
+      def self.parse(atom_list, last_atom=nil)
         syntax_list = []
         while (atom = atom_list.shift)
           case (atom)
@@ -105,7 +83,7 @@ module RIMS
           else
             if ((atom.is_a? Array) && (atom[0] == :body)) then
               body = atom[1]
-              body.section_list = parse(scan_line(body.section))
+              body.section_list = parse(scan(body.section))
             end
             syntax_list.push(atom)
           end
@@ -118,18 +96,90 @@ module RIMS
         syntax_list
       end
 
+      def initialize(input, output, logger, line_length_limit: 1024*8, literal_size_limit: (1024**2)*10, command_size_limit: (1024**2)*10)
+        @input = input
+        @output = output
+        @logger = logger
+        @line_length_limit = line_length_limit
+        @literal_size_limit = literal_size_limit
+        @command_size_limit = command_size_limit
+        @command_tag = nil
+        @read_size = 0
+      end
+
+      attr_reader :command_tag
+
+      def gets
+        if (line = @input.gets($/, @line_length_limit)) then # arguments compatible with OpenSSL::Buffering#gets
+          if (line.bytesize < @line_length_limit) then
+            line
+          elsif (line.bytesize == @line_length_limit && (line.end_with? $/)) then
+            line
+          else
+            raise LineTooLongError.new('line too long.', line_fragment: line)
+          end
+        end
+      end
+
+      def read_literal(size)
+        @logger.debug("found literal: #{size} octets.") if @logger.debug?
+        if (size > @literal_size_limit) then
+          raise LiteralSizeTooLargeError.new('literal size too large', @command_tag)
+        end
+        if (@read_size + size > @command_size_limit) then
+          raise CommandSizeTooLargeError.new('command size too large', @command_tag)
+        end
+        @output.write("+ continue\r\n")
+        @output.flush
+        @logger.debug('continue literal.') if @logger.debug?
+        literal_string = @input.read(size) or raise 'unexpected client close.'
+        @read_size += size
+        @logger.debug("read literal: #{Protocol.io_data_log(literal_string)}") if @logger.debug?
+
+        literal_string
+      end
+      private :read_literal
+
+      def read_line
+        line = gets or return
+        @logger.debug("read line: #{Protocol.io_data_log(line)}") if @logger.debug?
+        line.chomp!("\n")
+        line.chomp!("\r")
+        @read_size += line.bytesize
+        if (@read_size > @command_size_limit) then
+          raise CommandSizeTooLargeError.new('command size too large', @command_tag)
+        end
+        atom_list = self.class.scan(line)
+
+        if (@command_tag.nil? && ! atom_list.empty?) then
+          unless ((atom_list[0].is_a? String) && ! (atom_list[0].start_with? '*', '+')) then
+            raise SyntaxError, "invalid command tag: #{atom_list[0]}"
+          end
+          @command_tag = atom_list[0]
+        end
+
+        if ((atom_list[-1].is_a? Array) && (atom_list[-1][0] == :literal)) then
+          atom_list[-1] = read_literal(atom_list[-1][1])
+          next_atom_list = read_line or raise 'unexpected client close.'
+          atom_list += next_atom_list
+        end
+
+        atom_list
+      end
+      private :read_line
+
       def read_command
+        @command_tag = nil
+        @read_size = 0
         while (atom_list = read_line)
           if (atom_list.empty?) then
+            @read_size = 0
             next
           end
           if (atom_list.length < 2) then
-            raise 'need for tag and command.'
-          end
-          if (atom_list[0] =~ /\A [*+]/x) then
-            raise "invalid command tag: #{atom_list[0]}"
+            raise SyntaxError, 'need for tag and command.'
           end
-          return parse(atom_list)
+          return self.class.parse(atom_list)
         end
 
         nil

data/lib/rims/service.rb

@@ -158,6 +158,10 @@ module RIMS
       #     send_buffer_limit_size: 16384
       #     read_polling_interval_seconds: 1
       #     command_wait_timeout_seconds: 1800
+      #   protocol:
+      #     line_length_limit: 8192
+      #     literal_size_limit: 10485760
+      #     command_size_limit: 10485760
       #   charset:
       #     use_default_aliases: true
       #     aliases:
@@ -176,6 +180,7 @@ module RIMS
       #     load_limit: 134217728
       #     engine:
       #       bulk_response_count: 100
+      #       bulk_response_size: 33554432
       #       read_lock_timeout_seconds: 30
       #       write_lock_timeout_seconds: 30
       #       cleanup_write_lock_timeout_seconds: 1
@@ -566,6 +571,18 @@ module RIMS
                                        @config.dig('connection', 'command_wait_timeout_seconds') || 60 * 30)
       end
 
+      def protocol_line_length_limit
+        @config.dig('protocol', 'line_length_limit') || 1024 * 8
+      end
+
+      def protocol_literal_size_limit
+        @config.dig('protocol', 'literal_size_limit') || 1024**2 * 10
+      end
+
+      def protocol_command_size_limit
+        @config.dig('protocol', 'command_size_limit') || 1024**2 * 10
+      end
+
       def charset_aliases
         charset_aliases = RFC822::CharsetAliases.new
 
@@ -646,6 +663,10 @@ module RIMS
         @config.dig('drb_services', 'engine', 'bulk_response_count') || 100
       end
 
+      def bulk_response_size
+        @config.dig('drb_services', 'engine', 'bulk_response_size') || 1024**2 * 10
+      end
+
       def read_lock_timeout_seconds
         @config.dig('drb_services', 'engine', 'read_lock_timeout_seconds') ||
           @config.dig('read_lock_timeout_seconds') || # for backward compatibility
@@ -876,6 +897,7 @@ module RIMS
                                                   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,
+                                                                                bulk_response_size: @config.bulk_response_size,
                                                                                 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,
@@ -986,6 +1008,9 @@ module RIMS
         logger.info("connection parameter: send_buffer_limit_size=#{@config.send_buffer_limit_size}")
         logger.info("connection parameter: read_polling_interval_seconds=#{conn_limits.read_polling_interval_seconds}")
         logger.info("connection parameter: command_wait_timeout_seconds=#{conn_limits.command_wait_timeout_seconds}")
+        logger.info("protocol parameter: line_length_limit=#{@config.protocol_line_length_limit}")
+        logger.info("protocol parameter: literal_size_limit=#{@config.protocol_literal_size_limit}")
+        logger.info("protocol parameter: command_size_limit=#{@config.protocol_command_size_limit}")
         @config.charset_aliases.each_with_index do |(name, enc), i|
           logger.info("charset aliases parameter: alias[#{i}]: #{name} -> #{enc.name}")
         end
@@ -1000,6 +1025,7 @@ module RIMS
           logger.info("drb_services client config parameter: #{name}=#{value}")
         end
         logger.info("drb_services engine parameter: bulk_response_count=#{@config.bulk_response_count}")
+        logger.info("drb_services engine parameter: bulk_response_size=#{@config.bulk_response_size}")
         logger.info("drb_services engine parameter: read_lock_timeout_seconds=#{@config.read_lock_timeout_seconds}")
         logger.info("drb_services engine parameter: write_lock_timeout_seconds=#{@config.write_lock_timeout_seconds}")
         logger.info("drb_services engine parameter: cleanup_write_lock_timeout_seconds=#{@config.cleanup_write_lock_timeout_seconds}")
@@ -1050,7 +1076,11 @@ 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(drb_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,
+                                                        line_length_limit: @config.protocol_line_length_limit,
+                                                        literal_size_limit: @config.protocol_literal_size_limit,
+                                                        command_size_limit: @config.protocol_command_size_limit)
                 Protocol::Decoder.repl(decoder, conn_limits, stream, stream, logger)
               ensure
                 if (stream) then

data/lib/rims/test.rb

@@ -38,8 +38,7 @@ module RIMS
       module_function :message_data_list
 
       def make_body(description)
-        reader = RIMS::Protocol::RequestReader.new(StringIO.new('', 'r'), StringIO.new('', 'w'), Logger.new(STDOUT))
-        reader.parse(reader.scan_line(description))[0]
+        RIMS::Protocol::RequestReader.parse(RIMS::Protocol::RequestReader.scan(description))[0]
       end
       private :make_body
 

data/lib/rims/version.rb

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

data/rims.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'rims-rfc822', '>= 0.2.2'
-  spec.add_runtime_dependency 'riser', '>= 0.1.12'
+  spec.add_runtime_dependency 'riser', '>= 0.2.0'
   spec.add_runtime_dependency 'logger-joint'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/test/cmd/test_command.rb

@@ -141,6 +141,11 @@ module RIMS::Test
       '--read-polling-interval'          => [ %W[ -f #{BASE_DIR}/config.yml --read-polling-interval=5 ] ],
       '--command-wait-timeout'           => [ %W[ -f #{BASE_DIR}/config.yml --command-wait-timeout=3600 ] ],
 
+      # protocol:
+      '--line-length-limit'              => [ %W[ -f #{BASE_DIR}/config.yml --line-length-limit=16384 ] ],
+      '--literal-size-limit'             => [ %W[ -f #{BASE_DIR}/config.yml --literal-size-limit=16777216 ] ],
+      '--command-size-limit'             => [ %W[ -f #{BASE_DIR}/config.yml --command-size-limit=16777216 ] ],
+
       # charset aliases:
       '--use-default-charset-aliases'    => [ %W[ -f #{BASE_DIR}/config.yml --use-default-charset-aliases ] ],
       '--no-use-default-charset-aliases' => [ %W[ -f #{BASE_DIR}/config.yml --no-use-default-charset-aliases ] ],
@@ -159,6 +164,7 @@ module RIMS::Test
 
       # drb_services engine:
       '--bulk-response-count'            => [ %W[ -f #{BASE_DIR}/config.yml --bulk-response-count=128 ] ],
+      '--bulk-response-size'             => [ %W[ -f #{BASE_DIR}/config.yml --bulk-response-size=33554432 ] ],
       '--read-lock-timeout'              => [ %W[ -f #{BASE_DIR}/config.yml --read-lock-timeout=10 ] ],
       '--write-lock-timeout'             => [ %W[ -f #{BASE_DIR}/config.yml --write-lock-timeout=10 ] ],
       '--clenup-write-lock-timeout'      => [ %W[ -f #{BASE_DIR}/config.yml --write-lock-timeout=5 ] ],

data/test/test_error.rb

@@ -4,7 +4,7 @@ require 'rims'
 require 'test/unit'
 
 module RIMS::Test
-  class TestError < Test::Unit::TestCase
+  class ErrorTest < Test::Unit::TestCase
     def test_optional_data
       error = RIMS::Error.new('test', foo: 1, bar: '2')
       assert_equal('test', error.message)

data/test/test_passwd.rb

@@ -61,7 +61,7 @@ module RIMS::Test
     end
   end
 
-  class PasswordHashSourceEntry < Test::Unit::TestCase
+  class PasswordHashSourceEntryTest < Test::Unit::TestCase
     def setup
       @digest_factory = Digest::SHA256
       @hash_type = 'SHA256'

data/test/test_protocol_decoder.rb

@@ -257,8 +257,15 @@ module RIMS::Test
     end
     private :open_mail_store
 
+    LINE_LENGTH_LIMIT  = 128
+    LITERAL_SIZE_LIMIT = 1024**2
+    COMMAND_SIZE_LIMIT = LITERAL_SIZE_LIMIT + LINE_LENGTH_LIMIT
+
     def make_decoder
-      RIMS::Protocol::Decoder.new_decoder(@drb_services, @auth, @logger)
+      RIMS::Protocol::Decoder.new_decoder(@drb_services, @auth, @logger,
+                                          line_length_limit: LINE_LENGTH_LIMIT,
+                                          literal_size_limit: LITERAL_SIZE_LIMIT,
+                                          command_size_limit: COMMAND_SIZE_LIMIT)
     end
     private :make_decoder
 
@@ -380,6 +387,17 @@ module RIMS::Test
     end
     private :assert_imap_command
 
+    def assert_imap_closed
+      if (stream_test?) then
+        assert_raise(Errno::EPIPE, StopIteration) {
+          assert_imap_command('NOOP') {|assert|
+            assert.equal("#{tag} OK NOOP completed")
+          }
+        }
+      end
+    end
+    private :assert_imap_closed
+
     def client_plain_response_base64(authentication_id, plain_password)
       response_txt = [ authentication_id, authentication_id, plain_password ].join("\0")
       RIMS::Protocol.encode_base64(response_txt)
@@ -562,6 +580,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -607,6 +627,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -658,6 +680,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -713,6 +737,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -755,6 +781,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -836,6 +864,8 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
+        assert_imap_closed
+
         open_mail_store{
           assert_msg_uid(                      2, 3)
           assert_flag_enabled_msgs('answered',     )
@@ -886,6 +916,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -967,6 +999,8 @@ module RIMS::Test
           assert_equal(false, @decoder.selected?)
         end
 
+        assert_imap_closed
+
         open_mail_store{
           assert_msg_uid(                      1, 2, 3)
           assert_flag_enabled_msgs('answered',        )
@@ -1017,6 +1051,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1066,6 +1102,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1102,6 +1140,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1174,6 +1214,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1214,6 +1256,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1293,6 +1337,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1340,6 +1386,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1409,6 +1457,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1519,6 +1569,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1557,6 +1609,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1663,6 +1717,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1694,6 +1750,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1761,6 +1819,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1881,6 +1941,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1920,6 +1982,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -1928,6 +1992,69 @@ module RIMS::Test
       test_append_utf7_mbox_name
     end
 
+    def test_append_literal_stream
+      make_mail_simple
+      make_mail_multipart
+      make_mail_mime_subject
+
+      use_imap_stream_decode_engine # always run in stream
+      imap_decode_engine_evaluate{
+        if (stream_test?) then
+          assert_untagged_response{|assert|
+            assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+          }
+        end
+
+        assert_imap_command('LOGIN foo open_sesame') {|assert|
+          assert.equal("#{tag} OK LOGIN completed")
+        }
+
+        open_mail_store{
+          assert_msg_uid()
+        }
+
+        assert_imap_command("APPEND INBOX #{literal(@simple_mail.raw_source)}") {|assert|
+          assert.match(/^\+ /)
+          assert.match(/^#{tag} OK \[APPENDUID \d+ \d+\] APPEND completed/)
+        }
+
+        open_mail_store{
+          assert_msg_uid(1)
+          assert_equal(@simple_mail.raw_source, get_msg_text(1))
+          assert_msg_flags(1, recent: true)
+        }
+
+        assert_imap_command("APPEND INBOX #{literal(@mpart_mail.raw_source)}") {|assert|
+          assert.match(/^\+ /)
+          assert.match(/^#{tag} OK \[APPENDUID \d+ \d+\] APPEND completed/)
+        }
+
+        open_mail_store{
+          assert_msg_uid(1, 2)
+          assert_equal(@mpart_mail.raw_source, get_msg_text(2))
+          assert_msg_flags(2, recent: true)
+        }
+
+        assert_imap_command("APPEND INBOX #{literal(@mime_subject_mail.raw_source)}") {|assert|
+          assert.match(/^\+ /)
+          assert.match(/^#{tag} OK \[APPENDUID \d+ \d+\] APPEND completed/)
+        }
+
+        open_mail_store{
+          assert_msg_uid(1, 2, 3)
+          assert_equal(@mime_subject_mail.raw_source, get_msg_text(3))
+          assert_msg_flags(3, recent: true)
+        }
+
+        assert_imap_command('LOGOUT') {|assert|
+          assert.match(/^\* BYE /)
+          assert.equal("#{tag} OK LOGOUT completed")
+        }
+
+        assert_imap_closed
+      }
+    end
+
     def test_check
       imap_decode_engine_evaluate{
         if (stream_test?) then
@@ -1981,6 +2108,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2092,6 +2221,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -2196,6 +2327,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -2346,6 +2479,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2422,6 +2557,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2551,6 +2688,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2637,13 +2776,13 @@ module RIMS::Test
         }
 
         utf8_msg = "\u306F\u306B\u307B"
-        assert_imap_command("SEARCH CHARSET utf-8 BODY {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+        assert_imap_command("SEARCH CHARSET utf-8 BODY #{literal(utf8_msg)}".b) {|assert|
           assert.match(/^\+ /)
           assert.equal("* SEARCH 4 5\r\n")
           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_imap_command("SEARCH CHARSET euc-jp BODY #{literal(utf8_msg)}".b) {|assert|
           assert.match(/^\+ /)
           assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
@@ -2668,6 +2807,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2761,13 +2902,13 @@ module RIMS::Test
         }
 
         utf8_msg = "\u306F\u306B\u307B"
-        assert_imap_command("SEARCH CHARSET utf-8 TEXT {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+        assert_imap_command("SEARCH CHARSET utf-8 TEXT #{literal(utf8_msg)}".b) {|assert|
           assert.match(/^\+ /)
           assert.equal("* SEARCH 4 5\r\n")
           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_imap_command("SEARCH CHARSET euc-jp TEXT #{literal(utf8_msg)}".b) {|assert|
           assert.match(/^\+ /)
           assert.match(/^#{tag} BAD /, peek_next_line: true).match(/syntax error/)
         }
@@ -2792,6 +2933,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2853,7 +2996,7 @@ module RIMS::Test
         }
 
         utf8_msg = "\u306F\u306B\u307B"
-        assert_imap_command("SEARCH CHARSET utf-8 TEXT {#{utf8_msg.bytesize}}\r\n#{utf8_msg}".b) {|assert|
+        assert_imap_command("SEARCH CHARSET utf-8 TEXT #{literal(utf8_msg)}".b) {|assert|
           assert.match(/^\+ /)
           assert.equal("* SEARCH\r\n")
           assert.equal("#{tag} OK SEARCH completed\r\n")
@@ -2863,6 +3006,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -2927,6 +3072,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -3080,6 +3227,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -3232,6 +3381,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -3584,6 +3735,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -3886,6 +4039,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -4238,6 +4393,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -4540,6 +4697,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -4709,6 +4868,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -4913,6 +5074,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -5117,6 +5280,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -5170,6 +5335,8 @@ module RIMS::Test
           assert.match(/^\* BYE /)
           assert.equal("#{tag} OK LOGOUT completed")
         }
+
+        assert_imap_closed
       }
     end
 
@@ -5262,6 +5429,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -5370,6 +5539,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -5379,11 +5550,11 @@ module RIMS::Test
     end
 
     def test_error_handling_stream
-      use_imap_stream_decode_engine
+      use_imap_stream_decode_engine # always run in stream
       imap_decode_engine_evaluate{
         assert_imap_command('') {|assert|
           assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
-          assert.equal('* BAD client command syntax error')
+          assert.equal("#{tag} BAD client command syntax error")
         }
 
         assert_imap_command('no_command') {|assert|
@@ -5401,6 +5572,30 @@ module RIMS::Test
         assert_imap_command('noop detarame') {|assert|
           assert.equal("#{tag} BAD invalid command parameter")
         }
+
+        assert_imap_command("APPEND INBOX {#{LITERAL_SIZE_LIMIT + 1}}") {|assert|
+          assert.equal("#{tag} BAD literal size too large")
+        }
+
+        assert_imap_command("APPEND #{literal('x' * LITERAL_SIZE_LIMIT)} #{'y' * (LINE_LENGTH_LIMIT - 3)}") {|assert|
+          assert.match(/^\+ /)
+          assert.equal("#{tag} BAD command size too large") # by last line
+        }
+
+        assert_imap_command("APPEND #{literal('x' * LITERAL_SIZE_LIMIT)} {#{LITERAL_SIZE_LIMIT}}") {|assert|
+          assert.match(/^\+ /)
+          assert.equal("#{tag} BAD command size too large") # by last literal
+        }
+
+        @tag = '*T000'
+        assert_imap_command('noop') {|assert|
+          assert.equal('* BAD client command syntax error')
+        }
+
+        @tag = '+T000'
+        assert_imap_command('noop') {|assert|
+          assert.equal('* BAD client command syntax error')
+        }
       }
     end
 
@@ -5432,6 +5627,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -5588,6 +5785,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -5646,6 +5845,8 @@ module RIMS::Test
         }
 
         assert_equal(false, @decoder.auth?) if command_test?
+
+        assert_imap_closed
       }
     end
 
@@ -6249,6 +6450,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -6330,6 +6533,8 @@ module RIMS::Test
           assert_equal(false, @decoder.auth?)
           assert_equal(false, @decoder.selected?)
         end
+
+        assert_imap_closed
       }
     end
 
@@ -6337,6 +6542,66 @@ module RIMS::Test
       use_imap_stream_decode_engine
       test_charset_convert_options
     end
+
+    def test_command_line_too_long_error_stream
+      use_imap_stream_decode_engine # always run in stream
+      imap_decode_engine_evaluate{
+        assert_untagged_response{|assert|
+          assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+        }
+
+        assert_imap_command('APPEND INBOX ' + 'x' * LINE_LENGTH_LIMIT) {|assert|
+          assert.equal('* BAD line too long')
+          assert.equal('* BYE server autologout: connection terminated')
+        }
+
+        assert_imap_closed
+      }
+    end
+
+    def test_authenticate_line_too_long_error_stream
+      use_imap_stream_decode_engine # always run in stream
+      imap_decode_engine_evaluate{
+        assert_untagged_response{|assert|
+          assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+        }
+
+        assert_imap_command('AUTHENTICATE plain',
+                            client_input_text: 'x' * LINE_LENGTH_LIMIT + "\r\n") {|assert|
+          assert.equal('+ ')
+          assert.equal('* BAD line too long')
+          assert.equal('* BYE server autologout: connection terminated')
+        }
+
+        assert_imap_closed
+      }
+    end
+
+    def test_idle_line_too_long_error_stream
+      use_imap_stream_decode_engine # always run in stream
+      imap_decode_engine_evaluate{
+        assert_untagged_response{|assert|
+          assert.equal("* OK RIMS v#{RIMS::VERSION} IMAP4rev1 service ready.")
+        }
+
+        assert_imap_command('LOGIN foo open_sesame') {|assert|
+          assert.equal("#{tag} OK LOGIN completed")
+        }
+
+        assert_imap_command('SELECT INBOX') {|assert|
+          assert.skip_while{|line| line =~ /^\* / }
+          assert.equal("#{tag} OK [READ-WRITE] SELECT completed")
+        }
+
+        assert_imap_command('IDLE', client_input_text: 'DONE' + ' ' * LINE_LENGTH_LIMIT +  "\r\n") {|assert|
+          assert.match(/^\+ /)
+          assert.equal('* BAD line too long')
+          assert.equal('* BYE server autologout: connection terminated')
+        }
+
+        assert_imap_closed
+      }
+    end
   end
 
   class ProtocolMailDeliveryDecoderTest < Test::Unit::TestCase