hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix admin validation being too strict about usernames (#10449) 

* Fix admin validation being too strict about usernames

Fix #10446

* Strip Setting.site_contact_username consistently throughout the codebase
signup-info-prompt
Eugen Rochko 2019-04-06 17:53:17 +02:00 committed by GitHub
parent 78a8a99b0b
commit 2c63e0292a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@ -50,7 +50,7 @@ class HomeController < ApplicationController
push_subscription: current_account.user.web_push_subscription(current_session), push_subscription: current_account.user.web_push_subscription(current_session),
current_account: current_account, current_account: current_account,
token: current_session.token, token: current_session.token,
admin: Account.find_local(Setting.site_contact_username), admin: Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')),
} }
end end

2
app/controllers/shares_controller.rb
View File

@ -21,7 +21,7 @@ class SharesController < ApplicationController
push_subscription: current_account.user.web_push_subscription(current_session), push_subscription: current_account.user.web_push_subscription(current_session),
current_account: current_account, current_account: current_account,
token: current_session.token, token: current_session.token,
admin: Account.find_local(Setting.site_contact_username), admin: Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')),
text: text, text: text,
} }
end end

2
app/models/concerns/account_finder_concern.rb
View File

@ -13,7 +13,7 @@ module AccountFinderConcern
end end
def representative def representative
find_local(Setting.site_contact_username.gsub(/\A@/, '')) || Account.local.find_by(suspended: false) find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.find_by(suspended: false)
end end
def find_local(username) def find_local(username)

2
app/presenters/instance_presenter.rb
View File

@ -13,7 +13,7 @@ class InstancePresenter
) )
def contact_account def contact_account
Account.find_local(Setting.site_contact_username.gsub(/\A@/, '')) Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, ''))
end end
def user_count def user_count

10
app/validators/existing_username_validator.rb
View File

@ -5,16 +5,10 @@ class ExistingUsernameValidator < ActiveModel::EachValidator
return if value.blank? return if value.blank?
if options[:multiple] if options[:multiple]
missing_usernames = value.split(',').map { |username| username unless Account.find_local(username) }.compact missing_usernames = value.split(',').map { |username| username.strip.gsub(/\A@/, '') }.map { |username| username unless Account.find_local(username) }.compact
record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: missing_usernames.join(', '))) if missing_usernames.any? record.errors.add(attribute, I18n.t('existing_username_validator.not_found_multiple', usernames: missing_usernames.join(', '))) if missing_usernames.any?
else else
record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) unless Account.find_local(value) record.errors.add(attribute, I18n.t('existing_username_validator.not_found')) unless Account.find_local(value.strip.gsub(/\A@/, ''))
end end
end end
private
def valid_html?(str)
Nokogiri::HTML.fragment(str).to_s == str
end
end end