Permalink
Browse files

Fixed issue in file store where it could create a filename that was t…

…oo long for the file system. (#3072)
  • Loading branch information...
1 parent 51bef9d commit 8d63678d1406c5518d437709af0fde717c0248d7 @phuibonhoa phuibonhoa committed Sep 22, 2011
Showing with 17 additions and 9 deletions.
  1. +8 −9 activesupport/lib/active_support/cache/file_store.rb
  2. +9 −0 activesupport/test/caching_test.rb
View
17 activesupport/lib/active_support/cache/file_store.rb
@@ -13,6 +13,7 @@ class FileStore < Store
attr_reader :cache_path
DIR_FORMATTER = "%03X"
+ FILENAME_MAX_SIZE = 230 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
def initialize(cache_path, options = nil)
super(options)
@@ -129,15 +130,13 @@ def key_file_path(key)
hash, dir_1 = hash.divmod(0x1000)
dir_2 = hash.modulo(0x1000)
fname_paths = []
- # Make sure file name is < 255 characters so it doesn't exceed file system limits.
- if fname.size <= 255
- fname_paths << fname
- else
- while fname.size <= 255
- fname_path << fname[0, 255]
- fname = fname[255, -1]
- end
- end
+
+ # Make sure file name doesn't exceed file system limits.
+ begin
+ fname_paths << fname[0...FILENAME_MAX_SIZE]
+ fname = fname[FILENAME_MAX_SIZE..-1]
+ end until fname.blank?
+
File.join(cache_path, DIR_FORMATTER % dir_1, DIR_FORMATTER % dir_2, *fname_paths)
end
View
9 activesupport/test/caching_test.rb
@@ -557,6 +557,15 @@ def test_key_transformation_with_pathname
key = @cache_with_pathname.send(:key_file_path, "views/index?id=1")
assert_equal "views/index?id=1", @cache_with_pathname.send(:file_path_key, key)
end
+
+ # Because file systems have a maximum filename size, filenames > max size should be split in to directories
+ # If filename is 'AAAAB', where max size is 4, the returned path should be AAAA/B
+ def test_key_transformation_max_filename_size
+ key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}B"
+ path = @cache.send(:key_file_path, key)
+ assert path.split('/').all? { |dir_name| dir_name.size <= ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}
+ assert_equal 'B', File.basename(path)
+ end
end
class MemoryStoreTest < ActiveSupport::TestCase

0 comments on commit 8d63678

Please sign in to comment.