dalli 2.7.5 → 3.0.1

data/lib/dalli/socket.rb

@@ -1,162 +1,95 @@
-require 'rbconfig'
+# frozen_string_literal: true
 
-module Dalli::Server::TCPSocketOptions
-  def setsockopts(sock, options)
-    sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true) if options[:keepalive]
-    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVBUF, options[:rcvbuf]) if options[:rcvbuf]
-    sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF, options[:sndbuf]) if options[:sndbuf]
-  end
-end
-
-begin
-  require 'kgio'
-  puts "Using kgio socket IO" if defined?($TESTING) && $TESTING
-
-  class Dalli::Server::KSocket < Kgio::Socket
-    attr_accessor :options, :server
-
-    def kgio_wait_readable
-      IO.select([self], nil, nil, options[:socket_timeout]) || raise(Timeout::Error, "IO timeout")
-    end
-
-    def kgio_wait_writable
-      IO.select(nil, [self], nil, options[:socket_timeout]) || raise(Timeout::Error, "IO timeout")
-    end
-
-    alias :write :kgio_write
-
-    def readfull(count)
-      value = ''
-      loop do
-        value << kgio_read!(count - value.bytesize)
-        break if value.bytesize == count
-      end
-      value
-    end
-
-    def read_available
-      value = ''
-      loop do
-        ret = kgio_tryread(8196)
-        case ret
-        when nil
-          raise EOFError, 'end of stream'
-        when :wait_readable
-          break
-        else
-          value << ret
-        end
-      end
-      value
-    end
-  end
+require 'openssl'
 
-  class Dalli::Server::KSocket::TCP < Dalli::Server::KSocket
-    extend Dalli::Server::TCPSocketOptions
-
-    def self.open(host, port, server, options = {})
-      addr = Socket.pack_sockaddr_in(port, host)
-      sock = start(addr)
-      setsockopts(sock, options)
-      sock.options = options
-      sock.server = server
-      sock.kgio_wait_writable
-      sock
-    end
-  end
-
-  class Dalli::Server::KSocket::UNIX < Dalli::Server::KSocket
-    def self.open(path, server, options = {})
-      addr = Socket.pack_sockaddr_un(path)
-      sock = start(addr)
-      sock.options = options
-      sock.server = server
-      sock.kgio_wait_writable
-      sock
-    end
-  end
-
-  if ::Kgio.respond_to?(:wait_readable=)
-    ::Kgio.wait_readable = :kgio_wait_readable
-    ::Kgio.wait_writable = :kgio_wait_writable
-  end
-
-rescue LoadError
-
-  puts "Using standard socket IO (#{RUBY_DESCRIPTION})" if defined?($TESTING) && $TESTING
-  module Dalli::Server::KSocket
+module Dalli
+  module Socket
     module InstanceMethods
+
       def readfull(count)
-        value = ''
-        begin
-          loop do
-            value << read_nonblock(count - value.bytesize)
-            break if value.bytesize == count
-          end
-        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-          if IO.select([self], nil, nil, options[:socket_timeout])
-            retry
+        value = +""
+        loop do
+          result = read_nonblock(count - value.bytesize, exception: false)
+          if result == :wait_readable
+            raise Timeout::Error, "IO timeout: #{safe_options.inspect}" unless IO.select([self], nil, nil, options[:socket_timeout])
+          elsif result == :wait_writable
+            raise Timeout::Error, "IO timeout: #{safe_options.inspect}" unless IO.select(nil, [self], nil, options[:socket_timeout])
+          elsif result
+            value << result
           else
-            raise Timeout::Error, "IO timeout: #{options.inspect}"
+            raise Errno::ECONNRESET, "Connection reset: #{safe_options.inspect}"
           end
+          break if value.bytesize == count
         end
         value
       end
 
       def read_available
-        value = ''
+        value = +""
         loop do
-          begin
-            value << read_nonblock(8196)
-          rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          result = read_nonblock(8196, exception: false)
+          if result == :wait_readable
+            break
+          elsif result == :wait_writable
             break
+          elsif result
+            value << result
+          else
+            raise Errno::ECONNRESET, "Connection reset: #{safe_options.inspect}"
           end
         end
         value
       end
-    end
 
