mirror of
https://github.com/discourse/discourse.git
synced 2024-11-28 13:23:44 +08:00
b2a0d34bb7
* FEATURE: add setting `auto_approve_email_domains` to auto approve users This commit adds a new site setting `auto_approve_email_domains` to auto approve users based on their email address domain. Note that if a domain already exists in `email_domains_whitelist` then `auto_approve_email_domains` needs to be duplicated there as well, since users won’t be able to register with email address that is not allowed in `email_domains_whitelist`. * Update config/locales/server.en.yml Co-Authored-By: Robin Ward <robin.ward@gmail.com>
74 lines
2.7 KiB
Ruby
74 lines
2.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe EmailValidator do
|
|
def blocks?(email)
|
|
user = Fabricate.build(:user, email: email)
|
|
validator = EmailValidator.new(attributes: :email)
|
|
validator.validate_each(user, :email, user.email)
|
|
user.errors[:email].present?
|
|
end
|
|
|
|
context "blocked email" do
|
|
it "doesn't add an error when email doesn't match a blocked email" do
|
|
expect(blocks?('sam@sam.com')).to eq(false)
|
|
end
|
|
|
|
it "adds an error when email matches a blocked email" do
|
|
ScreenedEmail.create!(email: 'sam@sam.com', action_type: ScreenedEmail.actions[:block])
|
|
expect(blocks?('sam@sam.com')).to eq(true)
|
|
expect(blocks?('SAM@sam.com')).to eq(true)
|
|
end
|
|
|
|
it "blocks based on email_domains_blacklist" do
|
|
SiteSetting.email_domains_blacklist = "email.com|mail.com|e-mail.com"
|
|
expect(blocks?('sam@email.com')).to eq(true)
|
|
expect(blocks?('sam@EMAIL.com')).to eq(true)
|
|
expect(blocks?('sam@bob.email.com')).to eq(true)
|
|
expect(blocks?('sam@e-mail.com')).to eq(true)
|
|
expect(blocks?('sam@googlemail.com')).to eq(false)
|
|
end
|
|
|
|
it "blocks based on email_domains_whitelist" do
|
|
SiteSetting.email_domains_whitelist = "googlemail.com|email.com"
|
|
expect(blocks?('sam@email.com')).to eq(false)
|
|
expect(blocks?('sam@EMAIL.com')).to eq(false)
|
|
expect(blocks?('sam@bob.email.com')).to eq(false)
|
|
expect(blocks?('sam@e-mail.com')).to eq(true)
|
|
expect(blocks?('sam@googlemail.com')).to eq(false)
|
|
expect(blocks?('sam@email.computers.are.evil.com')).to eq(true)
|
|
end
|
|
end
|
|
|
|
context "auto approve email domains" do
|
|
it "works as expected" do
|
|
SiteSetting.auto_approve_email_domains = "example.com"
|
|
|
|
expect(EmailValidator.can_auto_approve_user?("foobar@example.com.fr")).to eq(false)
|
|
expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(true)
|
|
end
|
|
|
|
it "returns false if domain not present in email_domains_whitelist" do
|
|
SiteSetting.email_domains_whitelist = "googlemail.com"
|
|
SiteSetting.auto_approve_email_domains = "example.com|googlemail.com"
|
|
|
|
expect(EmailValidator.can_auto_approve_user?("foobar@example.com")).to eq(false)
|
|
expect(EmailValidator.can_auto_approve_user?("foobar@googlemail.com")).to eq(true)
|
|
end
|
|
end
|
|
|
|
context '.email_regex' do
|
|
it 'should match valid emails' do
|
|
expect(!!('test@discourse.org' =~ EmailValidator.email_regex)).to eq(true)
|
|
end
|
|
|
|
it 'should not match invalid emails' do
|
|
['testdiscourse.org', 'test@discourse.org; a@discourse.org', 'random'].each do |email|
|
|
expect(!!(email =~ EmailValidator.email_regex)).to eq(false)
|
|
end
|
|
end
|
|
end
|
|
|
|
end
|