From 7177e37b999d0a8b4e0382c193bcb973443a756f Mon Sep 17 00:00:00 2001 From: Guillaume Lo Re Date: Wed, 26 Apr 2017 01:22:51 +0200 Subject: Stricter whitelist rules (#2213) * Stricter whitelist rules * Linting * Added spec for blacklisting * Test subdomain blacklist on domain whitelist * No need to split * Change spec name --- app/validators/email_validator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/validators/email_validator.rb') diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb index 06e9375f6..141f209d5 100644 --- a/app/validators/email_validator.rb +++ b/app/validators/email_validator.rb @@ -15,7 +15,7 @@ class EmailValidator < ActiveModel::EachValidator return false if Rails.configuration.x.email_domains_blacklist.blank? domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.') - regexp = Regexp.new("@(.+\\.)?(#{domains})", true) + regexp = Regexp.new("@(.+\\.)?(#{domains})", true) value =~ regexp end @@ -24,7 +24,7 @@ class EmailValidator < ActiveModel::EachValidator return false if Rails.configuration.x.email_domains_whitelist.blank? domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.') - regexp = Regexp.new("@(.+\\.)?(#{domains})", true) + regexp = Regexp.new("@(.+\\.)?(#{domains})$", true) value !~ regexp end -- cgit