From: J Guthrie <jamie.guthrie@gmail.com>
Date: Sun, 4 Nov 2018 16:22:41 +0000 (+0000)
Subject: Make invalid char list more explicit (between ascii and non ascii chars)
X-Git-Tag: live~3412^2~12
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b439bac920f2d8506db9ad575a69312cd56bbf65

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

diff --git a/app/models/user.rb b/app/models/user.rb
index b3325e4eb..795ddc132 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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? },