From f7a30e2fae3199a82e2ad23bb9d761d1fe1be8de Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 5 Jun 2017 01:03:45 +0200 Subject: [PATCH] Added support for configurable reserved usernames (fix of #1382) (#3566) * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames --- app/models/account.rb | 2 +- app/validators/unreserved_validator.rb | 15 +++++++++++++++ config/locales/en.yml | 1 + config/settings.yml | 9 ++++++++- spec/models/account_spec.rb | 6 ++++++ 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 app/validators/unreserved_validator.rb diff --git a/app/models/account.rb b/app/models/account.rb index 5b0d2d65c6..918d5b0f1c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -56,7 +56,7 @@ class Account < ApplicationRecord # Local user validations with_options if: :local? do - validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 } + validates :username, format: { with: /\A[a-z0-9_]+\z/i }, uniqueness: { scope: :domain, case_sensitive: false }, length: { maximum: 30 }, unreserved: true validates :display_name, length: { maximum: 30 } validates :note, length: { maximum: 160 } end diff --git a/app/validators/unreserved_validator.rb b/app/validators/unreserved_validator.rb new file mode 100644 index 0000000000..4e5b9dafc3 --- /dev/null +++ b/app/validators/unreserved_validator.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class UnreservedValidator < ActiveModel::EachValidator + def validate_each(record, attribute, value) + return if value.nil? + record.errors.add(attribute, I18n.t('accounts.reserved_username')) if reserved_username?(value) + end + + private + + def reserved_username?(value) + return false unless Setting.reserved_usernames + Setting.reserved_usernames.include?(value.downcase) + end +end diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ff2f7eec6..965bfbe477 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: posts: Posts remote_follow: Remote follow unfollow: Unfollow + reserved_username: The username is reserved activitypub: activity: announce: diff --git a/config/settings.yml b/config/settings.yml index 4811213cbd..bffb7052ac 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -7,7 +7,7 @@ # For more information, see docs/Running-Mastodon/Administration-guide.md # defaults: &defaults - site_title: 'Mastodon' + site_title: Mastodon site_description: '' site_extended_description: '' site_contact_username: '' @@ -27,6 +27,13 @@ defaults: &defaults interactions: must_be_follower: false must_be_following: false + reserved_usernames: + - admin + - support + - help + - root + - webmaster + - administrator development: <<: *defaults diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index ebec463e12..ab4de9aa12 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -381,6 +381,12 @@ RSpec.describe Account, type: :model do expect(account_2).to model_have_error_on_field(:username) end + it 'is invalid if the username is reserved' do + account = Fabricate.build(:account, username: 'support') + account.valid? + expect(account).to model_have_error_on_field(:username) + end + context 'when is local' do it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do account = Fabricate.build(:account, username: 'the-doctor')