valid_email2 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c14200d42afbdf47d3222f443c72f81dd23af157f32baebbcc607d2ef09959
-  data.tar.gz: 67e841c534a03d363b118bc50026dcc54ee1550478a98d92e885d53c40905ffe
+  metadata.gz: 85903e3f9f5d0e8222dcc7768e15632eecf4a6008e8a43c2d88549cfa9a140ae
+  data.tar.gz: 2519e54f15012418caa00608301ff19f91640ecf63e9cf88c586afa2d1a0d2d2
 SHA512:
-  metadata.gz: 27e0b370d3fc4fa2fb1530e931c9f06156c88045f9b55a4b9e038d521460b34ac4dc8b81f6194ea649477cb4169774cfe3b7a9ad15e06447f472b0742700433e
-  data.tar.gz: d160ab3de4196dc830e26aedab650c9839520b9aadccb9e6153305eb42ad796929cab5a209aef3ce869e1a801171b7de45fdc23d3e5ac6004436ad7e31a2a6ef
+  metadata.gz: 811d82babbd7ad076fc077d4dea52074ecf6591926ed6b37b4f6595b614bc46eeacfd944db95ebc577a6cfb36d858009a051eed67e87fa5ce3f06b63c576c8b6
+  data.tar.gz: 653fe9f637840019997480853e5784e4fba055f4d579bce8af3b30e631da8fe86a5074e00564d72444f7b4a1cd0f4d7d829d9928e7c3962d1b612b595cc16545

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 3.5.0
+* Disallow emails starting with a dot https://github.com/micke/valid_email2/pull/170
+* Add option to whitelist domains from MX check https://github.com/micke/valid_email2/pull/167
+* Remove false positives
+
 ## Version 3.4.0
 * Disallow consecutive dots https://github.com/micke/valid_email2/pull/163
 * Add andyes.net https://github.com/micke/valid_email2/pull/162

data/README.md

@@ -58,11 +58,17 @@ To validate that the domain is not a disposable email (checks domain only, does
 validates :email, 'valid_email_2/email': { disposable_domain: true }
 ```
 
-To validate that the domain is not a disposable email or a disposable email but whitelisted (under config/whitelisted_email_domains.yml):
+To validate that the domain is not a disposable email or a disposable email (checks domain and MX server) but whitelisted (under config/whitelisted_email_domains.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
 ```
 
+To validate that the domain is not a disposable email or a disposable email (checks domain only, does not check MX server) but whitelisted (under config/whitelisted_email_domains.yml):
+
+```ruby
+validates :email, 'valid_email_2/email': { disposable_domain_with_whitelist: true }
+```
+
 To validate that the domain is not blacklisted (under config/blacklisted_email_domains.yml):
 ```ruby
 validates :email, 'valid_email_2/email': { blacklist: true }

data/config/disposable_email_domains.txt

@@ -12324,7 +12324,6 @@ gd6ubc0xilchpozgpg.gq
 gd6ubc0xilchpozgpg.ml
 gd6ubc0xilchpozgpg.tk
 gdb.armageddon.org
-gdf.it
 gdfretertwer.com
 gdmail.top
 gdradr.com
@@ -31027,7 +31026,6 @@ voyagebirmanie.net
 voyancegratuite10min.com
 voyeurseite.info
 vozmivtop.ru
-vp.com
 vp.ycare.de
 vpanel.ru
 vpc608a0.pl
@@ -33700,4 +33698,4 @@ zzv2bfja5.pl
 zzz.co
 zzz.com
 zzzmail.pl
-zzzzzzzzzzzzz.com
+zzzzzzzzzzzzz.com

data/lib/valid_email2/address.rb

@@ -46,7 +46,8 @@ module ValidEmail2
             !domain.start_with?('-') &&
             !domain.include?('-.') &&
             !address.local.include?('..') &&
-            !address.local.end_with?('.')
+            !address.local.end_with?('.') &&
+            !address.local.start_with?('.')
         else
           false
         end

data/lib/valid_email2/email_validator.rb

@@ -37,6 +37,10 @@ module ValidEmail2
         error(record, attribute) && return if addresses.any? { |address| address.disposable? && !address.whitelisted? }
       end
 
+      if options[:disposable_domain_with_whitelist]
+        error(record, attribute) && return if addresses.any? { |address| address.disposable_domain? && !address.whitelisted? }
+      end
+
       if options[:blacklist]
         error(record, attribute) && return if addresses.any?(&:blacklisted?)
       end

data/lib/valid_email2/version.rb

@@ -1,3 +1,3 @@
 module ValidEmail2
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

data/spec/valid_email2_spec.rb

@@ -31,6 +31,10 @@ class TestUserDisallowDisposableWithWhitelist < TestModel
   validates :email, 'valid_email_2/email': { disposable_with_whitelist: true }
 end
 
+class TestUserDisallowDisposableDomainWithWhitelist < TestModel
+  validates :email, 'valid_email_2/email': { disposable_domain_with_whitelist: true }
+end
+
 class TestUserDisallowBlacklisted < TestModel
   validates :email, 'valid_email_2/email': { blacklist: true }
 end
@@ -92,6 +96,16 @@ describe ValidEmail2 do
       expect(user.valid?).to be_falsey
     end
 
+    it "is invalid if the address starts with a dot" do
+      user = TestUser.new(email: ".foo@bar.com")
+      expect(user.valid?).to be_falsey
+    end
+
+    it "is invalid if the local part of the address ends with a dot" do
+      user = TestUser.new(email: "foo.@bar.com")
+      expect(user.valid?).to be_falsey
+    end
+
     it "is invalid if the email contains emoticons" do
       user = TestUser.new(email: "foo🙈@gmail.com")
       expect(user.valid?).to be_falsy
@@ -170,8 +184,18 @@ describe ValidEmail2 do
       let(:whitelist_domain) { disposable_domain }
       let(:whitelist_file_path) { "config/whitelisted_email_domains.yml" }
 
+      # Some of the specs below need to explictly set the whitelist var or it 
+      # may be cached to an empty set
+      def set_whitelist
+        ValidEmail2.instance_variable_set(
+          :@whitelist, 
+          ValidEmail2.send(:load_if_exists, ValidEmail2::WHITELIST_FILE)
+        )
+      end
+
       after do
         FileUtils.rm(whitelist_file_path, force: true)
+        set_whitelist
       end
 
       it "is invalid if the domain is disposable and not in the whitelist" do
@@ -181,9 +205,22 @@ describe ValidEmail2 do
 
       it "is valid if the domain is disposable but in the whitelist" do
         File.open(whitelist_file_path, "w") { |f| f.write [whitelist_domain].to_yaml }
+        set_whitelist
         user = TestUserDisallowDisposableWithWhitelist.new(email: "foo@#{whitelist_domain}")
+        expect(user.valid?).to be_truthy
+      end
+
+      it "is invalid if the domain is a disposable_domain and not in the whitelist" do
+        user = TestUserDisallowDisposableDomainWithWhitelist.new(email: "foo@#{whitelist_domain}")
         expect(user.valid?).to be_falsey
       end
+
+      it "is valid if the domain is a disposable_domain but in the whitelist" do
+        File.open(whitelist_file_path, "w") { |f| f.write [whitelist_domain].to_yaml }
+        set_whitelist
+        user = TestUserDisallowDisposableDomainWithWhitelist.new(email: "foo@#{whitelist_domain}")
+        expect(user.valid?).to be_truthy
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Micke Lisinge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler