cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make invalid char list more explicit (between ascii and non ascii chars)

Browse source
This commit is contained in:
J Guthrie 2018-11-04 16:22:41 +00:00
parent c3254b7e93
commit b439bac920
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -88,17 +88,18 @@ class User < ActiveRecord::Base
:default_url => "/assets/:class/:attachment/:style.png",
:styles => { :large => "100x100>", :small => "50x50>" }
INVALID_CHARS = "/;.,?%#"
INVALID_ASCII_CHARS = "/;.,?%#"
INVALID_NON_ASCII_CHARS = "\x00-\x1f\x7f\ufffe\uffff"
validates :display_name, :presence => true, :allow_nil => true, :length => 3..255,
:exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended]
validates :display_name, :if => proc { |u| u.display_name_changed? },
:uniqueness => { :case_sensitive => false }
validates :display_name, :if => proc { |u| u.display_name_changed? },
:format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff]*\z} }
:format => { :with => %r{\A[^#{INVALID_NON_ASCII_CHARS}]*\z} }
validates :display_name, :if => proc { |u| u.display_name_changed? },
:format => { :with => %r{\A[^#{INVALID_CHARS}]*\z},
:message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_CHARS) }
:format => { :with => %r{\A[^#{INVALID_ASCII_CHARS}]*\z},
:message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_ASCII_CHARS) }
validates :display_name, :if => proc { |u| u.display_name_changed? },
:format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") }
validates :display_name, :if => proc { |u| u.display_name_changed? },