IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: match subdomain with email domain blacklist

Browse Source
This commit is contained in:
Arpit Jalan 2015-05-13 17:38:10 +05:30
parent 51d82fc25d
commit 220b9c5abe
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) def email_in_restriction_setting?(setting, value)
domains = setting.gsub('.', '\.') domains = setting.gsub('.', '\.')
regexp = Regexp.new("@(#{domains})", true) regexp = Regexp.new("@(.+\.)?(#{domains})", true)
value =~ regexp value =~ regexp
end 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 expect(Fabricate.build(:user, email: 'notgood@TRASHMAIL.NET')).not_to be_valid
end 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 it 'blacklist should not reject developer emails' do
Rails.configuration.stubs(:developer_emails).returns('developer@discourse.org') Rails.configuration.stubs(:developer_emails).returns('developer@discourse.org')
SiteSetting.stubs(:email_domains_blacklist).returns('discourse.org') SiteSetting.stubs(:email_domains_blacklist).returns('discourse.org')