From 70d64169ae03eff911028be80b7f00bbb5784a67 Mon Sep 17 00:00:00 2001 From: Blake Stoddard Date: Mon, 22 Apr 2019 09:59:53 -0400 Subject: 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. --- actioncable/lib/action_cable/subscription_adapter/redis.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actioncable/lib') diff --git a/actioncable/lib/action_cable/subscription_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb index ad8fa52760..b4a9385c87 100644 --- a/actioncable/lib/action_cable/subscription_adapter/redis.rb +++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb @@ -5,6 +5,8 @@ require "thread" gem "redis", ">= 3", "< 5" require "redis" +require "active_support/core_ext/hash/except" + module ActionCable module SubscriptionAdapter class Redis < Base # :nodoc: @@ -14,7 +16,7 @@ module ActionCable # This is needed, for example, when using Makara proxies for distributed Redis. cattr_accessor :redis_connector, default: ->(config) do config[:id] ||= "ActionCable-PID-#{$$}" - ::Redis.new(config.slice(:url, :host, :port, :db, :password, :id)) + ::Redis.new(config.except(:adapter, :channel_prefix)) end def initialize(*) -- cgit v1.2.3