@@ -1 +1,2 @@ +require 'digest/sha1' File.expand_path(File.dirname(__FILE__) + "/lib/memcached_protected") \ No newline at end of file init.rb @@ -1,37 +1,19 @@ class MemcachedProtected::ProtectedAccess - MAX_KEY_SIZE = 247 - class << self def read(key) - if valid_key?(key) - Rails.original_cache.read(key) - else - write_error key - nil - end + Rails.original_cache.read(generate_key(key)) end def write(key, content) - if valid_key?(key) - Rails.original_cache.write(key, content) - else - write_error key - end + Rails.original_cache.write(generate_key(key), content) end private - def write_error(key) - Rails.logger.error "-" * 80 - Rails.logger.error "Memcache key is too long." - Rails.logger.error "key size: #{key.size}" - Rails.logger.error "key: #{key}" - end - - def valid_key?(key) - key.kind_of?(String) && key.size <= MAX_KEY_SIZE + def generate_key(key) + Digest::SHA1.hexdigest(key) end end lib/memcached_protected/protected_access.rb @@ -4,57 +4,19 @@ describe MemcachedProtected::ProtectedAccess do describe ".read" do - it "should log and return nil if key > 250" do - Rails.original_cache.should_receive(:read).never - Rails.logger.should_receive(:error).with("-" * 80) - Rails.logger.should_receive(:error).with("Memcache key is too long.") - Rails.logger.should_receive(:error).with("key size: 251") - Rails.logger.should_receive(:error).with("key: #{"*"*251}") - MemcachedProtected::ProtectedAccess.read("*"*251).should be_nil - end - - def verify_valid_key(key) - Rails.original_cache.should_receive(:read).with(key).and_return("fetched from cache") - Rails.logger.should_receive(:error).never - MemcachedProtected::ProtectedAccess.read(key).should == "fetched from cache" - end - - it "should delegate to Rails.cache.read if key = 250" do - verify_valid_key "*"*250 - end - - it "should delegate to Rails.cache.read if key < 250" do - verify_valid_key "*"*249 + it "should generate a protected key" do + Rails.original_cache.should_receive(:read).with("58efdc201e7a8f6f621d47146beaa3d6186339b2") + MemcachedProtected::ProtectedAccess.read("very big key"*251).should be_nil end end describe ".write" do - it "should log when key > 250" do - Rails.original_cache.should_receive(:write).never - Rails.logger.should_receive(:error).with("-" * 80) - Rails.logger.should_receive(:error).with("Memcache key is too long.") - Rails.logger.should_receive(:error).with("key size: 251") - Rails.logger.should_receive(:error).with("key: #{"*"*251}") - MemcachedProtected::ProtectedAccess.write("*"*251, "content") - end - - def write_valid_key(key) - Rails.original_cache.should_receive(:write).with(key, "content") - Rails.logger.should_receive(:error).never - MemcachedProtected::ProtectedAccess.write(key, "content") - end - - - it "should delegate to Rails.cache.write if key = 250" do - write_valid_key "*"*249 - end - - it "should delegate to Rails.cache.write if key = 250" do - write_valid_key "*"*249 + it "should generate a protected key" do + Rails.original_cache.should_receive(:write).with("58efdc201e7a8f6f621d47146beaa3d6186339b2", "content") + MemcachedProtected::ProtectedAccess.write("very big key"*251, "content").should be_nil end - end spec/memcached_protected/protected_access_spec.rb bae97de589257b0d6730b6e532f290cbb5379753 Tapajós tapajos@gmail.com http://github.com/tapajos/memcached_protected/commit/6417603c545ababf4d8f475de633fd3653fb1f83 6417603c545ababf4d8f475de633fd3653fb1f83 2009-07-26T19:46:44-07:00 2009-07-19T17:49:39-07:00 Changing to use Digest 5508a213b1ea054d92ae3a11bdbe4c4ce46bb0bc Tapajós tapajos@gmail.com