rims 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f51adf08f317981cdec3bb1067edd7a6c4befcf2f3e3e9c3ab4ac97702dad80
-  data.tar.gz: d0089e4150ad0768b0267c3c34980fad6a5251f0953997bd75a8c00e590120bb
+  metadata.gz: fe462a03485c3e28162aef29617c769fe660f1fcb5d431fe4fcd5034e967fb49
+  data.tar.gz: 10654bf0987325929b673e815b245d7821ab3b7fd76a90c73d2f534cef729eee
 SHA512:
-  metadata.gz: 4be9394ccaa4e2081dcc4040f197f375444b04953706c050aad5b1e255121cfec2d49753f31160f0dc458dcac139296b37c5efe0685f749904e5a0d74c705b24
-  data.tar.gz: a1a1a3f16b3069b2fd0e2ee9016349fbb2bb43401220ed9d00beec44914b4ef0206582c41a2bfb94c895d91ea6eb62ba76dcdd342338aa5becb8670777a3343a
+  metadata.gz: 22f60433f0d748c266e377da045d544910d5e13028649d381fafdc40e5fbac0a5fc62e67c7bd777a6b46ef84058a4e690a302dc8a8d9d422996ec1926e82deef
+  data.tar.gz: 7a2b9c3094f79e94dc85176d3710a1a1e95c96c53ad8d5c8bf36f51ce123928497a518bb7d3ee69dea400bd793fe29536d114e867b95d647e055348062f14893

data/.gitignore

@@ -14,6 +14,9 @@
 /tmp/
 /vendor/
 /Gemfile.lock
+/Gemfile_local*
 /README.html
 *~
+.#*
+\#*
 *.log

data/CHANGELOG.md

