Patch #37750 » 0003-uses-the-new-html-sanitizer-for-links-rendered-by-cu.patch
| lib/redmine/field_format.rb | ||
|---|---|---|
|
[text, url]
|
||
|
end
|
||
|
links = texts_and_urls.sort_by(&:first).map do |text, url|
|
||
|
css_class = (/^https?:\/\//.match?(url)) ? 'external' : nil
|
||
|
view.link_to_if uri_with_safe_scheme?(url), text, url, :class => css_class
|
||
|
view.link_to text, url
|
||
|
end
|
||
|
links.join(', ').html_safe
|
||
|
sanitize_html links.join(', ')
|
||
|
else
|
||
|
casted
|
||
|
end
|
||
|
end
|
||
|
def sanitize_html(html)
|
||
|
Redmine::WikiFormatting::HtmlSanitizer.call(html).html_safe
|
||
|
end
|
||
|
# Returns an URL generated with the custom field URL pattern
|
||
|
# and variables substitution:
|
||
|
# %value% => the custom field value
|
||
| ... | ... | |
|
url = "http://" + url
|
||
|
end
|
||
|
end
|
||
|
css_class = (/^https?:\/\//.match?(url)) ? 'external' : nil
|
||
|
view.link_to value.to_s.truncate(40), url, :class => css_class
|
||
|
sanitize_html view.link_to(value.to_s.truncate(40), url)
|
||
|
else
|
||
|
value.to_s
|
||
|
end
|
||
| test/unit/lib/redmine/field_format/field_format_test.rb | ||
|---|---|---|
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "bar")
|
||
|
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/bar">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/bar" class="external">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_text_field_with_url_pattern_and_value_containing_a_space_should_format_as_link
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "foo bar")
|
||
|
assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/foo%20bar">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/foo%20bar" class="external">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_text_field_with_url_pattern_should_not_encode_url_pattern
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "1")
|
||
|
assert_equal "1", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/bar#anchor">1</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/bar#anchor" class="external">1</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_text_field_with_url_pattern_should_encode_values
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "foo bar")
|
||
|
assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/foo%20bar#anchor">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/foo%20bar#anchor" class="external">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
end
|
||
| test/unit/lib/redmine/field_format/link_format_test.rb | ||
|---|---|---|
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "bar")
|
||
|
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/bar">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/bar" class="external">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_should_substitute_object_id_in_url
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => object, :value => "bar")
|
||
|
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/10">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/10" class="external">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_should_substitute_project_id_in_url
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => object, :value => "bar")
|
||
|
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/52">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/52" class="external">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_should_substitute_project_identifier_in_url
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => object, :value => "bar")
|
||
|
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/foo_project-00">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/foo_project-00" class="external">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_should_substitute_regexp_groups
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "56-142")
|
||
|
assert_equal "56-142", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/142/56">56-142</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/142/56" class="external">56-142</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_without_url_pattern_should_link_to_value
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "http://foo/bar")
|
||
|
assert_equal "http://foo/bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/bar">http://foo/bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/bar" class="external">http://foo/bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
def test_link_field_without_url_pattern_should_link_to_value_with_http_by_default
|
||
| ... | ... | |
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "foo.bar")
|
||
|
assert_equal "foo.bar", field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo.bar">foo.bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo.bar" class="external">foo.bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
end
|
||
| test/unit/lib/redmine/field_format/list_format_test.rb | ||
|---|---|---|
|
def test_field_with_url_pattern_should_link_value
|
||
|
field = IssueCustomField.new(:field_format => 'list', :url_pattern => 'http://localhost/%value%')
|
||
|
formatted = field.format.formatted_value(self, field, 'foo', Issue.new, true)
|
||
|
assert_equal '<a class="external" href="http://localhost/foo">foo</a>', formatted
|
||
|
assert_equal '<a href="http://localhost/foo" class="external">foo</a>', formatted
|
||
|
assert formatted.html_safe?
|
||
|
end
|
||
|
def test_field_with_url_pattern_and_multiple_values_should_link_values
|
||
|
field = IssueCustomField.new(:field_format => 'list', :url_pattern => 'http://localhost/%value%')
|
||
|
formatted = field.format.formatted_value(self, field, ['foo', 'bar'], Issue.new, true)
|
||
|
assert_equal '<a class="external" href="http://localhost/bar">bar</a>, <a class="external" href="http://localhost/foo">foo</a>', formatted
|
||
|
assert_equal '<a href="http://localhost/bar" class="external">bar</a>, <a href="http://localhost/foo" class="external">foo</a>', formatted
|
||
|
assert formatted.html_safe?
|
||
|
end
|
||
| test/unit/lib/redmine/field_format/numeric_format_test.rb | ||
|---|---|---|
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "3")
|
||
|
assert_equal 3, field.format.formatted_custom_value(self, custom_value, false)
|
||
|
assert_equal '<a class="external" href="http://foo/3">3</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
assert_equal '<a href="http://foo/3" class="external">3</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||
|
end
|
||
|
end
|
||