legitbot 1.4.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb1ad3043aa5d9c87f6417fa287121cc5ec37fe1fcb6b043f9e6ee9a88ec771
-  data.tar.gz: 01764d6f90fd4f72751d18ea17d4f6921103ba2e050fe8f179d13d889d920347
+  metadata.gz: df2907ab34b159613adf21c3301607f53fa893e0823f81560e45ad2c8303075b
+  data.tar.gz: fe913e9b72878969839326da227c1169ad8234a8ae335e276f614b53e5777d42
 SHA512:
-  metadata.gz: '0269f1dd308855bb4dd15e82601dba739b2f77bfb2777d802f4b813b0a73d31f052e3f75cbc26812589a3816aefe6d49c9b9ab20b59b229a346c4d8da27b46a5'
-  data.tar.gz: 1e2f8e9e5e7ae7812df3016e6f0c6e45af9f4b60d67512f9678be1437ccbc8dcf55ae1fbeb404274d03b80c32e6bc8e7678b22654c089900b11f2681fc090b73
+  metadata.gz: f8af647da764cd722f27f2936f8f9728f9cdd7b313e295d9c80ebe7144a601a5360f5b615039d5afe75f7ded891e3bfc06292383e9e41e342977d39f1e485dab
+  data.tar.gz: 74e3dd5cb2c4d2e7df717c6bb3a072c74aa51b922f7f71d280cde82387ba458d30970f85c4f79508852ef5c2969196bd640427bf2323104229616960314fb9df

data/.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ jruby, 2.5, 2.6, 2.7 ]
+        ruby: [ jruby, 2.6, 2.7, 3.0 ]
 
     steps:
     - uses: actions/checkout@v2
@@ -41,7 +41,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [ 2.7 ]
+        ruby: [ 3.0 ]
 
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -1,3 +1,6 @@
+require:
+- rubocop-minitest
+
 AllCops:
   CacheRootDirectory: 'vendor'
   NewCops: enable
@@ -8,3 +11,6 @@ Gemspec/RequiredRubyVersion:
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false
+
+Style/MapToHash:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+3.0.3

data/README.md

@@ -39,10 +39,18 @@ Rack::Attack.blocklist 'fake search engines' do |request|
 end
 ```
 
+## Versioning
+
+[Semantic versioning](https://semver.org/) with the following clarifications:
+
+* MINOR version is incremented when support for new bots is added.
+* PATCH version is incremented when validation logic for a bot changes (IP list updated, for example).
+
 ## Supported
 
 * [Ahrefs](https://ahrefs.com/robot)
 * [Alexa](https://support.alexa.com/hc/en-us/articles/360046707834-What-are-the-IP-addresses-for-Alexa-s-Certify-and-Site-Audit-crawlers-)
+* [Amazon AdBot](https://adbot.amazon.com/index.html)
 * [Applebot](https://support.apple.com/en-us/HT204683)
 * [Baidu spider](http://help.baidu.com/question?prod_en=master&class=498&id=1000973)
 * [Bingbot](https://blogs.bing.com/webmaster/2012/08/31/how-to-verify-that-bingbot-is-bingbot/)
@@ -59,7 +67,7 @@ end
 
 Apache 2.0
 
-## References
+## Other projects
 
 * Play Framework variant in Scala: [play-legitbot](https://github.com/osinka/play-legitbot)
 * Article [When (Fake) Googlebots Attack Your Rails App](http://jessewolgamott.com/blog/2015/11/17/when-fake-googlebots-attack-your-rails-app/)
@@ -72,3 +80,5 @@ Apache 2.0
   classify IP as a search engine, but also label them as suspicious and
   reports the number of days since the last activity. My implementation of
   the protocol in Scala is [here](https://github.com/osinka/httpbl).
+* [CIDRAM](https://github.com/CIDRAM/CIDRAM) is a PHP routing manager with built-in support
+  to validate bots.

data/Rakefile

@@ -1,25 +1 @@
 # frozen_string_literal: true
-
-require 'rubygems'
-require 'bundler'
-require 'bump/tasks'
-require 'rake/testtask'
-Bundler::GemHelper.install_tasks
-
-Bump.tag_by_default = true
-
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
-  t.warning = true
-  t.verbose = true
-end
-
-desc 'Start a console'
-task :console do
-  require 'irb'
-  ARGV.clear
-  IRB.start
-end
-
-task default: %w[test]

data/legitbot.gemspec

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'English'
+
 $LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'legitbot/version'
 
@@ -13,16 +15,22 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/alaz/legitbot'
   spec.summary = 'Validate requests from Web crawlers: impersonating or not?'
   spec.description = 'Does Web request come from a real search engine or from an impersonating agent?'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 
-  spec.required_ruby_version = '>= 2.5.0'
-  spec.add_dependency 'augmented_interval_tree', '~> 0.1', '>= 0.1.1'
+  spec.required_ruby_version = '>= 2.6.0'
+  spec.add_dependency 'fast_interval_tree', '~> 0.2', '>= 0.2.2'
   spec.add_dependency 'irrc', '~> 0.2', '>= 0.2.1'
   spec.add_development_dependency 'bump', '~> 0.8', '>= 0.8.0'
+  spec.add_development_dependency 'dns_mock', '~> 1.5.0', '>= 1.5.0'
   spec.add_development_dependency 'minitest', '~> 5.1', '>= 5.1.0'
+  spec.add_development_dependency 'minitest-hooks', '~> 1.5', '>= 1.5.0'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.0'
-  spec.add_development_dependency 'rubocop', '~> 1.22.0', '>= 1.22.0'
+  spec.add_development_dependency 'rubocop', '~> 1.24.0', '>= 1.24.0'
+  spec.add_development_dependency 'rubocop-minitest', '~> 0.17.0', '>= 0.17.0'
 
   spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.rdoc_options = ['--charset=UTF-8']
-  spec.test_files = Dir.glob('test/**/*')
+  spec.test_files = Dir.glob('test/**/*').reject { |f| f.start_with? 'test/lib' }
 end

data/lib/legitbot/amazon.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Legitbot # :nodoc:
+  # https://adbot.amazon.com/index.html
+  class Amazon < BotMatch
+    domains 'amazonadbot.com.'
+  end
+
+  rule Legitbot::Amazon, %w[AmazonAdBot]
+end

data/lib/legitbot/duckduckgo.rb

@@ -5,16 +5,17 @@ module Legitbot # :nodoc:
   class DuckDuckGo < BotMatch
     ip_ranges %w[
       20.191.45.212
-      23.21.227.69
       40.88.21.235
-      50.16.241.113
-      50.16.241.114
-      50.16.241.117
-      50.16.247.234
-      52.5.190.19
-      52.204.97.54
-      54.197.234.188
-      54.208.100.253
+      40.76.173.151
+      40.76.163.7
+      20.185.79.47
+      52.142.26.175
+      20.185.79.15
+      52.142.24.149
+      40.76.162.208
+      40.76.163.23
+      40.76.162.191
+      40.76.162.247
       54.208.102.37
       107.21.1.8
     ]

data/lib/legitbot/validators/domains.rb

@@ -64,6 +64,8 @@ module Legitbot
           return nil if record.nil?
 
           resolver.getaddress(record.to_s).to_s
+        rescue Resolv::ResolvError
+          nil
         end
       end
     end

data/lib/legitbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Legitbot
-  VERSION = '1.4.5'
+  VERSION = '1.6.0'
 end

data/lib/legitbot.rb

@@ -5,6 +5,7 @@ require_relative 'legitbot/botmatch'
 
 require_relative 'legitbot/ahrefs'
 require_relative 'legitbot/alexa'
+require_relative 'legitbot/amazon'
 require_relative 'legitbot/apple'
 require_relative 'legitbot/baidu'
 require_relative 'legitbot/bing'

data/rakelib/bump.rake

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'bump/tasks'
+
+Bump.tag_by_default = true

data/rakelib/bundler.rake

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/rakelib/console.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+desc 'Start a console'
+task :console do
+  require 'irb'
+  ARGV.clear
+  IRB.start
+end

data/rakelib/test.rake

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.warning = true
+  t.verbose = true
+end
+
+task default: %w[test]

data/test/ahrefs_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class AhrefsTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Ahrefs.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Ahrefs IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '54.36.148.0'
     match = Legitbot::Ahrefs.new ip
-    assert match.valid?, msg: "#{ip} is a valid Ahrefs IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +26,8 @@ class AhrefsTest < Minitest::Test
       'Mozilla/5.0 (compatible; AhrefsBot/6.1; +http://ahrefs.com/robot/)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Ahrefs detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Ahrefs'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,7 +35,7 @@ class AhrefsTest < Minitest::Test
       'Mozilla/5.0 (compatible; AhrefsBot/6.1; +http://ahrefs.com/robot/)',
       '54.36.148.0'
     )
-    assert bot, msg: 'Ahrefs detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Ahrefs'
+    assert bot
+    assert bot.valid?
   end
 end

data/test/alexa_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class AlexaTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Alexa.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Alexa IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '52.86.176.3'
     match = Legitbot::Alexa.new ip
-    assert match.valid?, msg: "#{ip} is a valid Alexa IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +26,8 @@ class AlexaTest < Minitest::Test
       'Mozilla/5.0 (compatible; Alexabot/1.0; +http://www.alexa.com/help/certifyscan; certifyscan@alexa.com)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Alexa detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Alexa'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,7 +35,7 @@ class AlexaTest < Minitest::Test
       'Mozilla/5.0 (compatible; Alexabot/1.0; +http://www.alexa.com/help/certifyscan; certifyscan@alexa.com)',
       '52.86.176.3'
     )
-    assert bot, msg: 'Alexa detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Alexa'
+    assert bot
+    assert bot.valid?
   end
 end

data/test/amazon_test.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
+require 'legitbot'
+
+class AmazonTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
+  def test_malicious_ip
+    ip = '149.210.164.47'
+    match = Legitbot::Amazon.new ip
+    refute match.valid?
+  end
+
+  def test_valid_ip
+    ip = '54.166.7.90'
+    match = Legitbot::Amazon.new ip
+    assert match.valid?
+  end
+
+  def test_malicious_ua
+    bot = Legitbot.bot(
+      'Mozilla/5.0 (compatible; AmazonAdBot/1.0; +https://adbot.amazon.com)',
+      '149.210.164.47'
+    )
+    assert bot
+    refute bot.valid?
+  end
+
+  def test_valid_ua
+    bot = Legitbot.bot(
+      'Mozilla/5.0 (compatible; AmazonAdBot/1.0; +https://adbot.amazon.com)',
+      '54.166.7.90'
+    )
+    assert bot
+    assert bot.valid?
+  end
+
+  def test_valid_name
+    bot = Legitbot.bot(
+      'Mozilla/5.0 (compatible; AmazonAdBot/1.0; +https://adbot.amazon.com)',
+      '54.166.7.90'
+    )
+    assert_equal :amazon, bot.detected_as
+  end
+
+  def test_fake_name
+    bot = Legitbot.bot(
+      'Mozilla/5.0 (compatible; AmazonAdBot/1.0; +https://adbot.amazon.com)',
+      '81.1.172.108'
+    )
+    assert_equal :amazon, bot.detected_as
+  end
+end

data/test/apple_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class AppleTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_valid_ip
     ip = '17.58.98.60'
     match = Legitbot::Apple.new(ip)
-    assert match.valid?, msg: "#{ip} is a valid Applebot IP"
+    assert match.valid?
   end
 
   def test_invalid_ip
     ip = '127.0.0.1'
     match = Legitbot::Apple.new(ip)
-    assert match.fake?, msg: "#{ip} is a fake Applebot IP"
+    assert match.fake?
   end
 
   # rubocop:disable Layout/LineLength
@@ -23,7 +28,7 @@ class AppleTest < Minitest::Test
       '17.58.98.60'
     )
     assert_equal :apple, bot.detected_as
-    assert bot.valid?, msg: 'A valid Applebot User-agent and IP'
+    assert bot.valid?
   end
   # rubocop:enable Layout/LineLength
 end

data/test/botmatch_test.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class BotMatchTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_valid_class_syntax
-    assert Legitbot::Google.valid?('66.249.64.141'), msg: 'Valid Googlebot'
-    assert Legitbot::Google.fake?('149.210.164.47'), msg: 'Fake Googlebot'
+    assert Legitbot::Google.valid?('66.249.64.141')
+    assert Legitbot::Google.fake?('149.210.164.47')
   end
 end

data/test/facebook_test.rb

@@ -20,44 +20,48 @@ class FacebookTest < Minitest::Test
   def test_valid_ip
     ip = '69.63.186.89'
     match = Legitbot::Facebook.new(ip)
-    assert match.valid?, msg: "#{ip} is a valid Facebook IP"
+    assert match.valid?
 
     ip = '69.171.251.1'
     match = Legitbot::Facebook.new(ip)
-    assert match.valid?, msg: "#{ip} is a valid Facebook IP"
+    assert match.valid?
   end
 
   def test_invalid_ip
     ip = '127.0.0.1'
     match = Legitbot::Facebook.new(ip)
-    assert match.fake?, msg: "#{ip} is a fake Facebook IP"
+    assert match.fake?
   end
 
-  # rubocop:disable Layout/LineLength, Metrics/MethodLength
-  def test_user_agent
+  def test_user_agent1
     Legitbot.bot(
       'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)',
       '31.13.76.56'
     ) do |bot|
       assert_equal :facebook, bot.detected_as
-      assert bot.valid?, msg: 'true Facebook'
+      assert bot.valid?
     end
+  end
 
+  def test_user_agent2
     Legitbot.bot(
       'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)',
       '173.252.87.8'
     ) do |bot|
       assert_equal :facebook, bot.detected_as
-      assert bot.valid?, msg: 'true Facebook'
+      assert bot.valid?
     end
+  end
 
+  # rubocop:disable Layout/LineLength
+  def test_user_agent3
     Legitbot.bot(
       'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/601.2.4 (KHTML, like Gecko) Version/9.0.1 Safari/601.2.4 facebookexternalhit/1.1 Facebot Twitterbot/1.0',
       '92.243.181.7'
     ) do |bot|
-      assert %i[facebook twitter].include?(bot.detected_as)
-      assert bot.fake?, msg: 'fake Facebook'
+      assert_includes %i[facebook twitter], bot.detected_as
+      assert bot.fake?
     end
   end
-  # rubocop:enable Layout/LineLength, Metrics/MethodLength
+  # rubocop:enable Layout/LineLength
 end

data/test/google_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class GoogleTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Google.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Googlebot IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '66.249.64.141'
     match = Legitbot::Google.new ip
-    assert match.valid?, msg: "#{ip} is a valid Googlebot IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +26,8 @@ class GoogleTest < Minitest::Test
       'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Googlebot detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Googlebot'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,8 +35,8 @@ class GoogleTest < Minitest::Test
       'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)',
       '66.249.64.141'
     )
-    assert bot, msg: 'Googlebot detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Googlebot'
+    assert bot
+    assert bot.valid?
   end
 
   def test_valid_name

data/test/legitbot/validators/ip_ranges_test.rb

@@ -4,6 +4,7 @@ require 'minitest/autorun'
 require 'legitbot'
 
 module Legitbot
+  # rubocop:disable Minitest/MultipleAssertions
   module Validators
     class NoRanges
       include IpRanges
@@ -128,4 +129,5 @@ module Legitbot
       end
     end
   end
+  # rubocop:enable Minitest/MultipleAssertions
 end

data/test/legitbot_test.rb

@@ -5,10 +5,8 @@ require 'legitbot'
 
 class LegitbotTest < Minitest::Test
   def test_rules
-    assert !Legitbot.bot('Firefox', '127.0.0.1'),
-           msg: 'Not a bot'
-    assert Legitbot.bot('Googlebot', '5.140.70.64'),
-           msg: 'No reverse resolve, bot'
+    refute Legitbot.bot('Firefox', '127.0.0.1')
+    assert Legitbot.bot('Googlebot', '5.140.70.64')
 
     Legitbot.bot('Firefox', '127.0.0.1') do |_bot|
       flunk 'No bot Firefox is possible'

data/test/lib/dns_server_mock.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require 'dns_mock'
+require 'json'
+
+TEST_DNS_RECORDS = {
+  # Malicious
+  '149.210.164.47' => {
+    ptr: %w[malicious.spam.co]
+  },
+
+  # Ahrefs
+  'ip-54-36-148-0.a.ahrefs.com' => {
+    a: %w[54.36.148.0]
+  },
+  '54.36.148.0' => {
+    ptr: %w[ip-54-36-148-0.a.ahrefs.com]
+  },
+
+  # Alexa
+  '52.86.176.3' => {
+    ptr: %w[crawl-52-86-176-3.alexa.com]
+  },
+
+  # Amazon
+  'crawler-54-166-7-90.amazonadbot.com' => {
+    a: %w[54.166.7.90]
+  },
+  '54.166.7.90' => {
+    ptr: %w[crawler-54-166-7-90.amazonadbot.com]
+  },
+
+  # Apple
+  '17-58-98-60.applebot.apple.com' => {
+    a: %w[17.58.98.60]
+  },
+  '17.58.98.60' => {
+    ptr: %w[17-58-98-60.applebot.apple.com]
+  },
+
+  # Google
+  'crawl-66-249-64-141.googlebot.com' => {
+    a: %w[66.249.64.141]
+  },
+  '66.249.64.141' => {
+    ptr: %w[crawl-66-249-64-141.googlebot.com]
+  },
+
+  # Petalbot
+  'petalbot-114-119-134-10.petalsearch.com' => {
+    a: %w[114.119.134.10]
+  },
+  '114.119.134.10' => {
+    ptr: %w[petalbot-114-119-134-10.petalsearch.com]
+  },
+
+  # Pinterest
+  'crawl-54-236-1-11.pinterest.com' => {
+    a: %w[54.236.1.11]
+  },
+  '54.236.1.11' => {
+    ptr: %w[crawl-54-236-1-11.pinterest.com]
+  }
+}.freeze
+
+class DnsServer
+  class << self
+    attr_accessor :mock
+  end
+
+  @mock = DnsMock.start_server records: TEST_DNS_RECORDS
+end
+
+module DnsServerMock
+  def before_all
+    super
+
+    Legitbot.resolver_config = {
+      nameserver: 'localhost',
+      nameserver_port: [['localhost', DnsServer.mock.port]]
+    }
+  end
+
+  def after_all
+    Legitbot.resolver_config = nil
+
+    super
+  end
+end

data/test/oracle_test.rb

@@ -7,13 +7,13 @@ class OracleTest < Minitest::Test
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Oracle.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Oracle IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '148.64.56.64'
     match = Legitbot::Oracle.new ip
-    assert match.valid?, msg: "#{ip} is a valid Oracle IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +21,8 @@ class OracleTest < Minitest::Test
       'Mozilla/5.0 (compatible; GrapeshotCrawler/2.0; +http://www.grapeshot.co.uk/crawler.php)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Oracle detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Oracle'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,7 +30,7 @@ class OracleTest < Minitest::Test
       'Mozilla/5.0 (compatible; GrapeshotCrawler/2.0; +http://www.grapeshot.co.uk/crawler.php)',
       '148.64.56.64'
     )
-    assert bot, msg: 'Oracle detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Oracle'
+    assert bot
+    assert bot.valid?
   end
 end

data/test/petalbot_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class PetalbotTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Petalbot.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Petalbot IP"
+    refute match.valid?
   end
 
   def test_valid_ip
-    ip = '114.119.128.10'
+    ip = '114.119.134.10'
     match = Legitbot::Petalbot.new ip
-    assert match.valid?, msg: "#{ip} is a valid Petalbot IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,17 +26,17 @@ class PetalbotTest < Minitest::Test
       'Mozilla/5.0 (compatible;PetalBot; +https://aspiegel.com/petalbot)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Petalbot detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Petalbot'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
     bot = Legitbot.bot(
       'Mozilla/5.0 (compatible;PetalBot; +https://aspiegel.com/petalbot)',
-      '114.119.128.10'
+      '114.119.134.10'
     )
-    assert bot, msg: 'Petalbot detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Petalbot'
+    assert bot
+    assert bot.valid?
   end
 
   def test_valid_name

data/test/pinterest_test.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 require 'minitest/autorun'
+require 'minitest/hooks/test'
+require 'lib/dns_server_mock'
 require 'legitbot'
 
 class PinterestTest < Minitest::Test
+  include Minitest::Hooks
+  include DnsServerMock
+
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Pinterest.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Pinterest IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '54.236.1.11'
     match = Legitbot::Pinterest.new ip
-    assert match.valid?, msg: "#{ip} is a valid Pinterest IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +26,8 @@ class PinterestTest < Minitest::Test
       'Mozilla/5.0 (compatible; Pinterestbot/1.0; +https://www.pinterest.com/bot.html)',
       '149.210.164.47'
     )
-    assert bot, msg: 'Pinterest detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Pinterest'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,8 +35,8 @@ class PinterestTest < Minitest::Test
       'Mozilla/5.0 (compatible; Pinterestbot/1.0; +https://www.pinterest.com/bot.html)',
       '54.236.1.11'
     )
-    assert bot, msg: 'Pinterest detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Pinterest'
+    assert bot
+    assert bot.valid?
   end
 
   # rubocop:disable Layout/LineLength

data/test/twitter_test.rb

@@ -7,13 +7,13 @@ class TwitterTest < Minitest::Test
   def test_malicious_ip
     ip = '149.210.164.47'
     match = Legitbot::Twitter.new ip
-    assert !match.valid?, msg: "#{ip} is not a real Twitter IP"
+    refute match.valid?
   end
 
   def test_valid_ip
     ip = '199.16.156.125'
     match = Legitbot::Twitter.new ip
-    assert match.valid?, msg: "#{ip} is a valid Twitter IP"
+    assert match.valid?
   end
 
   def test_malicious_ua
@@ -21,8 +21,8 @@ class TwitterTest < Minitest::Test
       'Twitterbot/1.0',
       '149.210.164.47'
     )
-    assert bot, msg: 'Twitter detected from User-Agent'
-    assert !bot.valid?, msg: 'Not a valid Twitter'
+    assert bot
+    refute bot.valid?
   end
 
   def test_valid_ua
@@ -30,7 +30,7 @@ class TwitterTest < Minitest::Test
       'Twitterbot/1.0',
       '199.16.156.125'
     )
-    assert bot, msg: 'Twitter detected from User-Agent'
-    assert bot.valid?, msg: 'Valid Twitter'
+    assert bot
+    assert bot.valid?
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: legitbot
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.6.0
 platform: ruby
 authors:
 - Alexander Azarov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: augmented_interval_tree
+  name: fast_interval_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: irrc
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: dns_mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +110,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,20 +156,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.24.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.24.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.24.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.0
 description: Does Web request come from a real search engine or from an impersonating
   agent?
 email: self@alaz.me
@@ -150,6 +210,7 @@ files:
 - lib/legitbot.rb
 - lib/legitbot/ahrefs.rb
 - lib/legitbot/alexa.rb
+- lib/legitbot/amazon.rb
 - lib/legitbot/apple.rb
 - lib/legitbot/baidu.rb
 - lib/legitbot/bing.rb
@@ -167,8 +228,13 @@ files:
 - lib/legitbot/validators/ip_ranges.rb
 - lib/legitbot/version.rb
 - lib/legitbot/yandex.rb
+- rakelib/bump.rake
+- rakelib/bundler.rake
+- rakelib/console.rake
+- rakelib/test.rake
 - test/ahrefs_test.rb
 - test/alexa_test.rb
+- test/amazon_test.rb
 - test/apple_test.rb
 - test/botmatch_test.rb
 - test/facebook_test.rb
@@ -176,6 +242,7 @@ files:
 - test/legitbot/validators/domains_test.rb
 - test/legitbot/validators/ip_ranges_test.rb
 - test/legitbot_test.rb
+- test/lib/dns_server_mock.rb
 - test/oracle_test.rb
 - test/petalbot_test.rb
 - test/pinterest_test.rb
@@ -183,7 +250,8 @@ files:
 homepage: https://github.com/alaz/legitbot
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
@@ -193,28 +261,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: 'Validate requests from Web crawlers: impersonating or not?'
 test_files:
-- test/legitbot_test.rb
-- test/legitbot/validators/domains_test.rb
-- test/legitbot/validators/ip_ranges_test.rb
-- test/pinterest_test.rb
-- test/alexa_test.rb
 - test/ahrefs_test.rb
+- test/alexa_test.rb
+- test/amazon_test.rb
 - test/apple_test.rb
-- test/oracle_test.rb
-- test/google_test.rb
-- test/petalbot_test.rb
 - test/botmatch_test.rb
 - test/facebook_test.rb
+- test/google_test.rb
+- test/legitbot/validators/domains_test.rb
+- test/legitbot/validators/ip_ranges_test.rb
+- test/legitbot_test.rb
+- test/oracle_test.rb
+- test/petalbot_test.rb
+- test/pinterest_test.rb
 - test/twitter_test.rb