@@ -0,0 +1,97 @@
+Change Log
+==========
+
+<!--
+subsections:
+### Added
+### Changed
+### Removed
+### Fixed
+-->
+
+0.3.1
+-----
+Released on 2020-08-29.
+
+### Added
+- Input size limits.
+  [#34](https://github.com/y10k/rims/issues/34)
+- Configurable bulk_response_size parameter.
+  [#36](https://github.com/y10k/rims/issues/36)
+
+### Changed
+- Ready to Ruby 2.7.
+  [#35](https://github.com/y10k/rims/issues/35)
+- Semantic versioning.
+  [#37](https://github.com/y10k/rims/issues/37)
+
+0.2.9
+-----
+Released on 2019-12-12.
+
+### Added
+- Add `umask(2)` configuration parameter. [#29](https://github.com/y10k/rims/issues/29)
+- Add debug logging for conflicted subscriber error. This problem is
+  not solved because it does not reappear. [#28](https://github.com/y10k/rims/issues/28)
+
+### Changed
+- Ready to Ruby 2.7. [#35](https://github.com/y10k/rims/issues/35)
+
+### Fixed
+- Fix a bug of detached thread finishing a protocol decoder engine.
+- Make bulk message size of inter-process communication not exceeding `DRb`'s `load_limit`.
+  [#30](https://github.com/y10k/rims/issues/30)
+  [#33](https://github.com/y10k/rims/issues/33)
+
+0.2.8
+-----
+Released on 2019-10-10.
+
+0.2.7
+-----
+Released on 2019-07-27.
+
+0.2.6
+-----
+Released on 2019-07-09.
+
+0.2.5
+-----
+Released on 2019-06-10.
+
+0.2.4
+-----
+Released on 2019-04-25.
+
+0.2.3
+-----
+Released on 2019-04-10.
+
+0.2.2
+-----
+Released on 2019-03-06.
+
+0.2.1
+-----
+Released on 2019-02-18.
+
+0.1.0
+-----
+Released on 2015-02-22.
+
+0.0.4
+-----
+Released on 2014-06-08.
+
+0.0.3
+-----
+Released on 2014-04-15.
+
+0.0.2
+-----
+Released on 2014-03-05.
+
+0.0.1
+-----
+Released on 2014-02-24.
+

data/ChangeLog

@@ -1,3 +1,52 @@
+2019-12-12  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* ChangeLog: updates to this file have been stopped.
+	see CHANGELOG.md from now on.
+
+2019-10-10  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* RIMS version 0.2.8 is released.
+
+2019-08-12  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/cmd.rb, lib/rims/service.rb: DRb service load_limit
+	option.
+
+2019-07-27  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* RIMS version 0.2.7 is released.
+
+2019-07-25  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/cmd.rb, lib/rims/protocol/decoder.rb,
+	lib/rims/protocol/parser.rb, lib/rims/service.rb: message charset
+	encoding conversion options.
+
+2019-07-22  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/cmd.rb, lib/rims/protocol/decoder.rb,
+	lib/rims/protocol/parser.rb, lib/rims/service.rb: charset aliases
+	option.
+
+2019-07-20  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/protocol/decoder.rb, lib/rims/protocol/parser.rb:
+	case-insensitive matching of SEARCH command.
+
+	See RFC3501 / 6.4.4. SEARCH Command
+	<https://tools.ietf.org/html/rfc3501#section-6.4.4>
+
+	    In all search keys that use strings, a message matches the key if
+	    the string is a substring of the field. The matching is
+	    case-insensitive.
+
+	* lib/rims/protocol/parser.rb: search for MIME encoded header
+	fields.
+
+2019-07-09  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* RIMS version 0.2.6 is released.
+
 2019-07-08  TOKI Yoshinori  <toki@freedom.ne.jp>
 
 	* lib/rims/cmd.rb: disable plug-in name list on plug-in command

data/Rakefile

@@ -28,14 +28,18 @@ Rake::RDocTask.new do |rd|
   rd.rdoc_files.include('lib/**/*.rb')
 end
 
+rule '.html' => '.md' do |t|
+  sh "pandoc --from=markdown --to=html5 --standalone --self-contained --css=$HOME/.pandoc/github.css --output=#{t.name} #{t.source}"
+end
+
 desc 'Build README.html from markdown source'
 task :readme => %w[ README.html ]
-
-file 'README.html' => [ 'README.md' ] do
-  sh "pandoc --from=markdown --to=html5 --standalone --self-contained --css=$HOME/.pandoc/github.css --output=README.html README.md"
-end
 CLOBBER.include 'README.html'
 
+desc 'Build CHANGELOG.html from markdown source'
+task :changelog => %w[ CHANGELOG.html ]
+CLOBBER.include 'CHANGELOG.html'
+
 namespace :test_cert do
   tls_dir = Pathname('test/tls')
 

data/lib/rims.rb

@@ -5,35 +5,37 @@ require "rims/version"
 autoload :OpenSSL, 'openssl'
 
 module RIMS
-  autoload :Authentication, 'rims/auth'
-  autoload :Checksum_KeyValueStore, 'rims/cksum_kvs'
-  autoload :Cmd, 'rims/cmd'
-  autoload :DB, 'rims/db'
-  autoload :Error, 'rims/error'
-  autoload :GDBM_KeyValueStore, 'rims/gdbm_kvs'
-  autoload :GlobalDB, 'rims/db'
-  autoload :Hash_KeyValueStore, 'rims/hash_kvs'
-  autoload :IllegalLockError, 'rims/lock'
-  autoload :KeyValueStore, 'rims/kvs'
-  autoload :LockError, 'rims/lock'
-  autoload :MailFolder, 'rims/mail_store'
-  autoload :MailStore, 'rims/mail_store'
-  autoload :MailboxDB, 'rims/db'
-  autoload :MessageDB, 'rims/db'
-  autoload :MessageSetSyntaxError, 'rims/protocol'
-  autoload :Password, 'rims/passwd'
-  autoload :Protocol, 'rims/protocol'
-  autoload :ProtocolError, 'rims/protocol'
-  autoload :RFC822, 'rims/rfc822'
-  autoload :ReadLockError, 'rims/lock'
-  autoload :ReadLockTimeoutError, 'rims/lock'
-  autoload :ReadWriteLock, 'rims/lock'
-  autoload :ServerResponseChannel, 'rims/channel'
-  autoload :Service, 'rims/service'
-  autoload :SyntaxError, 'rims/protocol'
-  autoload :Test, 'rims/test'
-  autoload :WriteLockError, 'rims/lock'
-  autoload :WriteLockTimeoutError, 'rims/lock'
+  autoload :Authentication,           'rims/auth'
+  autoload :Checksum_KeyValueStore,   'rims/cksum_kvs'
+  autoload :Cmd,                      'rims/cmd'
+  autoload :CommandSizeTooLargeError, 'rims/protocol'
+  autoload :DB,                       'rims/db'
+  autoload :Error,                    'rims/error'
+  autoload :GDBM_KeyValueStore,       'rims/gdbm_kvs'
+  autoload :Hash_KeyValueStore,       'rims/hash_kvs'
+  autoload :IllegalLockError,         'rims/lock'
+  autoload :KeyValueStore,            'rims/kvs'
+  autoload :LineTooLongError,         'rims/protocol'
+  autoload :LiteralSizeTooLargeError, 'rims/protocol'
+  autoload :LockError,                'rims/lock'
+  autoload :MailFolder,               'rims/mail_store'
+  autoload :MailStore,                'rims/mail_store'
+  autoload :MessageSetSyntaxError,    'rims/protocol'
+  autoload :Password,                 'rims/passwd'
+  autoload :Protocol,                 'rims/protocol'
+  autoload :ProtocolError,            'rims/protocol'
+  autoload :RFC822,                   'rims/rfc822'
+  autoload :ReadLockError,            'rims/lock'
+  autoload :ReadLockTimeoutError,     'rims/lock'
+  autoload :ReadSizeError,            'rims/protocol'
+  autoload :ReadWriteLock,            'rims/lock'
+  autoload :RecoverableReadSizeError, 'rims/protocol'
+  autoload :ServerResponseChannel,    'rims/channel'
+  autoload :Service,                  'rims/service'
+  autoload :SyntaxError,              'rims/protocol'
+  autoload :Test,                     'rims/test'
+  autoload :WriteLockError,           'rims/lock'
+  autoload :WriteLockTimeoutError,    'rims/lock'
 end
 
 # Local Variables:

data/lib/rims/channel.rb

@@ -1,6 +1,20 @@
 # -*- coding: utf-8 -*-
 
+require 'forwardable'
+
 module RIMS
+  class ServerResponseChannelError < Error
+  end
+
+  class ServerResponseChannelAttachError < ServerResponseChannelError
+  end
+
+  class ServerResponseChannelDetachError < ServerResponseChannelError
+  end
+
+  class ServerResponseChannelPublishError < ServerResponseChannelError
+  end
+
   class ServerResponseChannel
     def initialize
       @mutex = Thread::Mutex.new
@@ -9,14 +23,16 @@ module RIMS
 
     def make_pub_sub_pair(mbox_id)
       pub = ServerResponsePublisher.new(self, mbox_id)
-      sub = ServerResponseSubscriber.new(self, mbox_id, pub.pub_sub_pair_key)
+      sub = ServerResponseSubscriber.new(self, pub)
       return pub, attach(sub)
     end
 
     def attach(sub)
       @mutex.synchronize{
         @channel[sub.mbox_id] ||= {}
-        (@channel[sub.mbox_id].key? sub.pub_sub_pair_key) and raise ArgumentError, 'conflicted subscriber.'
+        if (@channel[sub.mbox_id].key? sub.pub_sub_pair_key) then
+          raise ServerResponseChannelAttachError.new('conflicted subscriber.', channel: self, subscriber: sub)
+        end
         @channel[sub.mbox_id][sub.pub_sub_pair_key] = sub
       }
 
@@ -30,8 +46,13 @@ module RIMS
     #   - ServerResponseSubscriber#detach
     def detach(sub)
       @mutex.synchronize{
-        ((@channel.key? sub.mbox_id) && (@channel[sub.mbox_id].key? sub.pub_sub_pair_key)) or raise ArgumentError, 'unregistered pub-sub pair.'
-        (@channel[sub.mbox_id][sub.pub_sub_pair_key] == sub) or raise 'internal error: mismatched subscriber.'
+        unless ((@channel.key? sub.mbox_id) && (@channel[sub.mbox_id].key? sub.pub_sub_pair_key)) then
+          raise ServerResponseChannelDetachError.new('unregistered pub-sub pair.', channel: self, subscriber: sub)
+        end
+
+        unless (@channel[sub.mbox_id][sub.pub_sub_pair_key] == sub) then
+          raise ServerResponseChannelDetachError.new('internal error: mismatched subscriber.', channel: self, subscribe: sub)
+        end
 
         @channel[sub.mbox_id].delete(sub.pub_sub_pair_key)
         if (@channel[sub.mbox_id].empty?) then
@@ -74,7 +95,12 @@ module RIMS
     end
 
     def publish(response_message)
-      @channel or raise 'detached publisher.'
+      unless (@channel) then
+        raise ServerResponseChannelPublishError.new('detached publisher.',
+                                                    publisher: self,
+                                                    pub_sub_pair_key: pub_sub_pair_key,
+                                                    message: response_message)
+      end
       @channel.publish(@mbox_id, pub_sub_pair_key, response_message)
       nil
     end
@@ -89,15 +115,14 @@ module RIMS
     # do not call this method directly, call the following method
     # instead.
     #   - ServerResponseChannel#make_pub_sub_pair
-    def initialize(channel, mbox_id, pub_sub_pair_key)
+    def initialize(channel, pub)
       @channel = channel
-      @mbox_id = mbox_id
-      @pub_sub_pair_key = pub_sub_pair_key
+      @pub = pub
       @queue = Thread::Queue.new
     end
 
-    attr_reader :mbox_id
-    attr_reader :pub_sub_pair_key
+    extend Forwardable
+    def_delegators :@pub, :mbox_id, :pub_sub_pair_key
 
     # do not call this method directly, call the following method
     # instead.

data/lib/rims/cmd.rb

@@ -325,6 +325,16 @@ module RIMS
                  })
         }
       end
+      options.on('--daemon-umask=UMASK',
+                 Integer,
+                 "Umask(2). effective only with daemon command. default is `#{'%04o' % Service::DEFAULT_CONFIG.daemon_umask}'."
+                ) do |umask|
+        build.chain{|c|
+          c.load(daemon: {
+                   umask: umask
+                 })
+        }
+      end
       options.on('--status-file=FILE',
                  String,
                  "Name of status file. effective only with daemon command. default is `#{Service::DEFAULT_CONFIG.status_file}'."
@@ -462,6 +472,85 @@ module RIMS
                  })
         }
       end
+      options.on('--line-length-limit=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(protocol: {
+                   line_length_limit: size
+                 })
+        }
+      end
+      options.on('--literal-size-limit=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(protocol: {
+                   literal_size_limit: size
+                 })
+        }
+      end
+      options.on('--command-size-limit=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(protocol: {
+                   command_size_limit: size
+                 })
+        }
+      end
+      options.on('--[no-]use-default-charset-aliases'
+                ) do |use_default_aliases|
+        build.chain{|c|
+          c.load(charset: {
+                   use_default_aliases: use_default_aliases
+                 })
+        }
+      end
+      options.on('--add-charset-alias=NAME_TO_ENCODING',
+                 /\A \S+,\S+ \z/x,
+                 "Set the alias name and encoding separated with comma (,)."
+                ) do |name_to_encoding|
+        name, encoding = name_to_encoding.split(',', 2)
+        build.chain{|c|
+          c.load(charset: {
+                   aliases: [
+                     { name: name, encoding: encoding }
+                   ]
+                 })
+        }
+      end
+      options.on('--[no-]replace-charset-invalid'
+                ) do |replace|
+        build.chain{|c|
+          c.load(charset: {
+                   convert_options: {
+                     replace_invalid_byte_sequence: replace
+                   }
+                 })
+        }
+      end
+      options.on('--[no-]replace-charset-undef'
+                ) do |replace|
+        build.chain{|c|
+          c.load(charset: {
+                   convert_options: {
+                     replace_undefined_character: replace
+                   }
+                 })
+        }
+      end
+      options.on('--charset-replaced-mark=MARK',
+                 String
+                ) do |mark|
+        build.chain{|c|
+          c.load(charset: {
+                   convert_options: {
+                     replaced_mark: mark
+                   }
+                 })
+        }
+      end
       options.on('--drb-process-num=NUMBER',
                  Integer
                 ) do |num|
