Merge pull request #547 from rails/schneems/fix-to-load-bug

Fix storing absolute path in cache (again)
rails · Mar 10, 2018 · efbfa49 · efbfa49
2 parents 0f34390 + 9914095
commit efbfa49
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/lib/sprockets/loader.rb b/lib/sprockets/loader.rb
@@ -81,6 +81,8 @@ def asset_from_cache(key)
           asset[:metadata][:links].map!             { |uri| expand_from_root(uri) } if asset[:metadata][:links]
           asset[:metadata][:stubbed].map!           { |uri| expand_from_root(uri) } if asset[:metadata][:stubbed]
           asset[:metadata][:required].map!          { |uri| expand_from_root(uri) } if asset[:metadata][:required]
+          asset[:metadata][:to_load].map!           { |uri| expand_from_root(uri) } if asset[:metadata][:to_load]
+          asset[:metadata][:to_link].map!           { |uri| expand_from_root(uri) } if asset[:metadata][:to_link]
           asset[:metadata][:dependencies].map!      { |uri| uri.start_with?("file-digest://") ? expand_from_root(uri) : uri } if asset[:metadata][:dependencies]
 
           asset[:metadata].each_key do |k|
@@ -140,7 +142,6 @@ def load_from_unloaded(unloaded)
 
         # Read into memory and process if theres a processor pipeline
         if processors.any?
-
           result = call_processors(processors, {
             environment: self,
             cache: self.cache,
@@ -224,6 +225,16 @@ def store_asset(asset, unloaded)
             cached_asset[:metadata][:required].map! { |uri| compress_from_root(uri) }
           end
 
+          if cached_asset[:metadata][:to_load] && !cached_asset[:metadata][:to_load].empty?
+            cached_asset[:metadata][:to_load] = cached_asset[:metadata][:to_load].dup
+            cached_asset[:metadata][:to_load].map! { |uri| compress_from_root(uri) }
+          end
+
+          if cached_asset[:metadata][:to_link] && !cached_asset[:metadata][:to_link].empty?
+            cached_asset[:metadata][:to_link] = cached_asset[:metadata][:to_link].dup
+            cached_asset[:metadata][:to_link].map! { |uri| compress_from_root(uri) }
+          end
+
           if cached_asset[:metadata][:dependencies] && !cached_asset[:metadata][:dependencies].empty?
             cached_asset[:metadata][:dependencies] = cached_asset[:metadata][:dependencies].dup
             cached_asset[:metadata][:dependencies].map! do |uri|

diff --git a/test/test_caching.rb b/test/test_caching.rb
@@ -429,6 +429,21 @@ def teardown
     end
   end
 
+  test "no absolute paths are stored in the cache by accident" do
+    environment = Sprockets::Environment.new(fixture_path('default')) do |env|
+      env.append_path(".")
+      env.cache = @cache
+    end
+    cache = environment.cache
+    def cache.set(key, value, local = false)
+      if value.to_s =~ /#{Dir.pwd}/
+        raise "Expected '#{value}' to not contain absolute path '#{Dir.pwd}' but did"
+      end
+    end
+
+    environment['schneems.js']
+  end
+
   test "no absolute paths are retuned from cache" do
     env1 = Sprockets::Environment.new(fixture_path('default')) do |env|
       env.append_path(".")