From e7e577dd6e82d9b6ae3afa799a56953d0468deea Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 30 Jul 2018 22:29:52 +0200 Subject: Enforce username format for remote users, too (#8102) Initially I thought there might be valid reasons for remote users to have a different, unpredicted username format. However, I now realize such a difference would be unusable and unexpected within Mastodon. Fix #8058 --- app/models/account.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/models/account.rb b/app/models/account.rb index 1f720bf88..0272b4615 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -68,6 +68,7 @@ class Account < ApplicationRecord # Remote user validations validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? } + validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, if: -> { !local? && will_save_change_to_username? } # Local user validations validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? } -- cgit