@@ -471,6 +560,15 @@ module RIMS
                  })
         }
       end
+      options.on('--drb-load-limit=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(drb_services: {
+                   load_limit: size
+                 })
+        }
+      end
       options.on('--bulk-response-count=COUNT',
                  Integer) do |count|
         build.chain{|c|
@@ -481,6 +579,16 @@ module RIMS
                  })
         }
       end
+      options.on('--bulk-response-size=SIZE',
+                 Integer) do |size|
+        build.chain{|c|
+          c.load(drb_services: {
+                   engine: {
+                     bulk_response_size: size
+                   }
+                 })
+        }
+      end
       options.on('--read-lock-timeout=SECONDS',
                  Float
                 ) do |seconds|
@@ -515,7 +623,6 @@ module RIMS
         }
       end
       options.on('--meta-kvs-type=TYPE',
-                 KeyValueStore::FactoryBuilder.plug_in_names,
                  "Choose key-value store type of mailbox meta-data database. default is `" +
                  KeyValueStore::FactoryBuilder.plug_in_names[0] +
                  "'."
@@ -558,7 +665,6 @@ module RIMS
         }
       end
       options.on('--text-kvs-type=TYPE',
-                 KeyValueStore::FactoryBuilder.plug_in_names,
                  "Choose key-value store type of mailbox text-data database. default is `" +
                  KeyValueStore::FactoryBuilder.plug_in_names[0] +
                  "'."
@@ -684,7 +790,6 @@ module RIMS
         build.chain{|c| c.load(ip_port: port) }
       end
       options.on('--kvs-type=TYPE',
-                 KeyValueStore::FactoryBuilder.plug_in_names,
                  'Deplicated.'
                 ) do |kvs_type|
         warn("warning: `--kvs-type=TYPE' is deplicated option and should use `--meta-kvs-type=TYPE' or `--text-kvs-type=TYPE'.")
@@ -1074,6 +1179,7 @@ module RIMS
         Riser::Daemon.start_daemon(daemonize: svc_conf.daemonize?,
                                    daemon_name: svc_conf.daemon_name,
                                    daemon_debug: svc_conf.daemon_debug?,
+                                   daemon_umask: svc_conf.daemon_umask,
                                    status_file: svc_conf.status_file,
                                    listen_address: proc{
                                      # to reload on server restart