From d68f8ba5c303556ecb8625dd146184d68b704e83 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson
Date: Fri, 12 Feb 2010 17:24:04 -0800
Subject: [PATCH] simple_format returns a safe buffer escaping unsafe input
[Santiago Pastorino]
---
actionpack/lib/action_view/helpers/text_helper.rb | 2 +-
actionpack/test/template/text_helper_test.rb | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index d84515d5b5..b19a9754f4 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -327,7 +327,7 @@ def markdown(text)
# # => "Look ma! A class!
"
def simple_format(text, html_options={})
start_tag = tag('p', html_options, true)
- text = text.to_s.dup
+ text = h(text)
text.gsub!(/\r\n?/, "\n") # \r\n and \r -> \n
text.gsub!(/\n\n+/, "
\n\n#{start_tag}") # 2+ newline -> paragraph
text.gsub!(/([^\n]\n)(?=[^\n])/, '\1
') # 1 newline -> br
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 39bea12501..9962b7af3f 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -40,6 +40,18 @@ def test_simple_format
assert_equal %Q(para 1
\n\npara 2
), simple_format("para 1\n\npara 2", :class => 'test')
end
+ def test_simple_format_should_be_html_safe
+ assert simple_format(" test with html tags ").html_safe?
+ end
+
+ def test_simple_format_should_escape_unsafe_input
+ assert_equal "<b> test with unsafe string </b>
", simple_format(" test with unsafe string ")
+ end
+
+ def test_simple_format_should_not_escape_safe_input
+ assert_equal " test with safe string
", simple_format(" test with safe string ".html_safe)
+ end
+
def test_truncate
assert_equal "Hello World!", truncate("Hello World!", :length => 12)
assert_equal "Hello Wor...", truncate("Hello World!!", :length => 12)
--
GitLab