Changeset 8226

Timestamp:

11/28/07 00:29:43 (1 year ago)

Author:

david

Message:

Added protection from trailing slashes on page caching (closes #10229) [devrieda]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (1 diff)
• trunk/actionpack/test/controller/caching_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added protection from trailing slashes on page caching #10229 [devrieda]
-
-* Asset timestamps are appended, not prepended. Closes #10276 [mnaberez]

trunk/actionpack/lib/action_controller/caching.rb

@@ -107 +107 @@
-        private
-          def page_cache_file(path)
-(path.empty? || path == "/") ? "/index" : URI.unescape(path
+path.empty? || path == "/") ? "/index" : URI.unescape(path.chomp('/'
-            name << page_cache_extension unless (name.split('/').last || name).include? '.'
-            return name

trunk/actionpack/test/controller/caching_test.rb

@@ -36 +36 @@
-    head :ok
-  end
+  
+  def trailing_slash
+    render :text => "Sneak attack"
+  end
-end
-
@@ -91 +95 @@
-    get :expire_custom_path
-    assert !File.exist?("#{FILE_STORE_PATH}/index.html")
+  end
+  
+  def test_should_cache_without_trailing_slash_on_url
+    @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash'
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
+  end
+
+  def test_should_cache_with_trailing_slash_on_url
+    @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash/'
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
-  end
-