codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3463 from techAPJ/patch-2

Browse source 
FIX: match subdomain with email domain blacklist
This commit is contained in:
Régis Hanol 2015-05-13 17:56:54 +02:00
commit bb29bff5d8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/validators/email_validator.rb
View file

@ -17,7 +17,7 @@ class EmailValidator < ActiveModel::EachValidator
def email_in_restriction_setting?(setting, value)
domains = setting.gsub('.', '\.')
regexp = Regexp.new("@(#{domains})", true)
regexp = Regexp.new("@(.+\.)?(#{domains})", true)
value =~ regexp
end

5
spec/models/user_spec.rb
View file

@ -440,6 +440,11 @@ describe User do
expect(Fabricate.build(:user, email: 'notgood@TRASHMAIL.NET')).not_to be_valid
end
it 'should reject emails based on the email_domains_blacklist site setting matching subdomain' do
SiteSetting.stubs(:email_domains_blacklist).returns('domain.com')
expect(Fabricate.build(:user, email: 'notgood@sub.domain.com')).not_to be_valid
end
it 'blacklist should not reject developer emails' do
Rails.configuration.stubs(:developer_emails).returns('developer@discourse.org')
SiteSetting.stubs(:email_domains_blacklist).returns('discourse.org')