rack-tor-block 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2ZmMDlmYzk2MDBjMGM2ZjU1MTJjN2VlMTBiZTZlZTBiZjliYjc3Mw==
-  data.tar.gz: !binary |-
-    MmE2NWNkMjIwMGUzMWVkMGI1N2EwMzcyZWFhODQzNzc0N2U5NzQ5MQ==
+SHA1:
+  metadata.gz: 9280322a0acf1e973c97d21ae00e2628caf12365
+  data.tar.gz: f09f20716d64ea24ccf9b97d0a69333f25eaaed4
 SHA512:
-  metadata.gz: !binary |-
-    NGExNTdmZGJhZTgxMzc1ZTlmZmZjODE4NTM2OTE5YTNkYzJmZWE5OGE2NzBh
-    MjY2MmVjMjk3YjlkMDRkNjBiY2U3NGFhNTQ5MTU5NDNhZTFkOGM5MTBkMmYx
-    MjYyMmRkZGE0MjExYzlkZDA4OWY4MmI4ZWIxNjViYWQ1MzQ5ZDc=
-  data.tar.gz: !binary |-
-    YjE3MmIwMDIyZDAzZmU3MWEyOTMwMWQ0NzI2MDgwMmM1YjhkYWJiZTI0Zjk0
-    MDZlNTdhZWU3MjVjY2ZhNzM1YzEyODFhOWU1MDk3YzBlOWZlYWEzMzc5N2Q4
-    Y2I3MzZhMTgyMmYzZjdkY2ZmMDhmYjVlMDc1OWI0YjZiODc3Zjk=
+  metadata.gz: d22c46a7ae77eaffd35f23e0a7260fee876817439ae39bb375a773d84d17ce25f4b91a6ad75279d27255c6f1423f719eda02dc0afae40e75fdcd332885c0517c
+  data.tar.gz: 2cfc159f6cf645c640ca39d12394070ab1532b259553f4e54d2708602365cbbd394c55a68f107e465462ab0afaed960a1f3c24fef471a2230d48dc37ba88bef7

data/lib/rack/ip.rb

@@ -2,26 +2,25 @@ require 'resolv'
 
 module Rack
   class IP
-    
-    TOR_POSITIVE_IP = '127.0.0.2' #In case the DNS look up is positive, this is the IP address returned
-    TOR_DNSEL = 'ip-port.exitlist.torproject.org' #https://www.torproject.org/projects/tordnsel.html.en
-    
+    TOR_POSITIVE_IP = '127.0.0.2' # In case the DNS look up is positive, this is the IP address returned
+    TOR_DNSEL       = 'ip-port.exitlist.torproject.org' # https://www.torproject.org/projects/tordnsel.html.en
     GOOGLE_DNS_ADDR = '8.8.8.8'
     GOOGLE_DNS_PORT = '53'
-    
+
     # client_addr is the address of the remote client we want to test to be an TOR node
     # server_addr is the address of a public IP server we want to reach passing through client_addr
     # server_port is a TCP port running on server_addr to test for positiviness to TOR network
-    def initialize(client_addr, server_addr = GOOGLE_DNS_ADDR, server_port=GOOGLE_DNS_PORT)
+    def initialize(client_addr, server_addr = GOOGLE_DNS_ADDR, server_port = GOOGLE_DNS_PORT)
       @client_addr, @server_port, @server_addr = client_addr.to_s, server_port.to_s, server_addr.to_s
     end
-    
-    def is_tor? #Implements https://www.torproject.org/projects/tordnsel.html.en
+
+    # Implements https://www.torproject.org/projects/tordnsel.html.en
+    def tor?
       Resolv.getaddress(tor_hostname) == TOR_POSITIVE_IP
-    rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Resolv::ResolvError => e
+    rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Resolv::ResolvError
       false
     end
-    
+
     def tor_hostname
       [reverse_ip_octets(@client_addr), @server_port, reverse_ip_octets(@server_addr), TOR_DNSEL].join('.')
     end
@@ -29,6 +28,5 @@ module Rack
     def reverse_ip_octets(ip)
       ip.split('.').reverse.join('.')
     end
-    
   end
-end
+end

data/lib/rack/tor_block.rb

@@ -3,19 +3,36 @@ require 'rack/ip'
 
 module Rack
   class TorBlock
-    
-    DEFAULT_REDIRECT = 'https://sorry.google.com' #We're sorry from Google
+    DEFAULT_REDIRECT = 'https://sorry.google.com'.freeze # We're sorry from Google
+    GO_AWAY          = [302, { 'Content-Type' => 'text', 'Location' => DEFAULT_REDIRECT }, []].freeze
+    REMOTE_IP_KEY    = 'action_dispatch.remote_ip'.freeze
 
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      req = Rack::Request.new(env)
-      return [302, {'Content-Type' => 'text', 'Location' => DEFAULT_REDIRECT}, [] ] if Rack::IP.new(env['action_dispatch.remote_ip'] || req.ip).is_tor?
-        
-      #Normal processing
-      @app.call(env)
+      remote_ip = env[REMOTE_IP_KEY] || Rack::Request.new(env).ip
+      if tor?(remote_ip)
+        GO_AWAY
+      else
+        @app.call(env)
+      end
+    end
+
+    if defined? Rails
+      def tor?(remote_ip)
+        key = "tor/#{remote_ip}"
+        Rails.cache.fetch(key, expires_in: 10.minutes) do
+          Rack::IP.new(remote_ip).tor?
+        end
+      rescue # In case of cache failure
+        false
+      end
+    else
+      def tor?(remote_ip)
+        Rack::IP.new(remote_ip).tor?
+      end
     end
   end
-end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: rack-tor-block
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Luca Bonmassar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: Identify and prevent tor users to access a Rack / Rails application.
@@ -57,17 +57,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Prevent tor users to access a Rack / Rails application.