valid_email2 7.0.9 → 7.0.11

data/lib/valid_email2/address.rb

@@ -82,19 +82,15 @@ module ValidEmail2
     end
 
     def disposable_domain?
-      domain_is_in?(ValidEmail2.disposable_emails)
-    end
-
-    def disposable_mx_server?
-      valid? && mx_server_is_in?(ValidEmail2.disposable_emails)
+      domain_is_in?(address.domain, ValidEmail2.disposable_emails)
     end
 
     def allow_listed?
-      domain_is_in?(ValidEmail2.allow_list)
+      domain_is_in?(address.domain, ValidEmail2.allow_list)
     end
 
     def deny_listed?
-      valid? && domain_is_in?(ValidEmail2.deny_list)
+      valid? && domain_is_in?(address.domain, ValidEmail2.deny_list)
     end
 
     def valid_mx?
@@ -113,26 +109,27 @@ module ValidEmail2
 
     private
 
-    def domain_is_in?(domain_list)
-      address_domain = address.domain.downcase
-      return true if domain_list.include?(address_domain)
-
-      i = address_domain.index('.')
-      return false unless i
-
-      domain_list.include?(address_domain[(i + 1)..-1])
+    def disposable_mx_server?
+      address_domains = @dns.mx_servers(address.domain).map(&:exchange).map(&:to_s)
+      domain_is_in?(address_domains, ValidEmail2.disposable_emails)
     end
 
-    def mx_server_is_in?(domain_list)
-      @dns.mx_servers(address.domain).any? { |mx_server|
-        return false unless mx_server.respond_to?(:exchange)
+    def domain_is_in?(address_domains, domain_list)
+      Array(address_domains).any? do |address_domain|
+        address_domain = address_domain.downcase
+        return true if domain_list.include?(address_domain)
 
-        mx_server = mx_server.exchange.to_s
+        tokens = address_domain.split('.')
+        return false if tokens.length < 3
 
-        domain_list.any? { |domain|
-          mx_server.end_with?(domain) && mx_server =~ /\A(?:.+\.)*?#{domain}\z/
-        }
-      }
+        # check only 6 elements deep
+        2.upto(6).each do |depth|
+          limited_sub_domain_part = tokens.reverse.first(depth).reverse.join('.')
+          return true if domain_list.include?(limited_sub_domain_part)
+        end
+
+        false
+      end
     end
 
     def address_contain_multibyte_characters?

data/lib/valid_email2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal:true
 
 module ValidEmail2
-  VERSION = "7.0.9"
+  VERSION = "7.0.11"
 end

data/pull_mailchecker_emails.rb