-    def self.included(receiver)
-      receiver.send(:attr_accessor, :options, :server)
-      receiver.send(:include, InstanceMethods)
+      def safe_options
+        options.reject { |k, v| [:username, :password].include? k }
+      end
     end
-  end
-
-  class Dalli::Server::KSocket::TCP < TCPSocket
-    extend Dalli::Server::TCPSocketOptions
-    include Dalli::Server::KSocket
 
-    def self.open(host, port, server, options = {})
-      Timeout.timeout(options[:socket_timeout]) do
-        sock = new(host, port)
-        setsockopts(sock, options)
-        sock.options = {:host => host, :port => port}.merge(options)
-        sock.server = server
-        sock
+    class SSLSocket < ::OpenSSL::SSL::SSLSocket
+      include Dalli::Socket::InstanceMethods
+      def options
+        io.options
       end
     end
-  end
 
-  if RbConfig::CONFIG['host_os'] =~ /mingw|mswin/
-    class Dalli::Server::KSocket::UNIX
-      def initialize(*args)
-        raise Dalli::DalliError, "Unix sockets are not supported on Windows platform."
+    class TCP < TCPSocket
+      include Dalli::Socket::InstanceMethods
+      attr_accessor :options, :server
+
+      def self.open(host, port, server, options = {})
+        Timeout.timeout(options[:socket_timeout]) do
+          sock = new(host, port)
+          sock.options = {host: host, port: port}.merge(options)
+          sock.server = server
+          sock.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
+          sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_KEEPALIVE, true) if options[:keepalive]
+          sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_RCVBUF, options[:rcvbuf]) if options[:rcvbuf]
+          sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_SNDBUF, options[:sndbuf]) if options[:sndbuf]
+
+          return sock unless options[:ssl_context]
+
+          ssl_socket = Dalli::Socket::SSLSocket.new(sock, options[:ssl_context])
+          ssl_socket.hostname = host
+          ssl_socket.sync_close = true
+          ssl_socket.connect
+          ssl_socket
+        end
       end
     end
-  else
-    class Dalli::Server::KSocket::UNIX < UNIXSocket
-      include Dalli::Server::KSocket
+
+    class UNIX < UNIXSocket
+      include Dalli::Socket::InstanceMethods
+      attr_accessor :options, :server
 
       def self.open(path, server, options = {})
         Timeout.timeout(options[:socket_timeout]) do
           sock = new(path)
-          sock.options = {:path => path}.merge(options)
+          sock.options = {path: path}.merge(options)
           sock.server = server
           sock
         end
       end
     end
-
   end
 end

data/lib/dalli/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dalli
-  VERSION = '2.7.5'
+  VERSION = "3.0.1"
 end

data/lib/dalli.rb

@@ -1,13 +1,17 @@
-require 'dalli/compressor'
-require 'dalli/client'
-require 'dalli/ring'
-require 'dalli/server'
-require 'dalli/socket'
-require 'dalli/version'
-require 'dalli/options'
-require 'dalli/railtie' if defined?(::Rails::Railtie)
+# frozen_string_literal: true
+
+require "dalli/compressor"
+require "dalli/client"
+require "dalli/ring"
+require "dalli/protocol"
+require "dalli/protocol/binary"
+require "dalli/socket"
+require "dalli/version"
+require "dalli/options"
 
 module Dalli
+  autoload :Server, "dalli/server"
+
   # generic error
   class DalliError < RuntimeError; end
   # socket/server communication error
@@ -18,6 +22,8 @@ module Dalli
   class MarshalError < DalliError; end
   # application error in marshalling deserialization or decompression
   class UnmarshalError < DalliError; end
+  # payload too big for memcached
+  class ValueOverMaxSize < DalliError; end
 
   def self.logger
     @logger ||= (rails_logger || default_logger)
@@ -25,12 +31,12 @@ module Dalli
 
   def self.rails_logger
     (defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger) ||
-    (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
+      (defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER.respond_to?(:debug) && RAILS_DEFAULT_LOGGER)
   end
 
   def self.default_logger
-    require 'logger'
-    l = Logger.new(STDOUT)
+    require "logger"
+    l = Logger.new($stdout)
     l.level = Logger::INFO
     l
   end
@@ -38,9 +44,4 @@ module Dalli
   def self.logger=(logger)
     @logger = logger
   end
-
-end
-
-if defined?(RAILS_VERSION) && RAILS_VERSION < '3'
-  raise Dalli::DalliError, "Dalli #{Dalli::VERSION} does not support Rails version < 3.0"
 end

data/lib/rack/session/dalli.rb

@@ -1,37 +1,92 @@
+# frozen_string_literal: true
 require 'rack/session/abstract/id'
 require 'dalli'
+require 'connection_pool'
 
 module Rack
   module Session
-    class Dalli < Abstract::ID
-      attr_reader :pool, :mutex
+    class Dalli < Abstract::Persisted
+      attr_reader :pool
 
-      DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \
+      DEFAULT_DALLI_OPTIONS = {
         :namespace => 'rack:session',
         :memcache_server => 'localhost:11211'
+      }
 
+      # Brings in a new Rack::Session::Dalli middleware with the given
+      # `:memcache_server`. The server is either a hostname, or a
+      # host-with-port string in the form of "host_name:port", or an array of
+      # such strings. For example:
+      #
+      #   use Rack::Session::Dalli,
+      #     :memcache_server => "mc.example.com:1234"
+      #
+      # If no `:memcache_server` option is specified, Rack::Session::Dalli will
+      # connect to localhost, port 11211 (the default memcached port). If
+      # `:memcache_server` is set to nil, Dalli::Client will look for
+      # ENV['MEMCACHE_SERVERS'] and use that value if it is available, or fall
+      # back to the same default behavior described above.
+      #
+      # Rack::Session::Dalli is intended to be a drop-in replacement for
+      # Rack::Session::Memcache. It accepts additional options that control the
+      # behavior of Rack::Session, Dalli::Client, and an optional
+      # ConnectionPool. First and foremost, if you wish to instantiate your own
+      # Dalli::Client (or ConnectionPool) and use that instead of letting
+      # Rack::Session::Dalli instantiate it on your behalf, simply pass it in
+      # as the `:cache` option. Please note that you will be responsible for
+      # setting the namespace and any other options on Dalli::Client.
+      #
+      # Secondly, if you're not using the `:cache` option, Rack::Session::Dalli
+      # accepts the same options as Dalli::Client, so it's worth reviewing its
+      # documentation. Perhaps most importantly, if you don't specify a
+      # `:namespace` option, Rack::Session::Dalli will default to using
+      # "rack:session".
+      #
+      # Whether you are using the `:cache` option or not, it is not recommend
+      # to set `:expires_in`. Instead, use `:expire_after`, which will control
+      # both the expiration of the client cookie as well as the expiration of
+      # the corresponding entry in memcached.
+      #
+      # Rack::Session::Dalli also accepts a host of options that control how
+      # the sessions and session cookies are managed, including the
+      # aforementioned `:expire_after` option. Please see the documentation for
+      # Rack::Session::Abstract::Persisted for a detailed explanation of these
+      # options and their default values.
+      #
+      # Finally, if your web application is multithreaded, the
+      # Rack::Session::Dalli middleware can become a source of contention. You
+      # can use a connection pool of Dalli clients by passing in the
+      # `:pool_size` and/or `:pool_timeout` options. For example:
+      #
+      #   use Rack::Session::Dalli,
+      #     :memcache_server => "mc.example.com:1234",
+      #     :pool_size => 10
+      #
+      # You must include the `connection_pool` gem in your project if you wish
+      # to use pool support. Please see the documentation for ConnectionPool
+      # for more information about it and its default options (which would only
+      # be applicable if you supplied one of the two options, but not both).
+      #
       def initialize(app, options={})
+        # Parent uses DEFAULT_OPTIONS to build @default_options for Rack::Session
         super
-        @mutex = Mutex.new
-        mserv = @default_options[:memcache_server]
-        mopts = @default_options.reject{|k,v| !DEFAULT_OPTIONS.include? k }
-        @pool = options[:cache] || ::Dalli::Client.new(mserv, mopts)
-        @pool.alive!
-      end
 
-      def generate_sid
-        loop do
-          sid = super
-          break sid unless @pool.get(sid)
-        end
+        # Determine the default TTL for newly-created sessions
+        @default_ttl = ttl @default_options[:expire_after]
+
+        # Normalize and validate passed options
+        mserv, mopts, popts = extract_dalli_options(options)
+
+        @pool = ConnectionPool.new(popts || {}) { ::Dalli::Client.new(mserv, mopts) }
       end
 
       def get_session(env, sid)
-        with_lock(env, [nil, {}]) do
-          unless sid and !sid.empty? and session = @pool.get(sid)
-            sid, session = generate_sid, {}
-            unless @pool.add(sid, session)
-              raise "Session collision on '#{sid.inspect}'"
+        with_block([nil, {}]) do |dc|
+          unless sid and !sid.empty? and session = dc.get(sid)
+            old_sid, sid, session = sid, generate_sid_with(dc), {}
+            unless dc.add(sid, session, @default_ttl)
+              sid = old_sid
+              redo # generate a new sid and try again
             end
           end
           [sid, session]
@@ -40,25 +95,61 @@ module Rack
 
       def set_session(env, session_id, new_session, options)
         return false unless session_id
-        expiry = options[:expire_after]
-        expiry = expiry.nil? ? 0 : expiry + 1
 
-        with_lock(env, false) do
-          @pool.set session_id, new_session, expiry
+        with_block(false) do |dc|
+          dc.set(session_id, new_session, ttl(options[:expire_after]))
           session_id
         end
       end
 
       def destroy_session(env, session_id, options)
-        with_lock(env) do
-          @pool.delete(session_id)
-          generate_sid unless options[:drop]
+        with_block do |dc|
+          dc.delete(session_id)
+          generate_sid_with(dc) unless options[:drop]
         end
       end
 
-      def with_lock(env, default=nil)
-        @mutex.lock if env['rack.multithread']
-        yield
+      def find_session(req, sid)
+        get_session req.env, sid
+      end
+
+      def write_session(req, sid, session, options)
+        set_session req.env, sid, session, options
+      end
+
+      def delete_session(req, sid, options)
+        destroy_session req.env, sid, options
+      end
+
+      private
+
+      def extract_dalli_options(options)
+        raise "Rack::Session::Dalli no longer supports the :cache option." if options[:cache]
+
+        popts = {}
+        # Filter out Rack::Session-specific options and apply our defaults
+        mopts = DEFAULT_DALLI_OPTIONS.merge \
+          options.reject {|k, _| DEFAULT_OPTIONS.key? k }
+        mserv = mopts.delete :memcache_server
+
+        if mopts[:pool_size] || mopts[:pool_timeout]
+          popts[:size] = mopts.delete :pool_size if mopts[:pool_size]
+          popts[:timeout] = mopts.delete :pool_timeout if mopts[:pool_timeout]
+          mopts[:threadsafe] = true
+        end
+
+        [mserv, mopts, popts]
+      end
+
+      def generate_sid_with(dc)
+        while true
+          sid = generate_sid
+          break sid unless dc.get(sid)
+        end
+      end
+
+      def with_block(default=nil, &block)
+        @pool.with(&block)
       rescue ::Dalli::DalliError, Errno::ECONNREFUSED
         raise if $!.message =~ /undefined class/
         if $VERBOSE
@@ -66,10 +157,11 @@ module Rack
           warn $!.inspect
         end
         default
-      ensure
-        @mutex.unlock if @mutex.locked?
       end
 
+      def ttl(expire_after)
+        expire_after.nil? ? 0 : expire_after + 1
+      end
     end
   end
 end

metadata

@@ -1,74 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 3.0.1
 platform: ruby
 authors:
 - Peter M. Goldstein
 - Mike Perham
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,21 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  name: openssl-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,14 +65,13 @@ files:
 - History.md
 - LICENSE
 - README.md
-- lib/action_dispatch/middleware/session/dalli_store.rb
-- lib/active_support/cache/dalli_store.rb
 - lib/dalli.rb
 - lib/dalli/cas/client.rb
 - lib/dalli/client.rb
 - lib/dalli/compressor.rb
 - lib/dalli/options.rb
-- lib/dalli/railtie.rb
+- lib/dalli/protocol.rb
+- lib/dalli/protocol/binary.rb
 - lib/dalli/ring.rb
 - lib/dalli/server.rb
 - lib/dalli/socket.rb
@@ -152,9 +81,8 @@ homepage: https://github.com/petergoldstein/dalli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
+post_install_message:
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -168,9 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: High performance memcached client for Ruby
 test_files: []