dalli 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f17667b9c623f9233be342d920de385bab797b44a4bc9f1e85c233f766404f
-  data.tar.gz: 527b9ff3dd4699ad5d307107668b31d3a739675825ad4d0b2cfb35ac09581a81
+  metadata.gz: 23a3890b1ca95b3668eea5b0f2f6eabfb3ad6062daebf5723e5b99c2c7a74854
+  data.tar.gz: 4f0c1775badbf133dab91d32a19f84ffafab7f1c0a6c9d7c195f968bed01c089
 SHA512:
-  metadata.gz: 9e54f454a1bca3b79f229a219b458533d2778c1521043c1ee7c2d203ae0d25e1449fc375b59754aaadac79de6ea484170ba52c10008da6abd40451821300a60c
-  data.tar.gz: 1dea61992e48d8786dbb3ef929e30c53d3544bafed895334cf4316ad0710791c4ebb0887fb4fa63b79358c0029be11b3495a2875a24956a296246fe9d5e4eaa0
+  metadata.gz: b1624d8d1024956e90ab86a5d5b7f56833d9d195b95d2e8f7ed92774775eebb5ae19baf798773e17ce8fdb7b8fa5abf728a5899d085ecd11335fe11daac52bdb
+  data.tar.gz: 76c4e96a6ac88ec7ce86d213d58bf4f709f6ebc52e747ffa05661343173c654696e6e2625090b14d31874f160f3778a750e9cd524cb4f8985ea86716f267793e

data/CHANGELOG.md

@@ -4,67 +4,46 @@ Dalli Changelog
 Unreleased
 ==========
 
-5.1.4
+5.2.0
 ==========
 
