rack-detect-tor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7963c9ae710b9b5f9a6b47ea251aa6bddc644aac
-  data.tar.gz: 45b6a0b4c6c9d3a2c6ed6a57b6c088b7b4bd6fa6
+  metadata.gz: ca95a72a1819a0419c4eb93a4f4fd21ffd46167f
+  data.tar.gz: 5ebe2469cb14b0306f989c942c2ea8a3f9b64857
 SHA512:
-  metadata.gz: 35a6e8440ae33e266e6f7d70259f3aab97185fc6251b66b6d724740ea7cbc843be81442f5924883fcd3b27e66cd8ecbaa903994b8ef38445b5ec5932559b3d81
-  data.tar.gz: 9edc60fbfb0c4698b061a81dbd0ec01b282caf37502113cb330cb0886cde470852fb7ba8f381a93e5ec3d52cb2cd700bb46687565473976196a196a7f46ec441
+  metadata.gz: 9299cf11e242970a1f9a7b08ce8b127f6373c7cf1bb6902d1b2481f2e9d6a2c85a5cd8eb536acc88ac22f3fc15bfc711e0b2ff098adb1ada2de7052501f347c0
+  data.tar.gz: c2b87df5d9c00998f6267205dbd8917aa1f6d97ce7d5c17904336c7cc265745a14dbdb393d9074e9080466d3a93305c4631f893eb5026e41973dd3e90b11e93e

data/lib/rack-detect-tor.rb

@@ -26,7 +26,7 @@ module Rack
     end
 
     def call(env)
-      env['tor_exit_user'] = @tor_exits.include? env['REMOTE_ADDR']
+      env['tor_exit_user'] = @tor_exits.include? request_ip(env)
       @app.call(env)
     end
 
@@ -81,5 +81,30 @@ module Rack
       $stderr.puts "Rack::DetectTor [#{@identifier}]: ERROR: #{message}"
     end
 
+    # below yanked from https://github.com/rack/rack/blob/master/lib/rack/request.rb
+
+    def request_ip(env)
+      remote_addrs = split_ip_addresses(env['REMOTE_ADDR'])
+      remote_addrs = reject_trusted_ip_addresses(remote_addrs)
+
+      return remote_addrs.first if remote_addrs.any?
+
+      forwarded_ips = split_ip_addresses(env['HTTP_X_FORWARDED_FOR'])
+
+      return reject_trusted_ip_addresses(forwarded_ips).last || env["REMOTE_ADDR"]
+    end
+
+    def trusted_proxy?(ip)
+      ip =~ /\A127\.0\.0\.1\Z|\A(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.|\A::1\Z|\Afd[0-9a-f]{2}:.+|\Alocalhost\Z|\Aunix\Z|\Aunix:/i
+    end
+
+    def reject_trusted_ip_addresses(ip_addresses)
+      ip_addresses.reject { |ip| trusted_proxy?(ip) }
+    end
+
+    def split_ip_addresses(ip_addresses)
+      ip_addresses ? ip_addresses.strip.split(/[,\s]+/) : []
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-detect-tor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Warren Guy