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

Merge pull request #4218 from AntonKhorev/no-user-id-renames

Browse source 
Disallow username changes to user_n if n isn't their id
This commit is contained in:
Andy Allan 2024-01-18 10:47:17 +00:00 • committed by GitHub
commit 7406ae5dcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -100,6 +100,7 @@ class User < ApplicationRecord
validates :display_name, :if => proc { |u| u.display_name_changed? },
:characters => { :url_safe => true },
:whitespace => { :leading => false, :trailing => false }
validate :display_name_cannot_be_user_id_with_other_id, :if => proc { |u| u.display_name_changed? }
validates :email, :presence => true, :confirmation => true, :characters => true
validates :email, :if => proc { |u| u.email_changed? },
:uniqueness => { :case_sensitive => false }
@ -124,6 +125,12 @@ class User < ApplicationRecord
before_save :update_tile
after_save :spam_check
def display_name_cannot_be_user_id_with_other_id
display_name&.match(/^user_(\d+)$/i) do |m|
errors.add :display_name, I18n.t("activerecord.errors.messages.display_name_is_user_n") unless m[1].to_i == id
end
end
def to_param
display_name
end