ActionCable: don't allowlist keys passed to the Redis initializer

Support all Redis features without needing to maintain a list of valid options that must stay in sync with the upstream client library.
This commit is contained in:
Blake Stoddard 2019-04-22 09:59:53 -04:00 committed by George Claghorn
parent 70e255b9f2
commit 70d64169ae
2 changed files with 5 additions and 3 deletions

View File

@ -5,6 +5,8 @@ require "thread"
gem "redis", ">= 3", "< 5" gem "redis", ">= 3", "< 5"
require "redis" require "redis"
require "active_support/core_ext/hash/except"
module ActionCable module ActionCable
module SubscriptionAdapter module SubscriptionAdapter
class Redis < Base # :nodoc: class Redis < Base # :nodoc:
@ -14,7 +16,7 @@ module ActionCable
# This is needed, for example, when using Makara proxies for distributed Redis. # This is needed, for example, when using Makara proxies for distributed Redis.
cattr_accessor :redis_connector, default: ->(config) do cattr_accessor :redis_connector, default: ->(config) do
config[:id] ||= "ActionCable-PID-#{$$}" config[:id] ||= "ActionCable-PID-#{$$}"
::Redis.new(config.slice(:url, :host, :port, :db, :password, :id)) ::Redis.new(config.except(:adapter, :channel_prefix))
end end
def initialize(*) def initialize(*)

View File

@ -34,11 +34,11 @@ class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest
end end
class RedisAdapterTest::Connector < ActionCable::TestCase class RedisAdapterTest::Connector < ActionCable::TestCase
test "slices url, host, port, db, password and id from config" do test "excludes adapter and channel prefix" do
config = { url: 1, host: 2, port: 3, db: 4, password: 5, id: "Some custom ID" } config = { url: 1, host: 2, port: 3, db: 4, password: 5, id: "Some custom ID" }
assert_called_with ::Redis, :new, [ config ] do assert_called_with ::Redis, :new, [ config ] do
connect config.merge(other: "unrelated", stuff: "here") connect config.merge(adapter: "redis", channel_prefix: "custom")
end end
end end