mirror of
https://github.com/meineerde/redmine.git
synced 2025-12-19 15:01:14 +00:00
Limits the schemes that custom field URL patterns can use (#22925).
git-svn-id: http://svn.redmine.org/redmine/trunk@15435 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
dac22ebb39
commit
91e991e951
@ -262,6 +262,14 @@ class CustomField < ActiveRecord::Base
|
|||||||
args.include?(field_format)
|
args.include?(field_format)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.human_attribute_name(attribute_key_name, *args)
|
||||||
|
attr_name = attribute_key_name.to_s
|
||||||
|
if attr_name == 'url_pattern'
|
||||||
|
attr_name = "url"
|
||||||
|
end
|
||||||
|
super(attr_name, *args)
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
# Removes multiple values for the custom field after setting the multiple attribute to false
|
# Removes multiple values for the custom field after setting the multiple attribute to false
|
||||||
|
|||||||
@ -48,6 +48,7 @@ module Redmine
|
|||||||
class Base
|
class Base
|
||||||
include Singleton
|
include Singleton
|
||||||
include Redmine::I18n
|
include Redmine::I18n
|
||||||
|
include Redmine::Helpers::URL
|
||||||
include ERB::Util
|
include ERB::Util
|
||||||
|
|
||||||
class_attribute :format_name
|
class_attribute :format_name
|
||||||
@ -149,7 +150,12 @@ module Redmine
|
|||||||
# Returns the validation errors for custom_field
|
# Returns the validation errors for custom_field
|
||||||
# Should return an empty array if custom_field is valid
|
# Should return an empty array if custom_field is valid
|
||||||
def validate_custom_field(custom_field)
|
def validate_custom_field(custom_field)
|
||||||
[]
|
errors = []
|
||||||
|
pattern = custom_field.url_pattern
|
||||||
|
if pattern.present? && !uri_with_safe_scheme?(url_pattern_without_tokens(pattern))
|
||||||
|
errors << [:url_pattern, :invalid]
|
||||||
|
end
|
||||||
|
errors
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the validation error messages for custom_value
|
# Returns the validation error messages for custom_value
|
||||||
@ -178,7 +184,7 @@ module Redmine
|
|||||||
url = url_from_pattern(custom_field, single_value, customized)
|
url = url_from_pattern(custom_field, single_value, customized)
|
||||||
[text, url]
|
[text, url]
|
||||||
end
|
end
|
||||||
links = texts_and_urls.sort_by(&:first).map {|text, url| view.link_to text, url}
|
links = texts_and_urls.sort_by(&:first).map {|text, url| view.link_to_if uri_with_safe_scheme?(url), text, url}
|
||||||
links.join(', ').html_safe
|
links.join(', ').html_safe
|
||||||
else
|
else
|
||||||
casted
|
casted
|
||||||
@ -210,6 +216,13 @@ module Redmine
|
|||||||
end
|
end
|
||||||
protected :url_from_pattern
|
protected :url_from_pattern
|
||||||
|
|
||||||
|
# Returns the URL pattern with substitution tokens removed,
|
||||||
|
# for validation purpose
|
||||||
|
def url_pattern_without_tokens(url_pattern)
|
||||||
|
url_pattern.to_s.gsub(/%(value|id|project_id|project_identifier|m\d+)%/, '')
|
||||||
|
end
|
||||||
|
protected :url_pattern_without_tokens
|
||||||
|
|
||||||
def edit_tag(view, tag_id, tag_name, custom_value, options={})
|
def edit_tag(view, tag_id, tag_name, custom_value, options={})
|
||||||
view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id))
|
view.text_field_tag(tag_name, custom_value.value, options.merge(:id => tag_id))
|
||||||
end
|
end
|
||||||
|
|||||||
@ -20,6 +20,10 @@ require File.expand_path('../../../../../test_helper', __FILE__)
|
|||||||
class Redmine::FieldFormatTest < ActionView::TestCase
|
class Redmine::FieldFormatTest < ActionView::TestCase
|
||||||
include ApplicationHelper
|
include ApplicationHelper
|
||||||
|
|
||||||
|
def setup
|
||||||
|
set_language_if_valid 'en'
|
||||||
|
end
|
||||||
|
|
||||||
def test_string_field_with_text_formatting_disabled_should_not_format_text
|
def test_string_field_with_text_formatting_disabled_should_not_format_text
|
||||||
field = IssueCustomField.new(:field_format => 'string')
|
field = IssueCustomField.new(:field_format => 'string')
|
||||||
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "*foo*")
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "*foo*")
|
||||||
@ -52,6 +56,17 @@ class Redmine::FieldFormatTest < ActionView::TestCase
|
|||||||
assert_include "<strong>foo</strong>", field.format.formatted_custom_value(self, custom_value, true)
|
assert_include "<strong>foo</strong>", field.format.formatted_custom_value(self, custom_value, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_should_validate_url_pattern_with_safe_scheme
|
||||||
|
field = IssueCustomField.new(:field_format => 'string', :name => 'URL', :url_pattern => 'http://foo/%value%')
|
||||||
|
assert_save field
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_should_not_validate_url_pattern_with_unsafe_scheme
|
||||||
|
field = IssueCustomField.new(:field_format => 'string', :name => 'URL', :url_pattern => 'foo://foo/%value%')
|
||||||
|
assert !field.save
|
||||||
|
assert_include "URL is invalid", field.errors.full_messages
|
||||||
|
end
|
||||||
|
|
||||||
def test_text_field_with_url_pattern_should_format_as_link
|
def test_text_field_with_url_pattern_should_format_as_link
|
||||||
field = IssueCustomField.new(:field_format => 'string', :url_pattern => 'http://foo/%value%')
|
field = IssueCustomField.new(:field_format => 'string', :url_pattern => 'http://foo/%value%')
|
||||||
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "bar")
|
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "bar")
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user