github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 23:48:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add validation of string site settings with regex, and min and max lengths

Browse Source
This commit is contained in:
Neil Lalonde
2014-06-18 10:49:21 -04:00
parent 6e94f55f61
commit 3eb65885d1
8 changed files with 167 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/site_setting_extension.rb
View File

@ -82,8 +82,9 @@ module SiteSettingExtension
if opts[:refresh]
refresh_settings << name
end
if validator_type = opts[:type]
validators[name] = {class: validator_for(validator_type), opts: opts}
if validator_type = validator_for(opts[:type] || get_data_type(name, defaults[name]))
validators[name] = {class: validator_type, opts: opts}
end
current[name] = current_value
@ -242,7 +243,7 @@ module SiteSettingExtension
if v = validators[name]
validator = v[:class].new(v[:opts])
unless validator.valid_value?(val)
raise Discourse::InvalidParameters.new(validator.error_message(val))
raise Discourse::InvalidParameters.new(validator.error_message)
end
end
@ -327,9 +328,10 @@ module SiteSettingExtension
def validator_for(type_name)
@validator_mapping ||= {
'email' => EmailSettingValidator,
'username' => UsernameSettingValidator,
'integer' => IntegerSettingValidator
'email' => EmailSettingValidator,
'username' => UsernameSettingValidator,
types[:fixnum] => IntegerSettingValidator,
types[:string] => StringSettingValidator
}
@validator_mapping[type_name]
end