-Security:
-
-- Keep the caller's key when retrying a request (GHSA-m252-9cgf-vx2w)
-  - With a `namespace`, a request retried after a transient network error (a timeout, or a connection closed by memcached or a proxy) applied the namespace a second time, so a retried read could return a different key's value and a retried write could overwrite a different key
-  - Affects single-key operations since 5.0.3, single-server `get_multi` since 5.1.0, and `get_with_metadata` and `fetch_with_lock` since 4.1.0; fixed in 5.2.2, 5.1.4, 5.0.10 and 4.3.7. Clients without a namespace aren't affected
-- Complete the fix for per-request `raw: true` on reads (GHSA-wr87-m4jw-29x5)
-  - A read made with `raw: true` doesn't ask for flags, but a reply carrying them anyway (from a proxy or a hostile server) still had its value deserialized. Raw reads now ignore flags in the reply
-  - Affects 5.1.3 and earlier; fixed in 5.2.2, 5.1.4, 5.0.10, 4.3.7 and 3.2.13
-
-Bug fixes:
-
-- `get_with_metadata` and `fetch_with_lock` retried the final error raised when a server is marked down, so with `down_retry_delay: 0` they retried an unresponsive server forever. They now retry only retryable errors, like other operations
-- Fix a regression in 5.1.3: a `get_multi` that didn't finish within `socket_timeout` counted toward `socket_max_failures`, so two slow `get_multi` calls in a row marked a healthy server down. It now just closes the connection
-- Fix a regression in 5.1.3: over TLS, every request buffered in a `quiet` block was sent as its own TLS record and system call (2.5 times slower for a block of 2000 deletes). Each flush is one write again
-- Handle malformed replies from a broken or hostile server or proxy: a negative value size, a hit with no key, or a hit with no `s` flag could leave the connection out of step or raise a non-Dalli error
-- With `decompressed_max_bytes` in effect, data after the end of a compressed value's stream was returned as part of the value. It's now ignored, as without the limit
-- With a `digest_class` whose digests aren't short hex strings, shortening a long key could loop forever. It now raises `ArgumentError`
-
-Development:
-
-- Run the Tests, RuboCop and Profiles workflows on pushes to `main` and the `*-stable` branches only, so a pull request's branch isn't tested twice (backport of #1198)
-- Fix flaky failover tests: move their ports out of Linux's ephemeral port range, and wait for memcached to accept connections after starting it (backport of #1184)
-
-5.1.3
-==========
-
-Security:
-
-- Fix pipelined `get_multi` returning one key's value for another after an error reply (GHSA-p6pm-ch9v-44vx)
-  - The pipelined reply parser took any reply without a body for the end of the batch. An error reply for one key (`CLIENT_ERROR`, `SERVER_ERROR`, or `EN` from a proxy) ended it early, and the replies still on the connection were read as the replies to later commands, so a `get` could return another key's value
-  - Keys are now measured in bytes as sent, after base64 encoding when the key needs it. A key under 250 characters but over 250 bytes on the wire (for example, one with many non-ASCII characters) was the easiest way to cause that error reply. Such keys are now truncated like other long keys; keys that worked before are unchanged
-  - Affects the meta protocol since 3.2.0 (the default since 5.0.0); fixed in 5.2.1, 5.1.3, 5.0.9, 4.3.6 and 3.2.12
-- Reject routing tokens that add meta flags, and stop retrying an unresponsive server forever (GHSA-4qp6-2jcr-596v)
-  - `p_token` and `l_token` now reject whitespace and control characters, not just CR, LF and NUL. A space let a token add meta flags to the request it was sent with: changing an item's TTL on a read, creating stub items on a miss, turning a delete into a stale tombstone, or reading a different key
-  - Affects 5.1.0 and later; fixed in 5.2.1 and 5.1.3
-  - A server that accepted connections but never answered (or dropped the connection on a request) was retried forever, hanging the caller, because each successful reconnect reset the failure count. Requests now fail after `socket_max_failures` attempts and the server is marked down, as when it can't be reached at all; it gets a full set of attempts again after `down_retry_delay`
-  - Affects all versions; fixed in 5.2.1, 5.1.3, 5.0.9, 4.3.6 and 3.2.12
-- Limit decompressed and reply value sizes (GHSA-3553-vcg5-72jw)
-  - Values flagged as compressed were inflated without limit, so a small stored value could expand to gigabytes on read, whatever the client's `compress` or `serializer` settings. The new `decompressed_max_bytes` option (default 128 MiB; `nil` disables it) makes a read that would pass it raise `Dalli::UnmarshalError`. Custom compressors whose `decompress` takes only the data keep working, without the limit
-  - The value size in a reply was used to read or buffer that many bytes, so a malicious server could make the client allocate gigabytes. Sizes over 1 GiB, memcached's largest item, now raise `Dalli::DalliError` before reading
-  - Affects all versions; fixed in 5.2.1, 5.1.3, 5.0.9, 4.3.6 and 3.2.12
-- Honor per-request `raw: true` on reads, and add `Dalli::JSONSerializer` (GHSA-wr87-m4jw-29x5)
-  - `get_multi`, `get_multi_cas`, `get_multi_with_metadata`, `get_cas` and `get_with_metadata` ignored a per-request `raw: true` and deserialized the value according to its stored flags, so a caller who asked for raw bytes could still have `Marshal.load` run on data someone else wrote to memcached. They now return the stored bytes
-  - The `raw` part affects `get_with_metadata` since 4.2.0, and the other methods since they gained per-request options in 5.1.0
-  - `serializer: JSON` reads values with `JSON.load`, which on json gem versions before 3.0 creates an object of the class named in a stored `json_class` key when the json additions are loaded. The new `Dalli::JSONSerializer` reads with `JSON.parse` and only returns plain JSON types. The README and the Marshal security warning now recommend it; `serializer: JSON` itself is unchanged
-  - The `serializer: JSON` part affects any version used with the json gem before 3.0
-- Keep a forked child from writing to or closing the parent's connection (GHSA-w39f-xq2m-4g8x)
-  - A child forked while the parent had requests buffered but not yet sent, such as quiet writes inside a `quiet` block, sent them again when it closed the client or reconnected: quiet writes ran twice, and the parent's later replies could be read as the replies to other requests, returning one key's value for another. Dalli now buffers requests itself and a forked child discards them
-  - Affects 4.2.0 and later; fixed in 5.2.1, 5.1.3, 5.0.9 and 4.3.6
-  - With TLS, a forked child that closed the client (or reconnected after detecting the fork) sent a TLS close on the connection the parent was still using, ending the parent's session. A forked child now closes only its own copy of the socket
-  - Affects all versions with TLS; fixed in 5.2.1, 5.1.3, 5.0.9, 4.3.6 and 3.2.12
+Features:
 
-Bug fixes:
+- Add `Dalli::CacheResult`, returned by the new `#get_with_metadata_result` and `#get_multi_with_metadata_result` (#1156)
+  - An opt-in, typed view over the Hash that `#get_with_metadata` and `#get_multi_with_metadata` already return; those methods are unchanged, and changing their return type is left for a future major version (#1151)
+  - `value`, `cas`, `hit_before`, `last_access` and `ttl_remaining` readers (the last three are `nil` unless requested), plus `miss?`, `hit?`, `stale?`, `won_recache?` and `lost_recache?` predicates
+  - Results are frozen, and a Hash that claims to be both a miss and stale raises `ArgumentError`
+  - `#get_multi_with_metadata_result` omits misses and accepts `req_options:`, like `#get_multi_with_metadata`; it has no block form
+- Add the opt-in `defer_drain` client option (#1168)
+  - With `defer_drain: true`, a `quiet`/`multi` block no longer waits at its end for the replies to its requests. The requests are still sent right away; the replies are read with one noop per server just before the next non-quiet request to that server
+  - Adds `Client#drain_deferred_responses`, to drain at a boundary of the caller's choosing (the end of a web request or job)
+  - Tradeoff: an error reply to a quiet request surfaces (and is discarded) at that later point, not at the end of the block
+  - Off by default, so existing behavior is unchanged
+  - Replies memcached sends for quiet requests wait on the connection until they're drained, so a client that only makes quiet requests should call `drain_deferred_responses` periodically; see "Deferred Draining" in the README
+  - Thanks to Julian Richard Contreras and Matt Dick for this contribution
 
-- An exception raised by a `get_multi` block (such as `Timeout::Error`) was treated as a network failure: swallowed, with the whole `get_multi` retried and keys yielded twice. It now reaches the caller
+Performance:
 
-5.1.2
-==========
+- Skip the empty read at the end of each pipelined `read_available` call (#1164)
+  - A read shorter than the chunk size means the socket is drained, so the extra `read_nonblock` that only returned `:wait_readable` is gone; the `IO.select` loop still picks up anything that arrives later
+  - Saves one syscall per server per multi-server `get_multi`; on 4 servers a 3-key `get_multi` goes from 16% to 5% slower than 2.7.11 in the #930 benchmark
+  - TLS sockets also check `SSLSocket#pending`, since `IO.select` cannot see data OpenSSL has buffered
+  - Thanks to Julian Richard Contreras for this contribution
+- Reduce Ruby overhead on plain `set` and `delete` (#1166)
+  - A `set` with no CAS, routing tokens or quiet mode builds its `ms` request with one string interpolation (`RequestFormatter.plain_meta_set`), and a `delete` with no options uses `plain_meta_delete`; both produce the same bytes as before
+  - `HD c<cas>`, `HD` and `NF` replies are parsed without splitting them into tokens
+  - Allocations per `set` drop from 22 to 18, and per `delete` from 12 to 7
+  - Thanks to Julian Richard Contreras for this contribution
+- Only drain servers that were sent quiet requests when a `quiet`/`multi` block ends (#1167)
+  - Ending the block used to send a noop to every server in the ring and wait for each reply, one after another, so its cost grew with ring size even when the block touched one server (or none)
+  - Each connection now records when a quiet request is written, and the block's drain skips the others; servers that were never connected are no longer connected just to be drained
+  - With ~300us of network round trip, `multi { set }` on a 16-server ring goes from 4.9ms to 0.32ms; an empty block no longer touches the network
+  - Thanks to Julian Richard Contreras for this contribution
+- Reduce Ruby overhead in `get_multi` reply parsing and key routing (#1169)
+  - `VA` reply headers are read in place instead of being split into tokens, on both the multi-server (pipelined) and single-server paths; results are unchanged, and unusual headers still take the token path
+  - A key's server is found through a bucket table over the ring's continuum instead of a binary search, and the key's own server is tried before the failover loop; the server chosen for every key is unchanged
+  - Allocations for a 100-key `get_multi` on 4 servers drop from 1,500 to 1,104; over loopback it goes from 301us to 243us
+  - Thanks to Julian Richard Contreras for this contribution
 
 Bug fixes:
 
@@ -75,10 +54,6 @@ Bug fixes:
   - Affects the meta protocol since 3.2.0 (the default since 5.0.0)
   - Thanks to Julian Richard Contreras for this contribution
 
-Development:
-
-- Add property tests for request building and fuzz tests for the reply parsers
-
 5.1.1
 ==========
 

data/README.md

@@ -49,17 +49,39 @@ Dalli::Client.new('localhost:11211', namespace: 'myapp', namespace_separator: '/
 
 The separator must be a single non-alphanumeric character. Valid examples: `:`, `/`, `|`, `.`, `-`, `_`, `#`
 
-## Security Note
+### Deferred Draining
 
-By default, Dalli uses Ruby's Marshal for serialization. Deserializing untrusted data with Marshal can lead to remote code execution. If you cache user-controlled data, consider using a safer serializer:
+By default, a `quiet` (or `multi`) block ends by waiting for the replies memcached still sends for its quiet requests, one round trip for each server the block wrote to. With `defer_drain: true`, the block returns without waiting:
 
 ```ruby
-Dalli::Client.new('localhost:11211', serializer: Dalli::JSONSerializer)
+dc = Dalli::Client.new('localhost:11211', defer_drain: true)
+
+dc.quiet { dc.set('key', 'value') } # returns without a round trip
+dc.get('key')                       # first drains that connection with a noop, then gets the value
 ```
 
-`Dalli::JSONSerializer` reads values with `JSON.parse`, so it only ever returns plain hashes, arrays, strings, numbers, booleans and `nil`. Passing the `JSON` module itself (`serializer: JSON`) reads values with `JSON.load`, which can create objects of other classes from a stored `json_class` key and is not recommended for data an attacker might write.
+The requests are still sent right away. Their replies stay unread on the connection until the next non-quiet request to that server, which reads them first with one `noop`. Error replies to quiet requests are discarded either way. With `defer_drain` they're discarded at that later point instead of at the end of the block.
+
+**Replies accumulate until a non-quiet request drains them.** memcached still replies to some quiet requests: `NF` for a quiet `delete`, `incr` or `decr` of a missing key, `NS` for an `add` or `replace` that didn't store, and error replies. Those replies wait on the socket. A client that mixes quiet writes with reads (or other non-quiet requests) to the same servers drains them as it goes, and needs nothing more.
+
+A client that only ever makes quiet requests, such as a worker that only issues quiet deletes, never sends that next request. Its unread replies keep growing, and if they fill the connection's socket buffers, the connection can stall until a socket timeout closes it and Dalli reconnects. Workloads like that should call `drain_deferred_responses` periodically, for example after each batch or job:
+
+```ruby
+jobs.each do |job|
+  job.keys.each { |key| dc.quiet { dc.delete(key) } }
+  dc.drain_deferred_responses # reads and discards the replies waiting on each server
+end
+```
 
-Per-request `raw: true` returns the stored bytes without deserializing or decompressing them, on every read method (`get`, `get_multi`, `get_cas`, `get_with_metadata` and `fetch`).
+`drain_deferred_responses` only sends a `noop` to servers that were sent quiet requests since they were last drained, so calling it when nothing is pending costs nothing.
+
+## Security Note
+
+By default, Dalli uses Ruby's Marshal for serialization. Deserializing untrusted data with Marshal can lead to remote code execution. If you cache user-controlled data, consider using a safer serializer:
+
+```ruby
+Dalli::Client.new('localhost:11211', serializer: JSON)
+```
 
 See the [5.0-Upgrade.md](5.0-Upgrade.md) guide for upgrade information.
 

data/lib/dalli/cache_result.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Dalli
+  ##
+  # An immutable, typed view over the Hash returned by Client#get_with_metadata
+  # and Client#get_multi_with_metadata.
+  #
+  # This is an interim adapter (see #1130 / #1151): #get_with_metadata and
+  # #get_multi_with_metadata keep returning a Hash for now, since changing
+  # their return type is a breaking change reserved for a future major
+  # version. #get_with_metadata_result and #get_multi_with_metadata_result
+  # wrap that Hash in this type instead, so the structured shape can be
+  # validated by callers ahead of that change.
+  ##
+  class CacheResult
+    attr_reader :value, :cas, :hit_before, :last_access, :ttl_remaining
+
+    # @param hash [Hash] a Hash as returned by Client#get_with_metadata, or a
+    #   single value from the Hash returned by Client#get_multi_with_metadata
+    def initialize(hash)
+      @value = hash[:value]
+      @cas = hash[:cas]
+      @miss = hash.fetch(:miss, false)
+      @stale = hash.fetch(:stale, false)
+      @won_recache = hash.fetch(:won_recache, false)
+      @lost_recache = hash.fetch(:lost_recache, false)
+      @hit_before = hash[:hit_before]
+      @last_access = hash[:last_access]
+      @ttl_remaining = hash[:ttl_remaining]
+
+      raise ArgumentError, 'a result cannot be both a miss and stale' if @miss && @stale
+
+      freeze
+    end
+
+    # True when the key did not exist. Prefer this over a nil #value, which
+    # cannot distinguish a miss from a stored nil under cache_nils.
+    def miss?
+      @miss
+    end
+
+    # The inverse of #miss?.
+    def hit?
+      !@miss
+    end
+
+    # True when the item is a tombstone (marked stale via the meta protocol's
+    # invalidate flag) rather than removed. Not a miss: #value is still the
+    # last-known value unless the tombstone also dropped it.
+    def stale?
+      @stale
+    end
+
+    # True if this call won the right to regenerate the value under
+    # thundering-herd protection (see Client#fetch_with_lock).
+    def won_recache?
+      @won_recache
+    end
+
+    # True if another client already won the recache race for this key.
+    def lost_recache?
+      @lost_recache
+    end
+  end
+end

data/lib/dalli/client.rb

@@ -50,6 +50,14 @@ module Dalli
     #                        +:include+ logs the full operation and key(s), +:obfuscate+ replaces keys with "?",
     #                        +nil+ (default) omits the attribute entirely.
     # - :otel_peer_service - when set, adds a +peer.service+ span attribute with this value for logical service naming.
+    # - :defer_drain - defaults to false. When true, a quiet/multi block no longer waits at its end for the replies
+    #                  to its requests. The requests are still sent right away; their replies are read (with one noop
+    #                  per server) just before the next non-quiet request to that server, or by
+    #                  #drain_deferred_responses. The tradeoff: an error reply to a quiet request surfaces, and is
+    #                  discarded, at that later point rather than when the block ends. Replies memcached sends for
+    #                  quiet requests (NF, NS, errors) wait on the connection until then, so a client that only makes
+    #                  quiet requests should call #drain_deferred_responses periodically. See "Deferred Draining" in
+    #                  the README.
     #
     def initialize(servers = nil, options = {})
       @normalized_servers = ::Dalli::ServersArgNormalizer.normalize_servers(servers)
@@ -136,23 +144,35 @@ module Dalli
     #
     def get_with_metadata(key, options = {})
       validate_routing_tokens!(options)
-      # A retry re-runs this method with its original arguments, so `key` must
-      # stay as the caller gave it; reassigning it would add the namespace again.
-      validated_key = @key_manager.validate_key(key.to_s)
+      key = key.to_s
+      key = @key_manager.validate_key(key)
 
-      server = ring.server_for_key(validated_key)
-      Instrumentation.trace('get_with_metadata', trace_attrs('get_with_metadata', validated_key, server)) do
-        server.request(:meta_get, validated_key, options)
+      server = ring.server_for_key(key)
+      Instrumentation.trace('get_with_metadata', trace_attrs('get_with_metadata', key, server)) do
+        server.request(:meta_get, key, options)
       end
-    # Only a retryable error is retried. The NetworkError raised when a server
-    # is marked down is final, as in #perform; retrying it looped forever once
-    # down_retry_delay let the same server be tried again.
-    rescue RetryableNetworkError => e
+    rescue NetworkError => e
       Dalli.logger.debug { e.inspect }
       Dalli.logger.debug { 'retrying get_with_metadata with new server' }
       retry
     end
 
+    ##
+    # Like #get_with_metadata, but wraps the result in a Dalli::CacheResult
+    # instead of returning a Hash.
+    #
+    # Interim adapter (see #1130 / #1151): #get_with_metadata itself keeps
+    # returning a Hash, since changing that return type is a breaking change
+    # reserved for a future major version. This lets callers opt in to the
+    # structured shape today.
+    #
+    # @param key [String] the cache key
+    # @param options [Hash] see #get_with_metadata
+    # @return [Dalli::CacheResult]
+    def get_with_metadata_result(key, options = {})
+      CacheResult.new(get_with_metadata(key, options))
+    end
+
     ##
     # Fetch multiple keys efficiently.
     # If a block is given, yields key/value pairs one at a time.
@@ -232,6 +252,27 @@ module Dalli
       results
     end
 
+    ##
+    # Like #get_multi_with_metadata, but wraps each entry's Hash in a
+    # Dalli::CacheResult instead. Missing keys are still omitted; no block
+    # form.
+    #
+    # Interim adapter (see #1130 / #1151): #get_multi_with_metadata itself
+    # keeps returning a Hash of Hashes, since changing that return type is a
+    # breaking change reserved for a future major version. This lets callers
+    # opt in to the structured shape today.
+    #
+    # Result key order follows #get_multi_with_metadata's own: request order
+    # only when every key lands on the same server, per-server response order
+    # otherwise.
+    #
+    # @param keys [Array<String>] the keys to fetch
+    # @param req_options [Hash, nil] see #get_multi_with_metadata
+    # @return [Hash] key => Dalli::CacheResult
+    def get_multi_with_metadata_result(*keys, req_options: nil)
+      get_multi_with_metadata(*keys, req_options: req_options).transform_values { |hash| CacheResult.new(hash) }
+    end
+
     ##
     # Fetch multiple keys efficiently, including available metadata such as CAS.
     # If a block is given, yields key/data pairs one a time.  Data is an array:
@@ -306,17 +347,14 @@ module Dalli
       validate_integer!(:lock_ttl, lock_ttl)
       validate_integer!(:recache_threshold, recache_threshold)
       validate_routing_tokens!(req_options)
-      # Left unchanged for the retry below; see get_with_metadata
-      validated_key = @key_manager.validate_key(key.to_s)
+      key = key.to_s
+      key = @key_manager.validate_key(key)
 
-      server = ring.server_for_key(validated_key)
-      Instrumentation.trace('fetch_with_lock', trace_attrs('fetch_with_lock', validated_key, server)) do
-        fetch_with_lock_request(validated_key, ttl, lock_ttl, recache_threshold, req_options, &block)
+      server = ring.server_for_key(key)
+      Instrumentation.trace('fetch_with_lock', trace_attrs('fetch_with_lock', key, server)) do
+        fetch_with_lock_request(key, ttl, lock_ttl, recache_threshold, req_options, &block)
       end
-    # Only a retryable error is retried. The NetworkError raised when a server
-    # is marked down is final, as in #perform; retrying it looped forever once
-    # down_retry_delay let the same server be tried again.
-    rescue RetryableNetworkError => e
+    rescue NetworkError => e
       Dalli.logger.debug { e.inspect }
       Dalli.logger.debug { 'retrying fetch_with_lock with new server' }
       retry
@@ -362,7 +400,8 @@ module Dalli
     # arithmetic (incr, decr), flush and delete operations.  Use of
     # unsupported operations inside a block will raise an error.
     #
-    # Any error replies will be discarded at the end of the block, and
+    # Any error replies will be discarded at the end of the block (or, with
+    # the defer_drain option, before the next non-quiet request), and
     # Dalli client methods invoked inside the block will not
     # have return values
     def quiet
@@ -370,11 +409,25 @@ module Dalli
       Thread.current[::Dalli::QUIET] = true
       yield
     ensure
-      @ring&.pipeline_consume_and_ignore_responses
+      @ring&.pipeline_consume_and_ignore_responses unless @options[:defer_drain]
       Thread.current[::Dalli::QUIET] = old
     end
     alias multi quiet
 
+    ##
+    # Reads and discards the replies still pending from quiet requests, on the
+    # servers that have any. Only needed with the defer_drain option.
+    #
+    # Normally the next non-quiet request to a server drains its pending
+    # replies first. A client that only makes quiet requests (for example, a
+    # worker that only issues quiet deletes) never does, so its replies keep
+    # accumulating on the socket; call this periodically, such as after each
+    # batch or job. It sends nothing to servers with no quiet requests pending.
+    def drain_deferred_responses
+      @ring&.pipeline_consume_and_ignore_responses
+      nil
+    end
+
     def set(key, value, ttl = nil, req_options = nil)
       set_cas(key, value, 0, ttl, req_options)
     end
@@ -734,11 +787,10 @@ module Dalli
     # to route to at all is still silent, matching Ring#keys_grouped_by_server
     # dropping a key it can't route on both the single- and multi-server paths.
     def single_server_get_multi(keys, req_options = nil)
-      # A new array, so the retry below starts again from the caller's keys
-      validated_keys = keys.map { |k| @key_manager.validate_key(k.to_s) }
+      keys.map! { |k| @key_manager.validate_key(k.to_s) }
       return {} unless (server = single_server)
 
-      result = server.request(:read_multi_req, validated_keys, req_options)
+      result = server.request(:read_multi_req, keys, req_options)
       result.transform_keys! { |k| @key_manager.key_without_namespace(k) }
       result
     rescue Dalli::RetryableNetworkError => e
@@ -829,7 +881,7 @@ module Dalli
     # check means unwinding through Protocol::Base#request, which logs the
     # failure as unexpected and closes the connection -- a caller passing a
     # bad token should get a clean ArgumentError and keep its connection.
-    ROUTING_TOKEN_FORBIDDEN = /[\x00-\x20\x7F]/
+    ROUTING_TOKEN_FORBIDDEN = /[\r\n\0]/
     private_constant :ROUTING_TOKEN_FORBIDDEN
 
     def validate_routing_tokens!(req_options)
@@ -845,9 +897,7 @@ module Dalli
       # here (it would also excuse [] / {} from the type check below).
       return if value.nil? || (value.is_a?(String) && value.empty?)
       raise ArgumentError, "#{name} must be a String, got #{value.class}" unless value.is_a?(String)
-      return unless value.match?(ROUTING_TOKEN_FORBIDDEN)
-
-      raise ArgumentError, "#{name} must not contain whitespace or control characters"
+      raise ArgumentError, "#{name} must not contain CRLF or null bytes" if value.match?(ROUTING_TOKEN_FORBIDDEN)
     end
 
     def cas_core(key, always_set, ttl = nil, req_options = nil)
@@ -905,20 +955,18 @@ module Dalli
       # rubocop:enable Naming/MethodParameterName
       return yield if block_given?
 
-      # `retry` below re-runs this method with its original arguments, so `key`
-      # must stay as the caller gave it: reassigning it would apply the
-      # namespace a second time and send the retry to a different key.
-      validated_key = @key_manager.validate_key(key.to_s)
+      key = key.to_s
+      key = @key_manager.validate_key(key)
 
-      server = ring.server_for_key(validated_key)
+      server = ring.server_for_key(key)
 
       if Instrumentation.enabled?
         op_name = op.name
-        Instrumentation.trace(op_name, trace_attrs(op_name, validated_key, server)) do
-          server.request(op, validated_key, ...)
+        Instrumentation.trace(op_name, trace_attrs(op_name, key, server)) do
+          server.request(op, key, ...)
         end
       else
-        server.request(op, validated_key, ...)
+        server.request(op, key, ...)
       end
     rescue RetryableNetworkError => e
       Dalli.logger.debug { e.inspect }

data/lib/dalli/compressor.rb

@@ -13,54 +13,8 @@ module Dalli
       Zlib::Deflate.deflate(data)
     end
 
-    # DEFLATE can't expand data by more than about 1032:1
-    MAX_EXPANSION = 1032
-    # Compressed input is fed to zlib this many bytes at a time. MRI's zlib
-    # yields the output in small chunks; one that returns it instead still
-    # produces at most MAX_EXPANSION times this per step.
-    INFLATE_SLICE_BYTES = 64 * 1024
-
-    # max_bytes caps the decompressed size; inflating stops and raises as soon
-    # as the output passes it, so a small compressed value can't expand into
-    # gigabytes of memory.
-    def self.decompress(data, max_bytes: nil)
-      return Zlib::Inflate.inflate(data) unless may_exceed?(data, max_bytes)
-
-      inflate_within_limit(Zlib::Inflate.new, data, max_bytes)
-    end
-
-    # False when even the largest possible expansion stays within max_bytes,
-    # so the value can be inflated in one step
-    def self.may_exceed?(data, max_bytes)
-      max_bytes ? data.bytesize * MAX_EXPANSION > max_bytes : false
-    end
-
-    def self.inflate_within_limit(inflater, data, max_bytes)
-      out = String.new(encoding: Encoding::BINARY)
-      0.step(data.bytesize - 1, INFLATE_SLICE_BYTES) do |pos|
-        inflate_slice(inflater, data.byteslice(pos, INFLATE_SLICE_BYTES), out, max_bytes)
-        # Anything after the end of the stream isn't part of the value, as
-        # with Zlib::Inflate.inflate; finish would return it as output
-        break if inflater.finished?
-      end
-      return out if inflater.finished?
-
-      append_within_limit(out, inflater.finish, max_bytes)
-    ensure
-      inflater.close
-    end
-
-    # Both yielded and returned output count toward the limit
-    def self.inflate_slice(inflater, slice, out, max_bytes)
-      rest = inflater.inflate(slice) { |chunk| append_within_limit(out, chunk, max_bytes) }
-      append_within_limit(out, rest, max_bytes)
-    end
-
-    def self.append_within_limit(out, chunk, max_bytes)
-      out << chunk if chunk
-      return out if out.bytesize <= max_bytes
-
-      raise Dalli::UnmarshalError, "Decompressed value exceeds #{max_bytes} bytes (decompressed_max_bytes)"
+    def self.decompress(data)
+      Zlib::Inflate.inflate(data)
     end
   end
 
@@ -78,11 +32,9 @@ module Dalli
       io.string
     end
 
-    def self.decompress(data, max_bytes: nil)
-      return Zlib::GzipReader.new(StringIO.new(data, 'rb')).read unless Compressor.may_exceed?(data, max_bytes)
-
-      # MAX_WBITS + 16 makes zlib read the gzip format (and check its CRC)
-      Compressor.inflate_within_limit(Zlib::Inflate.new(Zlib::MAX_WBITS + 16), data, max_bytes)
+    def self.decompress(data)
+      io = StringIO.new(data, 'rb')
+      Zlib::GzipReader.new(io).read
     end
   end
 end

data/lib/dalli/key_manager.rb

@@ -58,7 +58,7 @@ module Dalli
       raise ArgumentError, 'key cannot be blank' unless key&.length&.positive?
 
       key = key_with_namespace(key)
-      wire_length(key) > MAX_KEY_LENGTH ? truncated_key(key) : key
+      key.length > MAX_KEY_LENGTH ? truncated_key(key) : key
     end
 
     ##
@@ -122,28 +122,7 @@ module Dalli
     ##
     def truncated_key(key)
       digest = digest_class.hexdigest(key)
-      prefix = key[0, [prefix_length(digest), 0].max]
-      truncated = "#{prefix}#{TRUNCATED_KEY_SEPARATOR}#{digest}"
-      # A prefix with whitespace or non-ASCII characters sends the whole key
-      # base64-encoded, which can still be too long on the wire; shorten it.
-      while wire_length(truncated) > MAX_KEY_LENGTH && !prefix.empty?
-        prefix = prefix[0...-1]
-        truncated = "#{prefix}#{TRUNCATED_KEY_SEPARATOR}#{digest}"
-      end
-      return truncated if wire_length(truncated) <= MAX_KEY_LENGTH
-
-      # Only possible with a digest_class whose digests aren't short hex strings
-      raise ArgumentError, "#{digest_class} digests are too long to fit in a truncated key"
-    end
-
-    # memcached's key limit applies to the key as sent: in bytes, and after
-    # base64 encoding when the key needs it. A key can be within the limit in
-    # characters and still be rejected, and memcached's CLIENT_ERROR for it
-    # must never reach a pipelined get.
-    def wire_length(key)
-      return key.bytesize unless Dalli::Protocol::Meta::KeyRegularizer.required?(key)
-
-      ((key.bytesize + 2) / 3) * 4
+      "#{key[0, prefix_length(digest)]}#{TRUNCATED_KEY_SEPARATOR}#{digest}"
     end
 
     def prefix_length(digest)