@@ -29,6 +29,16 @@ remote_emails = [
   resp.body.split("\n").flatten
 end
 
-result_emails = (existing_emails + remote_emails).map(&:strip).uniq.sort - allow_listed_emails
-
-File.write("config/disposable_email_domains.txt", result_emails.join("\n"))
+deny_listed_tlds = %w[me ml id]
+
+result_emails = (existing_emails + remote_emails).map(&:strip) - allow_listed_emails
+result_emails = result_emails.map do |line|
+  ts = line.chomp.split(".")
+  if ts.last.size == 2 && !deny_listed_tlds.include?(ts.last)
+    ts.last(3).join(".")
+  else
+    ts.last(2).join(".")
+  end
+end.uniq.sort
+
+File.open("config/disposable_email_domains.txt", "w") { |f| f.puts(result_emails) }

data/spec/address_spec.rb

@@ -55,7 +55,52 @@ describe ValidEmail2::Address do
 
       it "is valid if it contains special scandinavian characters" do
         address = described_class.new("jørgen@email.dk")
-        expect(address.valid?).to eq true
+        expect(address.valid?).to be_truthy
+      end
+    end
+  end
+
+  describe "#disposable_domain?" do
+    context "when the disposable domain does not have subdomains" do
+      let(:disposable_domain) { ValidEmail2.disposable_emails.select { |domain| domain.count(".") == 1 }.sample }
+
+      it "is true if the domain is in the disposable_emails list" do
+        address = described_class.new("foo@#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
+      end
+
+      it "is true if the domain is a subdomain of a disposable domain" do
+        address = described_class.new("foo@sub.#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
+      end
+
+      it "is true if the domain is a deeply nested subdomain of a disposable domain" do
+        address = described_class.new("foo@sub3.sub2.sub1.#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
+      end
+
+      it "is false if the domain is not in the disposable_emails list" do
+        address = described_class.new("foo@example.com")
+        expect(address.disposable_domain?).to eq false
+      end
+    end
+
+    context "when the disposable domain has subdomains" do
+      let(:disposable_domain) { ValidEmail2.disposable_emails.select { |domain| domain.count(".") > 1 }.sample }
+
+      it "is true if the domain is in the disposable_emails list" do
+        address = described_class.new("foo@#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
+      end
+
+      it "is true if the domain is a subdomain of a disposable domain" do
+        address = described_class.new("foo@sub.#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
+      end
+
+      it "is true if the domain is a deeply nested subdomain of a disposable domain" do
+        address = described_class.new("foo@sub3.sub2.sub1.#{disposable_domain}")
+        expect(address.disposable_domain?).to be_truthy
       end
     end
   end
@@ -66,7 +111,7 @@ describe ValidEmail2::Address do
     let(:email_instance) { described_class.new(email_address, dns_instance) }
     let(:ttl) { 1_000 }
     let(:mock_resolv_dns) { instance_double(Resolv::DNS) }
-    let(:mock_mx_records) { [double("MX", exchange: "mx.ymail.com", preference: 10, ttl: ttl)] }
+    let(:mock_mx_records) { [double("MX", exchange: "mx.ymail.com", preference: 10, ttl:)] }
 
     before do
       allow(email_instance).to receive(:null_mx?).and_return(false)
@@ -74,6 +119,47 @@ describe ValidEmail2::Address do
       allow(mock_resolv_dns).to receive(:timeouts=)
     end
 
+    describe "#disposable_mx_server?" do
+      let(:disposable_email_address) { "example@10minutemail.com" }
+      let(:disposable_mx_server) { ValidEmail2.disposable_emails.select { |domain| domain.count(".") == 1 }.sample }
+      let(:disposable_email_instance) { described_class.new(disposable_email_address, dns_instance) }
+      let(:mock_disposable_mx_records) { [double("MX", exchange: "mx.#{disposable_mx_server}", preference: 10, ttl:)] }
+
+      before do
+        allow(mock_resolv_dns).to receive(:getresources)
+          .with(disposable_email_instance.address.domain, Resolv::DNS::Resource::IN::MX)
+          .and_return(mock_disposable_mx_records)
+
+        allow(mock_resolv_dns).to receive(:getresources)
+          .with(email_instance.address.domain, Resolv::DNS::Resource::IN::MX)
+          .and_return(mock_mx_records)
+      end
+
+      it "is false if the MX server is not in the disposable_emails list" do
+        expect(email_instance.send(:disposable_mx_server?)).not_to be_truthy
+      end
+
+      it "is true if the MX server is in the disposable_emails list" do
+        expect(disposable_email_instance.send(:disposable_mx_server?)).to be_truthy
+      end
+
+      it "is false and then true when the MX record changes from non-disposable to disposable" do
+        allow(mock_resolv_dns).to receive(:getresources)
+          .with(disposable_email_instance.address.domain, Resolv::DNS::Resource::IN::MX)
+          .and_return(mock_mx_records) # non-disposable MX records
+
+        expect(disposable_email_instance.send(:disposable_mx_server?)).not_to be_truthy
+
+        ValidEmail2::Dns.clear_cache
+
+        allow(mock_resolv_dns).to receive(:getresources)
+          .with(disposable_email_instance.address.domain, Resolv::DNS::Resource::IN::MX)
+          .and_return(mock_disposable_mx_records) # disposable MX records
+
+        expect(disposable_email_instance.send(:disposable_mx_server?)).to be_truthy
+      end
+    end
+
     describe "#valid_strict_mx?" do
       let(:cached_at) { Time.now }
       let(:mock_cache_data) { { [email_instance.address.domain, Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_mx_records, cached_at, ttl) } }
@@ -206,7 +292,7 @@ describe ValidEmail2::Address do
     describe "#valid_mx?" do
       let(:cached_at) { Time.now }
       let(:mock_cache_data) { { [email_instance.address.domain, Resolv::DNS::Resource::IN::MX] => ValidEmail2::Dns::CacheEntry.new(mock_a_records, cached_at, ttl) } }
-      let(:mock_a_records) { [double("A", address: "192.168.1.1", ttl: ttl)] }
+      let(:mock_a_records) { [double("A", address: "192.168.1.1", ttl:)] }
 
       before do
         allow(email_instance).to receive(:mx_servers).and_return(mock_mx_records)

data/spec/benchmark_spec.rb

@@ -5,7 +5,7 @@ require "spec_helper"
 describe "Performance testing" do
   let(:disposable_domain) { ValidEmail2.disposable_emails.first }
 
-  it "has acceptable lookup performance" do
+  it "disposable_domain? has acceptable lookup performance" do
     address = ValidEmail2::Address.new("test@example.com")
 
     # preload list and check size
@@ -13,6 +13,17 @@ describe "Performance testing" do
     expect(ValidEmail2.disposable_emails.count).to be > 30000
 
     # check lookup timing
-    expect { address.disposable_domain? }.to perform_under(0.0001).sample(10).times
+    expect { address.disposable_domain? }.to perform_under(0.0001).sec.sample(10).times
+  end
+
+  it "disposable_mx_server? has acceptable lookup performance" do
+    address = ValidEmail2::Address.new("test@gmail.com")
+
+    # preload list and check size
+    expect(ValidEmail2.disposable_emails).to be_a(Set)
+    expect(ValidEmail2.disposable_emails.count).to be > 30000
+
+    # check lookup timing
+    expect { address.send(:disposable_mx_server?) }.to perform_under(0.00015).sec.sample(10).times
   end
 end

data/valid_email2.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "valid_email2/version"
 
@@ -8,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = ValidEmail2::VERSION
   spec.authors       = ["Micke Lisinge"]
   spec.email         = ["hi@micke.me"]
-  spec.description   = %q{ActiveModel validation for email. Including MX lookup and disposable email deny list}
-  spec.summary       = %q{ActiveModel validation for email. Including MX lookup and disposable email deny list}
+  spec.description   = 'ActiveModel validation for email. Including MX lookup and disposable email deny list'
+  spec.summary       = 'ActiveModel validation for email. Including MX lookup and disposable email deny list'
   spec.homepage      = "https://github.com/micke/valid_email2"
   spec.license       = "MIT"
 
@@ -27,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-benchmark", "~> 0.6"
   spec.add_development_dependency "net-smtp"
   spec.add_development_dependency "debug"
+  spec.add_development_dependency "rubocop"
   spec.add_runtime_dependency "mail", "~> 2.5"
   spec.add_runtime_dependency "activemodel", ">= 6.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: valid_email2
 version: !ruby/object:Gem::Version
-  version: 7.0.9
+  version: 7.0.11
 platform: ruby
 authors:
 - Micke Lisinge
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-14 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +161,8 @@ files:
 - ".github/workflows/release.yaml"
 - ".gitignore"
 - ".release-please-manifest.json"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -176,7 +191,6 @@ homepage: https://github.com/micke/valid_email2
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: ActiveModel validation for email. Including MX lookup and disposable email
   deny list