From 621d2199599e9a3154ce6f6e81385bf574030f15 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 13 Feb 2012 17:54:58 +0900
Subject: add AS::SafeBuffer#clone_empty

---
 activesupport/test/safe_buffer_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activesupport/test')

diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index db9159b289..20731218cf 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -116,4 +116,13 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert_not_nil dirty
     assert !dirty
   end
+
+  test "clone_empty returns an empty buffer" do
+    assert_equal '', ActiveSupport::SafeBuffer.new('foo').clone_empty
+  end
+
+  test "clone_empty keeps the original dirtyness" do
+    assert @buffer.clone_empty.html_safe?
+    assert !@buffer.gsub!('', '').clone_empty.html_safe?
+  end
 end
-- 
cgit v1.2.3


From dfa33fa3da2e8495f5647c553704297cdc857917 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 13 Feb 2012 17:58:01 +0900
Subject: delete vulnerable AS::SafeBuffer#[]

---
 activesupport/test/safe_buffer_test.rb | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'activesupport/test')

diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 20731218cf..e731f1c2e7 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -111,12 +111,6 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert_kind_of NilClass, @buffer.slice("chipchop")
   end
 
-  test "Should initialize @dirty to false for new instance when sliced" do
-    dirty = @buffer[0,0].send(:dirty?)
-    assert_not_nil dirty
-    assert !dirty
-  end
-
   test "clone_empty returns an empty buffer" do
     assert_equal '', ActiveSupport::SafeBuffer.new('foo').clone_empty
   end
-- 
cgit v1.2.3


From 55ac1b9d889ddfdeaa3d6eb9389d3cc7695b8e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 29 Feb 2012 22:30:51 +0100
Subject: Ensure [] respects the status of the buffer.

---
 activesupport/test/safe_buffer_test.rb | 36 +++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'activesupport/test')

diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index e731f1c2e7..25c95f2a2f 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -89,25 +89,32 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert_equal "hello&lt;&gt;", clean + @buffer
   end
 
-  test "Should concat as a normal string when dirty" do
+  test "Should concat as a normal string when safe" do
     clean = "hello".html_safe
     @buffer.gsub!('', '<>')
     assert_equal "<>hello", @buffer + clean
   end
 
-  test "Should preserve dirty? status on copy" do
+  test "Should preserve html_safe? status on copy" do
     @buffer.gsub!('', '<>')
     assert !@buffer.dup.html_safe?
   end
 
-  test "Should raise an error when safe_concat is called on dirty buffers" do
+  test "Should return safe buffer when added with another safe buffer" do
+    clean = "<script>".html_safe
+    result_buffer = @buffer + clean
+    assert result_buffer.html_safe?
+    assert_equal "<script>", result_buffer
+  end
+
+  test "Should raise an error when safe_concat is called on unsafe buffers" do
     @buffer.gsub!('', '<>')
     assert_raise ActiveSupport::SafeBuffer::SafeConcatError do
       @buffer.safe_concat "BUSTED"
     end
   end
-  
-  test "should not fail if the returned object is not a string" do
+
+  test "Should not fail if the returned object is not a string" do
     assert_kind_of NilClass, @buffer.slice("chipchop")
   end
 
@@ -119,4 +126,23 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert @buffer.clone_empty.html_safe?
     assert !@buffer.gsub!('', '').clone_empty.html_safe?
   end
+
+  test "Should be safe when sliced if original value was safe" do
+    new_buffer = @buffer[0,0]
+    assert_not_nil new_buffer
+    assert new_buffer.html_safe?, "should be safe"
+  end
+
+  test "Should continue unsafe on slice" do
+    x = 'foo'.html_safe.gsub!('f', '<script>alert("lolpwnd");</script>')
+
+    # calling gsub! makes the dirty flag true
+    assert !x.html_safe?, "should not be safe"
+
+    # getting a slice of it
+    y = x[0..-1]
+
+    # should still be unsafe
+    assert !y.html_safe?, "should not be safe"
+  end
 end
-- 
cgit v1.2.3