dalli 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1d0533f940077d18e6689253325c1dd04ddcfe56963265c661b42d8bf8699f7
-  data.tar.gz: a50064a0845c9ed86acf2a68b3a7c37fff35ab687724fa263333dda098a9430a
+  metadata.gz: adcf2507fd177cbc44167154462aae102a6f34f9cd6a85ba29ea9a26e87efce6
+  data.tar.gz: 57bd7da6c8c90fbcd99c4738bdb061df3630df0ff17ead1cc510d5d58f8677e2
 SHA512:
-  metadata.gz: c35e6c854ac914779a1cd874fb262047b3e1b442e383c234120487160d19c43aad1539106ee1f3e1503ee29fc9135460416f237c5ab9affe99a950bc0b612166
-  data.tar.gz: 348afdb59b0fe32ba729785c9fc5435abd6d89a3cdef49d124c4f10ac85f066e90180afdd2e91f4b140e0a175e42ff688e9081b73e2b2f6a3925ca8c27f190c6
+  metadata.gz: cec1cceffc54713b77746ec455ddd3817b0dad37ceacb33d20f5f82a51015c7d82788ad78d043f4859d26a6c236bb57d8aac053770ea464827c5c22f07057d98
+  data.tar.gz: 70e93ae5cca84bc211315359391bad55b2f31908604ee195f42e701b472ab469074f3ee9350618491cfbf9d34b53f4e41950998e8e34cd446d8c4aca63d4b0d4

data/History.md

@@ -1,6 +1,11 @@
 Dalli Changelog
 =====================
 
+3.0.6
+==========
+
+- Fix regression in SASL authentication response parsing (petergoldstein)
+
 3.0.5
 ==========
 

data/lib/dalli/protocol/binary/response_processor.rb

@@ -132,15 +132,15 @@ module Dalli
         end
 
         def validate_auth_format(extra_len, count)
-          return if extra_len.zero? && count.positive?
+          return if extra_len.zero?
 
           raise Dalli::NetworkError, "Unexpected message format: #{extra_len} #{count}"
         end
 
         def auth_response
-          (extra_len, _type, status, count) = read_header.unpack(RESP_HEADER)
-          validate_auth_format(extra_len, count)
-          content = read(count)
+          (_, extra_len, _, status, body_len,) = read_header.unpack(RESP_HEADER)
+          validate_auth_format(extra_len, body_len)
+          content = read(body_len) if body_len.positive?
           [status, content]
         end
       end

data/lib/dalli/protocol/binary/sasl_authentication.rb

@@ -11,9 +11,12 @@ module Dalli
           write(RequestFormatter.standard_request(opkey: :auth_negotiation))
 
           status, content = @response_processor.auth_response
-          # TODO: Determine if this substitution is needed
-          content.tr("\u0000", ' ')
-          mechanisms = content.split
+          return [status, []] if content.nil?
+
+          # Substitute spaces for the \x00 returned by
+          # memcached as a separator for easier
+          content&.tr("\u0000", ' ')
+          mechanisms = content&.split
           [status, mechanisms]
         end
 
@@ -45,7 +48,7 @@ module Dalli
 
           return Dalli.logger.info("Dalli/SASL: #{content}") if status.zero?
 
-          raise Dalli::DalliError, "Error authenticating: #{status}" unless status == 0x21
+          raise Dalli::DalliError, "Error authenticating: 0x#{status.to_s(16)}" unless status == 0x21
 
           raise NotImplementedError, 'No two-step authentication mechanisms supported'
           # (step, msg) = sasl.receive('challenge', content)

data/lib/dalli/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dalli
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
 
   MIN_SUPPORTED_MEMCACHED_VERSION = '1.4'
 end

data/lib/dalli.rb

@@ -49,19 +49,19 @@ module Dalli
   end
 end
 
-require 'dalli/version'
+require_relative 'dalli/version'
 
-require 'dalli/compressor'
-require 'dalli/client'
-require 'dalli/key_manager'
-require 'dalli/ring'
-require 'dalli/protocol'
-require 'dalli/protocol/binary'
-require 'dalli/protocol/server_config_parser'
-require 'dalli/protocol/ttl_sanitizer'
-require 'dalli/protocol/value_compressor'
-require 'dalli/protocol/value_marshaller'
-require 'dalli/protocol/value_serializer'
-require 'dalli/servers_arg_normalizer'
-require 'dalli/socket'
-require 'dalli/options'
+require_relative 'dalli/compressor'
+require_relative 'dalli/client'
+require_relative 'dalli/key_manager'
+require_relative 'dalli/ring'
+require_relative 'dalli/protocol'
+require_relative 'dalli/protocol/binary'
+require_relative 'dalli/protocol/server_config_parser'
+require_relative 'dalli/protocol/ttl_sanitizer'
+require_relative 'dalli/protocol/value_compressor'
+require_relative 'dalli/protocol/value_marshaller'
+require_relative 'dalli/protocol/value_serializer'
+require_relative 'dalli/servers_arg_normalizer'
+require_relative 'dalli/socket'
+require_relative 'dalli/options'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dalli
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Peter M. Goldstein