mirror of
https://github.com/samsonjs/rack-attack.git
synced 2026-03-26 09:35:49 +00:00
9d90610bbe
In v4.4.0, checking `defined?(ActiveSupport::Cache::MemCacheStore)`
could trigger an error loading dalli, which isn’t needed.
This fixes that bug, and prevents similar bugs by checking
`store.class.to_s` rather than `defined?(klass) && store.is_a?(klass)`.
Writing an automated test to ensure that dalli is truly optional is
difficult, but I was able to recreate the dalli load error in v4.4.0 by
running:
gem uninstall dalli
ruby -Ilib -ractive_support/all -ractive_support/cache/redis_store
-rrack/attack -e 'p Rack::Attack::StoreProxy.build(Redis::Store.new)'
Fixes #163
32 lines
1.1 KiB
Ruby
32 lines
1.1 KiB
Ruby
module Rack
|
|
class Attack
|
|
module StoreProxy
|
|
PROXIES = [DalliProxy, MemCacheProxy, RedisStoreProxy]
|
|
|
|
ACTIVE_SUPPORT_WRAPPER_CLASSES = Set.new(['ActiveSupport::Cache::MemCacheStore', 'ActiveSupport::Cache::RedisStore']).freeze
|
|
ACTIVE_SUPPORT_CLIENTS = Set.new(['Redis::Store', 'Dalli::Client', 'MemCache']).freeze
|
|
|
|
def self.build(store)
|
|
client = unwrap_active_support_stores(store)
|
|
klass = PROXIES.find { |proxy| proxy.handle?(client) }
|
|
klass ? klass.new(client) : client
|
|
end
|
|
|
|
|
|
private
|
|
def self.unwrap_active_support_stores(store)
|
|
# ActiveSupport::Cache::RedisStore doesn't expose any way to set an expiry,
|
|
# so use the raw Redis::Store instead.
|
|
# We also want to use the underlying Dalli client instead of ::ActiveSupport::Cache::MemCacheStore,
|
|
# and the MemCache client if using Rails 3.x
|
|
|
|
client = store.instance_variable_get(:@data)
|
|
if ACTIVE_SUPPORT_WRAPPER_CLASSES.include?(store.class.to_s) && ACTIVE_SUPPORT_CLIENTS.include?(client.class.to_s)
|
|
client
|
|
else
|
|
store
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|