validators 3.2.1 → 3.3.0

data/lib/validators.rb

@@ -8,6 +8,7 @@ module Validators
   require "validators/tld"
   require "validators/hostname"
   require "validators/disposable_hostnames"
+  require "validators/disposable_emails"
   require "validators/reserved_subdomains"
 
   require "validators/validates_datetime"

data/lib/validators/constants.rb

@@ -2,7 +2,7 @@
 
 module Validators
   EMAIL_FORMAT = /\A[a-z0-9]+([-._][a-z0-9]+)*(\+[^@]+)?@[a-z0-9]+([.-][a-z0-9]+)*\.[a-z]{2,}\z/i.freeze
-  MICROSOFT_EMAIL_FORMAT = /\A[\w][\w\d._-]*[\w\d_-]+(\+[\w\d]+)?@(hotmail|outlook).com\z/i.freeze
+  MICROSOFT_EMAIL_FORMAT = /\A[a-z0-9][a-z0-9._-]*[a-z0-9_-]+(\+[a-z0-9]+)?@(hotmail|outlook).com\z/i.freeze
 
   # Source: https://github.com/henrik/validates_url_format_of
   IPV4_PART = /\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]/.freeze # 0-255

data/lib/validators/disposable_emails.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Validators
+  class DisposableEmails
+    FILE_PATH = File.expand_path("../../data/disposable_emails.txt", __dir__)
+
+    def self.all
+      @all ||= File.read(FILE_PATH).lines.map(&:chomp)
+    end
+
+    def self.include?(email)
+      mailbox, domain = email.to_s.split("@")
+      mailbox = mailbox.to_s.gsub(".", "")
+      mailbox = mailbox.gsub(/\+(.+)?\Z/, "")
+
+      all.include?("#{mailbox}@#{domain}")
+    end
+  end
+end

data/lib/validators/disposable_hostnames.rb

@@ -2,10 +2,10 @@
 
 module Validators
   class DisposableHostnames
-    FILE_PATH = File.expand_path("../../data/disposable.json", __dir__)
+    FILE_PATH = File.expand_path("../../data/disposable_domains.txt", __dir__)
 
     def self.all
-      @all ||= JSON.parse(File.read(FILE_PATH))
+      @all ||= File.read(FILE_PATH).lines.map(&:chomp)
     end
   end
 end

data/lib/validators/locale/en.yml

@@ -3,7 +3,8 @@ en:
   activemodel: &activemodel
     errors:
       messages:
-        disposable_email: "is not allowed (high-bounce domain)"
+        disposable_email: "is not allowed (high-bounce email)"
+        disposable_domain: "is not allowed (high-bounce domain)"
         invalid_cnpj: "is not a valid CNPJ"
         invalid_cpf: "is not a valid CPF"
         invalid_date: "is not a valid date"

data/lib/validators/locale/pt-BR.yml

@@ -4,6 +4,7 @@ pt-BR:
     errors:
       messages:
         disposable_email: "não é permitido (e-mail temporário)"
+        disposable_domain: "não é permitido (e-mail temporário)"
         invalid_cnpj: "não é um CNPJ válido"
         invalid_cpf: "não é um CPF válido"
         invalid_date: "não é uma data válida"

data/lib/validators/reserved_subdomains.rb

@@ -2,7 +2,7 @@
 
 module Validators
   class ReservedSubdomains
-    FILE_PATH = File.expand_path("../../data/reserved_subdomains.json", __dir__)
+    FILE_PATH = File.expand_path("../../data/reserved_subdomains.txt", __dir__)
 
     def self.reserved?(hostname, matchers = nil)
       matchers = parse_list(matchers) if matchers
@@ -11,9 +11,7 @@ module Validators
     end
 
     def self.all
-      @all ||= JSON
-               .parse(File.read(FILE_PATH))
-               .map {|matcher| parse(matcher) }
+      @all ||= File.read(FILE_PATH).lines.map {|matcher| parse(matcher.chomp) }
     end
 
     def self.parse(matcher)

data/lib/validators/tld.rb

@@ -2,10 +2,10 @@
 
 module Validators
   class TLD
-    FILE_PATH = File.expand_path("../../data/tld.json", __dir__)
+    FILE_PATH = File.expand_path("../../data/tld.txt", __dir__)
 
     def self.all
-      @all ||= JSON.parse(File.read(FILE_PATH))
+      @all ||= File.read(FILE_PATH).lines.map(&:chomp)
     end
 
     def self.host_with_valid_tld?(host)

data/lib/validators/validates_email_format_of.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "root_domain"
+
 module ActiveModel
   module Validations
     class EmailValidator < EachValidator
@@ -14,6 +16,7 @@ module ActiveModel
 
         validate_tld(record, attribute, value, options) if check_tld
         validate_email_format(record, attribute, value, options)
+        validate_disposable_domain(record, attribute, value, options) unless allow_disposable
         validate_disposable_email(record, attribute, value, options) unless allow_disposable
       end
 
@@ -41,12 +44,24 @@ module ActiveModel
         )
       end
 
-      def validate_disposable_email(record, attribute, value, _options)
+      def validate_disposable_domain(record, attribute, value, _options)
+        return unless value
+
         hostname = value.to_s.split(AT_SIGN).last.to_s.downcase
+        root_domain = RootDomain.call(hostname)
 
-        return if Validators::DisposableHostnames.all.none? do |disposable_hostname|
-          hostname == disposable_hostname || hostname.end_with?(".#{disposable_hostname}")
-        end
+        return unless Validators::DisposableHostnames.all.include?(root_domain)
+
+        record.errors.add(
+          attribute,
+          :disposable_domain,
+          value: value
+        )
+      end
+
+      def validate_disposable_email(record, attribute, value, _options)
+        return unless value
+        return unless Validators::DisposableEmails.include?(value)
 
         record.errors.add(
           attribute,

data/lib/validators/version.rb

@@ -3,8 +3,8 @@
 module Validators
   module Version
     MAJOR = 3
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/test_helper.rb

@@ -17,9 +17,25 @@ require "active_support/all"
 require "minitest/utils"
 require "minitest/autorun"
 
+def build_email_with_filter(email)
+  mailbox, domain = email.split("@")
+  "#{mailbox}+#{SecureRandom.hex(3)}@#{domain}"
+end
+
+def build_email_with_dots(email)
+  mailbox, domain = email.split("@")
+  new_mailbox = mailbox.chars.map {|char| [char, "."] }.flatten[0..-2].join
+
+  "#{new_mailbox}@#{domain}"
+end
+
 Time.zone = "America/Sao_Paulo"
 TLDs = Validators::TLD.all.sample(10)
-DISPOSABLE_EMAILS = Validators::DisposableHostnames.all.sample(10)
+DISPOSABLE_DOMAINS = Validators::DisposableHostnames.all.sample(10)
+DISPOSABLE_EMAILS = Validators::DisposableEmails.all +
+                    Validators::DisposableEmails.all.sample(10).map {|email| build_email_with_filter(email) } +
+                    Validators::DisposableEmails.all.sample(10).map {|email| build_email_with_dots(email) } +
+                    Validators::DisposableEmails.all.sample(10).map {|email| build_email_with_filter(build_email_with_dots(email)) }
 
 Dir[File.join(__dir__, "support/**/*.rb")].sort.each {|f| require f }
 

data/test/validators/disposable_email_test.rb

@@ -3,18 +3,19 @@
 require "test_helper"
 
 class DisposableEmailTest < Minitest::Test
-  DISPOSABLE_EMAILS.each do |domain|
-    test "rejects disposable e-mail (#{domain})" do
+  DISPOSABLE_DOMAINS.each do |domain|
+    test "rejects disposable domain (#{domain})" do
       User.validates_email_format_of :email
 
       user = User.new(email: "user@#{domain}")
       user.valid?
 
-      assert_includes user.errors[:email], I18n.t("activerecord.errors.messages.disposable_email")
+      assert_includes user.errors[:email],
+                      I18n.t("activerecord.errors.messages.disposable_domain")
     end
   end
 
-  DISPOSABLE_EMAILS.each do |domain|
+  DISPOSABLE_DOMAINS.each do |domain|
     test "rejects disposable e-mail with subdomain (custom.#{domain})" do
       User.validates_email_format_of :email
 
@@ -22,7 +23,7 @@ class DisposableEmailTest < Minitest::Test
       user.valid?
 
       assert_includes user.errors[:email],
-                      "is not allowed (high-bounce domain)"
+                      I18n.t("activerecord.errors.messages.disposable_domain")
     end
   end
 
@@ -34,4 +35,16 @@ class DisposableEmailTest < Minitest::Test
 
     assert user.errors[:email].empty?
   end
+
+  DISPOSABLE_EMAILS.each do |email|
+    test "rejects disposable e-mail (#{email})" do
+      User.validates_email_format_of :email
+
+      user = User.new(email: email)
+      user.valid?
+
+      assert_includes user.errors[:email],
+                      I18n.t("activerecord.errors.messages.disposable_email")
+    end
+  end
 end

data/test/validators/validates_email_format_of_test.rb

@@ -12,10 +12,12 @@ class ValidatesEmailFormatOfTest < Minitest::Test
   VALID_EMAILS.each do |email|
     test "accepts #{email.inspect} as a valid email" do
       user = User.new(email: email, corporate_email: email)
-      assert user.valid?
+      user.valid?
+      assert_empty user.errors
 
       user = Person.new(email: email)
-      assert user.valid?
+      user.valid?
+      assert_empty user.errors
     end
   end
 

data/validators.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "nokogiri"
   s.add_development_dependency "pry-meta"
   s.add_development_dependency "rake"
+  s.add_development_dependency "root_domain"
   s.add_development_dependency "rubocop"
   s.add_development_dependency "rubocop-fnando"
   s.add_development_dependency "simplecov"
@@ -35,4 +36,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "simpleidn"
   s.add_development_dependency "sqlite3", "~> 1.4"
   s.add_development_dependency "sshkey"
+  s.add_development_dependency "whois"
+  s.add_development_dependency "whois-parser"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validators
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: root_domain
+  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: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: whois
+  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: whois-parser
+  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'
 description: Add some nice ActiveModel/ActiveRecord validators.
 email:
 - fnando.vieira@gmail.com
@@ -237,46 +279,14 @@ files:
 - Rakefile
 - bin/sync-disposable-hostnames
 - bin/sync-tld
-- data/country_tlds.json
-- data/disposable.json
-- data/disposable/10minutemail.json
-- data/disposable/1secmail.json
-- data/disposable/FGRibreau_mailchecker.json
-- data/disposable/andreis_disposable_email_domains.json
-- data/disposable/clipmails.json
-- data/disposable/cs.json
-- data/disposable/emailfake.json
-- data/disposable/fake_email_generator.json
-- data/disposable/fnando_dafe542cac13f831bbf5521a55248116.json
-- data/disposable/gmailnator.json
-- data/disposable/guerrillamail.json
-- data/disposable/ically.json
-- data/disposable/itemp.json
-- data/disposable/ivolo_disposable_email_domains.json
-- data/disposable/jespernissen_disposable_maildomain_list.json
-- data/disposable/maxmalysh_disposable_emails.json
-- data/disposable/moakt.json
-- data/disposable/receivemail.json
-- data/disposable/sneakykiwi_LeagueCreatorPublic.json
-- data/disposable/tempemail.json
-- data/disposable/tempemails.json
-- data/disposable/tempmail.json
-- data/disposable/tempmail_io.json
-- data/disposable/tempmailaddress.json
-- data/disposable/tempomail.json
-- data/disposable/tempr.json
-- data/disposable/tmail.json
-- data/disposable/wesbos_burner_email_providers.json
-- data/disposable/willwhite_freemail.json
-- data/disposable/yepmail.json
-- data/disposable_emails.json
-- data/disposable_patterns.json
-- data/disposable_raw.json
-- data/reserved_subdomains.json
-- data/sld.json
-- data/tld.json
+- data/country_tlds.txt
+- data/disposable_domains.txt
+- data/disposable_emails.txt
+- data/reserved_subdomains.txt
+- data/tld.txt
 - lib/validators.rb
 - lib/validators/constants.rb
+- lib/validators/disposable_emails.rb
 - lib/validators/disposable_hostnames.rb
 - lib/validators/hostname.rb
 - lib/validators/ip.rb
@@ -333,7 +343,7 @@ homepage: http://rubygems.org/gems/validators
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -349,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Add some nice ActiveModel/ActiveRecord validators.
 test_files:

data/data/country_tlds.json

@@ -1,237 +0,0 @@
-[
-  "ad",
-  "ae",
-  "af",
-  "ag",
-  "ai",
-  "al",
-  "am",
-  "an",
-  "ao",
-  "aq",
-  "ar",
-  "as",
-  "at",
-  "au",
-  "aw",
-  "az",
-  "ba",
-  "bb",
-  "bd",
-  "be",
-  "bf",
-  "bg",
-  "bh",
-  "bi",
-  "bj",
-  "bm",
-  "bn",
-  "bo",
-  "br",
-  "bs",
-  "bt",
-  "bv",
-  "bw",
-  "by",
-  "bz",
-  "ca",
-  "cc",
-  "cd",
-  "cf",
-  "cg",
-  "ch",
-  "ci",
-  "ck",
-  "cl",
-  "cm",
-  "cn",
-  "co",
-  "cr",
-  "cu",
-  "cv",
-  "cx",
-  "cy",
-  "cz",
-  "de",
-  "dj",
-  "dk",
-  "dm",
-  "do",
-  "dz",
-  "ec",
-  "ee",
-  "eg",
-  "eh",
-  "er",
-  "es",
-  "et",
-  "fi",
-  "fj",
-  "fk",
-  "fr",
-  "ga",
-  "gb",
-  "gd",
-  "ge",
-  "gf",
-  "gh",
-  "gi",
-  "gl",
-  "gm",
-  "gn",
-  "gp",
-  "gq",
-  "gr",
-  "gs",
-  "gt",
-  "gu",
-  "gw",
-  "gy",
-  "hk",
-  "hm",
-  "hn",
-  "hr",
-  "ht",
-  "hu",
-  "id",
-  "ie",
-  "il",
-  "in",
-  "io",
-  "iq",
-  "ir",
-  "is",
-  "it",
-  "jm",
-  "jo",
-  "jp",
-  "ke",
-  "kg",
-  "kh",
-  "ki",
-  "km",
-  "kn",
-  "kp",
-  "kr",
-  "kw",
-  "ky",
-  "kz",
-  "la",
-  "lb",
-  "lc",
-  "li",
-  "lk",
-  "lr",
-  "ls",
-  "lt",
-  "lu",
-  "lv",
-  "ly",
-  "ma",
-  "mc",
-  "md",
-  "mg",
-  "mh",
-  "mk",
-  "ml",
-  "mm",
-  "mn",
-  "mo",
-  "mp",
-  "mq",
-  "mr",
-  "ms",
-  "mt",
-  "mu",
-  "mv",
-  "mw",
-  "mx",
-  "my",
-  "mz",
-  "na",
-  "nc",
-  "ne",
-  "nf",
-  "ng",
-  "ni",
-  "nl",
-  "no",
-  "np",
-  "nr",
-  "nu",
-  "nz",
-  "om",
-  "pa",
-  "pe",
-  "pf",
-  "pg",
-  "ph",
-  "pk",
-  "pl",
-  "pm",
-  "pn",
-  "pr",
-  "ps",
-  "pt",
-  "pw",
-  "py",
-  "qa",
-  "re",
-  "ro",
-  "ru",
-  "rw",
-  "sa",
-  "sb",
-  "sc",
-  "sd",
-  "se",
-  "sg",
-  "sh",
-  "si",
-  "sj",
-  "sk",
-  "sl",
-  "sm",
-  "sn",
-  "so",
-  "sr",
-  "ss",
-  "st",
-  "sv",
-  "sy",
-  "sz",
-  "tc",
-  "td",
-  "tf",
-  "tg",
-  "th",
-  "tj",
-  "tk",
-  "tl",
-  "tm",
-  "tn",
-  "to",
-  "tr",
-  "tt",
-  "tv",
-  "tz",
-  "ua",
-  "ug",
-  "us",
-  "uy",
-  "uz",
-  "va",
-  "vc",
-  "ve",
-  "vg",
-  "vi",
-  "vn",
-  "vu",
-  "wf",
-  "ws",
-  "ye",
-  "yt",
-  "za",
-  "zm",
-  "zw"
-]