rack-tor-tag 0.0.8 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59a4cbd60e309620eea960e00f83f5ae114c2aa
-  data.tar.gz: 5075c358be74b10b6bc01087b452788bf6de4578
+  metadata.gz: 027ae09603e859442444675a51ceecb2ec6818d8
+  data.tar.gz: 901771003822ee99803fa46d2abb6a9f23ceed26
 SHA512:
-  metadata.gz: 0af76ffd97eb6a7022f4c461db123898b028c12b54f9e9e65476ea5c29386f7998c953eee619be4ff4cf6c537b2112054c01d29ea77c9daedfb114cbe2107b11
-  data.tar.gz: 7f699f4fd478e2267327b80f7c495f627f06a2a4b828a2674f65909b903406241a418c3155876b771eeef4014a8bff08679f84880d9a87ed4a46a16ef3601a99
+  metadata.gz: c6ceb3d63d987ba465055f7e74c74b011ad970e5b4b9df33a800d92db5ea5d1e671c9e13d86f2930306fad9b913f9d73dcc773353673fdb5e09b8addeb531847
+  data.tar.gz: 17f69f2a315d5b2ff02e9660521c5ffe2defe07e2b0f75120f8a3628f83db77732c87034c256b9cb565365b5f5145619857ed2e80b6df202cb0097e10106d761

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
-    cucumber (1.3.11)
+    cucumber (1.3.13)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     descendants_tracker (0.0.3)
     diff-lcs (1.2.5)
     docile (1.1.3)
@@ -39,9 +39,9 @@ GEM
     json (1.8.1)
     jwt (0.1.11)
       multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    multi_json (1.9.0)
-    multi_test (0.0.3)
+    mini_portile (0.5.3)
+    multi_json (1.9.2)
+    multi_test (0.1.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.1)
@@ -53,7 +53,7 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.2.0)
     rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.1.1

data/lib/rack/tor_tag.rb

@@ -1,6 +1,9 @@
 require 'rack'
 require 'resolv'
 
+# Not in rbx. See https://github.com/rubinius/rubinius/issues/2303
+RESOLV_WORKS = Socket.methods.include?(:ip_address_list)
+
 module Rack
   class TorTag
     DEFAULT_PARAMS = {
@@ -14,6 +17,8 @@ module Rack
     def initialize(app, params = {})
       @app = app
       @params = DEFAULT_PARAMS.merge(params)
+      puts "rack-tor-tag initialized: #{app} - #{params}"
+      # raise ArgumentError, "Must pass :host_ips" unless RESOLV_WORKS
     end
 
     def call(env)
@@ -44,18 +49,29 @@ module Rack
     def is_tor? ip, env
       # We're a hidden service! Of course it's Tor.
       return true if env['HTTP_HOST'] =~ /\.onion\z/
-      return false if (ip == 'localhost') or (env['HTTP_HOST'] == 'localhost')
+      return false if (['localhost','127.0.0.1'].include? ip) or (['localhost','127.0.0.1'].include? env['HTTP_HOST'])
+
+      host_ips = @params[:host_ips]
 
-      host_ips = @params[:host_ips] || Resolv.getaddresses(
-        env['HTTP_HOST'] ? env['HTTP_HOST'].sub(/:.*/,'') : env['SERVER_NAME']).
-      select{|i| i[Resolv::IPv4::Regex]} # DNEL only works with IPv4
+      if RESOLV_WORKS
+        addrs = (env['HTTP_HOST'] ? env['HTTP_HOST'].sub(/:.*/,'') : env['SERVER_NAME'])
+        host_ips ||= Resolv.getaddresses(addrs).select{
+          |i| i[Resolv::IPv4::Regex] # DNEL only works with IPv4
+        }
+      else
+        raise ArgumentError, "Socket.ip_address_list is missing, so you must pass :host_ips" unless host_ips
+      end
 
       host_ips.each do |host_ip|
-        tor_hostname = [reverse_ip_octets(ip), @params[:host_port] || env['SERVER_PORT'], reverse_ip_octets(host_ip), @params[:dnsel]].join('.')
-        begin
-          return true if (Resolv.getaddress(tor_hostname) == '127.0.0.2')
-        rescue Resolv::ResolvError => e
-          false # It's supposed to not get a response if it's not a tor host
+        tor_hostname = [reverse_ip_octets(ip), @params[:host_port] || env['SERVER_PORT'].to_i, reverse_ip_octets(host_ip), @params[:dnsel]].join('.')
+        if RESOLV_WORKS
+          begin
+            return true if (Resolv.getaddress(tor_hostname) == '127.0.0.2')
+          rescue Resolv::ResolvError => e
+            false # It's supposed to not get a response if it's not a tor host
+          end
+        else # try what we can...
+          return true if (`dig A +short #{tor_hostname}`.to_s.strip == '127.0.0.2')
         end
       end
       false
@@ -65,7 +81,7 @@ module Rack
     end
 
     def reverse_ip_octets(ip)
-      ip.to_s.split('.').reverse.join('.')
+      ip.to_s.split('.').map(&:to_i).reverse.join('.')
     end
   end
 end

data/rack-tor-tag.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-tor-tag 0.0.8 ruby lib
+# stub: rack-tor-tag 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-tor-tag"
-  s.version = "0.0.8"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Sai"]
-  s.date = "2014-03-12"
+  s.date = "2014-03-25"
   s.description = "Mark Tor users using rack, for filtering / throttling / etc"
   s.email = "github@saizai.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-tor-tag
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.1
 platform: ruby
 authors:
 - Sai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec