legitbot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09d1957d911120207a2518f7ddd87673fb780206'
-  data.tar.gz: 7a8acb9e1bca9d0f409d84055a029baadf9a6c03
+SHA256:
+  metadata.gz: 43121c17f4de712a7c1b33797c0075b31762ff31a1461a871efa486461acf0e2
+  data.tar.gz: b6d015e3889a421b3dbce8189489239894bbdf87f8a5677e0d612ece4655f973
 SHA512:
-  metadata.gz: 6372a1064b86b8a63e043fd0e737c5a87c394f0dd601bf96fe9d9d5945002ed286ce5f84928f3cfb7fb894d9cf3c7e7c970c6b4a59aef729f19100ffa484e4a1
-  data.tar.gz: c4538f8f81fdb71aa65dff43ea41c49c2bd51de9c664778bf2d86b7ca0483de614330dac32fde87db5933a2781e4e21fd6862e1b4ecf4d8be16c83932384f062
+  metadata.gz: 44dec432e5ba97bb28cefd59e6f800d363342360d10ae72cf69419124836ffcc115b780882e797ea2879e41217402c53b6bd8472a449343814f007d1ea9b6996
+  data.tar.gz: '091b35b6eccc08b4e4b083e8498084e3726534a7560e8626b47e0e9dbcaa5a469568b477429804b47a3c16848d506c856823e8809ee88fc70df0d10723507a9d'

data/legitbot.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
     "made by a real search engine, not a fake"
 
   spec.required_ruby_version = '>= 2.0.0'
-  spec.add_dependency "irrc"
+  spec.add_dependency "irrc", ">= 0.2.1"
   spec.add_dependency "segment_tree"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/lib/legitbot/facebook.rb

@@ -1,18 +1,31 @@
-require 'segment_tree'
-require 'irrc'
-require 'monitor'
 require 'ipaddr'
+require 'irrc'
+require 'segment_tree'
 
 module Legitbot
   # https://developers.facebook.com/docs/sharing/webmasters/crawler
 
   class Facebook < BotMatch
-    lock = Monitor.new
-
     AS = 'AS32934'
-    ValidIPs = lock.synchronize do
+
+    def valid?
+      ip = IPAddr.new(@ip)
+      Facebook.valid_ips[ip.ipv4? ? :ipv4 : :ipv6].find(ip)
+    end
+
+    @mutex = Mutex.new
+
+    def self.valid_ips
+      @mutex.synchronize { @ips ||= load_ips }
+    end
+
+    def self.reload!
+      @mutex.synchronize { @ips = load_ips }
+    end
+
+    def self.load_ips
       client = Irrc::Client.new
-      client.query :radb, 'AS32934'
+      client.query :radb, AS
       results = client.perform
 
       Hash[%i(ipv4 ipv6).map { |k|
@@ -21,11 +34,6 @@ module Legitbot
           })]
       }]
     end
-
-    def valid?
-      ip = IPAddr.new(@ip)
-      ValidIPs[ip.ipv4? ? :ipv4 : :ipv6].find(ip)
-    end
   end
 
   rule Legitbot::Facebook, %w(facebookhit facebookexternalhit)

data/lib/legitbot/version.rb

@@ -1,3 +1,3 @@
 module Legitbot
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legitbot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alexander Azarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irrc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: segment_tree
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Validate Web request was made by legitimate search engine