maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix domain list bug (#12268)

Browse source
This commit is contained in:
Ben Halpern 2021-01-14 10:43:42 -05:00 • committed by GitHub
parent 31689fd76a
commit 444841bb90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/site_configs/upsert.rb
View file

@ -16,7 +16,7 @@ module SiteConfigs
VALID_URL = %r{\A(http|https)://([/|.\w\s-])*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?\z}.freeze
VALID_DOMAIN = /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/.freeze
VALID_DOMAIN = /^[a-zA-Z0-9]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/.freeze
PARAMS_TO_BE_CLEANED = %i[sidebar_tags suggested_tags suggested_users].freeze

7
spec/requests/admin/configs_spec.rb
View file

@ -120,6 +120,13 @@ RSpec.describe "/admin/config", type: :request do
expect(SiteConfig.allowed_registration_email_domains).to eq(%w[dev.to forem.com forem.dev])
end
it "allows 2-character domains" do
proper_list = "dev.to, forem.com, 2u.com"
post "/admin/config", params: { site_config: { allowed_registration_email_domains: proper_list },
confirmation: confirmation_message }
expect(SiteConfig.allowed_registration_email_domains).to eq(%w[dev.to forem.com 2u.com])
end
it "does not allow improper domain list" do
impproper_list = "dev.to, foremcom, forem.dev"
post "/admin/config", params: { site_config: { allowed_registration_email_domains: impproper_list },