Merge pull request #39143 from JackMc/add-separator-cachingkeygenerator

Add a separator to the cache key for ActiveSupport::CachingKeyGenerator

activesupport/lib/active_support/key_generator.rb

@@ -35,7 +35,7 @@ def initialize(key_generator)
 
     # Returns a derived key suitable for use.
     def generate_key(*args)
-      @cache_keys[args.join] ||= @key_generator.generate_key(*args)
+      @cache_keys[args.join('|')] ||= @key_generator.generate_key(*args)
     end
   end
 end

activesupport/test/key_generator_test.rb

@@ -71,6 +71,13 @@ def setup
 
       assert_not_equal derived_key, different_length_key
     end
+
+    test "Does not cache key for different salts and lengths that are different but are equal when concatenated" do
+      derived_key = @caching_generator.generate_key("13", 37)
+      different_length_key = @caching_generator.generate_key("1", 337)
+
+      assert_not_equal derived_key, different_length_key
+    end
   end
 
 end