Merge pull request #30802 from khall/30662_long_variant_filenames

Break long variant filenames into path chunks

2 files changed, 6 insertions, 1 deletions

diff --git a/activestorage/app/models/active_storage/variant.rb b/activestorage/app/models/active_storage/variant.rb
index 54685b4c0e..90a3605331 100644
--- a/activestorage/app/models/active_storage/variant.rb
+++ b/activestorage/app/models/active_storage/variant.rb
@@ -50,7 +50,7 @@ class ActiveStorage::Variant
 
   # Returns a combination key of the blob and the variation that together identifies a specific variant.
   def key
-    "variants/#{blob.key}/#{variation.key}"
+    "variants/#{blob.key}/#{Digest::SHA256.hexdigest(variation.key)}"
   end
 
   # Returns the URL of the variant on the service. This URL is intended to be short-lived for security and not used directly
diff --git a/activestorage/test/models/variant_test.rb b/activestorage/test/models/variant_test.rb
index d7cbef4e55..b7d20ab55a 100644
--- a/activestorage/test/models/variant_test.rb
+++ b/activestorage/test/models/variant_test.rb
@@ -26,4 +26,9 @@ class ActiveStorage::VariantTest < ActiveSupport::TestCase
     assert_equal 67, image.height
     assert_match(/Gray/, image.colorspace)
   end
+
+  test "service_url doesn't grow in length despite long variant options" do
+    variant = @blob.variant(font: "a" * 10_000).processed
+    assert_operator variant.service_url.length, :<, 500
+  end
 end