rack-tor-tag 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd11e7a9e96f55497a03c47e8ff355439d6df61
-  data.tar.gz: a818227dd6bc4674359eba20faf07ac41161c68d
+  metadata.gz: c59a4cbd60e309620eea960e00f83f5ae114c2aa
+  data.tar.gz: 5075c358be74b10b6bc01087b452788bf6de4578
 SHA512:
-  metadata.gz: 33499550d86997dcdf5d0a83d2997d10d4688004f850300e2c66d21c97ddec17f13ce184bdda79f2a78327fb90a1d279339fe5211756dbba58904b48156ff13d
-  data.tar.gz: 24efd7df0fed9fbfe094869bfdbd72ca233044fab0cf0118e085939363922f3d2e8002669b460d0197d23118d098124ed9c2e36a35be5c35f390ee54a559a96e
+  metadata.gz: 0af76ffd97eb6a7022f4c461db123898b028c12b54f9e9e65476ea5c29386f7998c953eee619be4ff4cf6c537b2112054c01d29ea77c9daedfb114cbe2107b11
+  data.tar.gz: 7f699f4fd478e2267327b80f7c495f627f06a2a4b828a2674f65909b903406241a418c3155876b771eeef4014a8bff08679f84880d9a87ed4a46a16ef3601a99

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2"
+  gem "rdoc", "~> 4"
+  gem "cucumber", "~> 1"
+  gem "bundler", "~> 1"
+  gem "jeweler", "~> 2"
+  gem "simplecov", "~> 0"
+end

data/Gemfile.lock

@@ -0,0 +1,82 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    builder (3.2.2)
+    cucumber (1.3.11)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    descendants_tracker (0.0.3)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    git (1.2.6)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    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)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1)
+  cucumber (~> 1)
+  jeweler (~> 2)
+  rdoc (~> 4)
+  rspec (~> 2)
+  simplecov (~> 0)

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Luca Bonmassar, Gild Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,40 @@
+# rack-tor-tag
+
+A rack middleware to tag accesses to your rails application from TOR nodes. 
+
+Based on [https://github.com/Gild/rack-tor-block]
+
+## Install
+
+Gemfile:
+
+    gem 'rack-tor-tag'
+
+config/appplication.rb:
+
+    config.middleware.insert_after ActionDispatch::RemoteIp, Rack::TorTag
+    # or set config params
+    config.middleware.insert_after ActionDispatch::RemoteIp, Rack::TorTag, :host_ips => %w(1.2.3.4 1.2.3.5), :dnsel => 'my-dnsel-instance.myhost.org', :hostport => '123'
+
+By default, `:host_ips` will be gotten by DNS lookup on `HTTP_HOST`, so if you know your IPs it's more efficient to specify. `:host_port` should probably be left blank, in which case it'll be gotten from `SERVER_PORT`.
+
+`:dnsel` is if you're running your own instance of the [Tor DNS Exit List software](https://www.torproject.org/projects/tordnsel.html.en).
+
+## Use
+
+Tor users will all have `env['action_dispatch.remote_ip'] = '127.0.0.2'`. The actual source IP is at `env['tor_ip']` — though practically all Tor IPs should probably be treated the same, since there's no easy way to know whether two different Tor exit node IPs represent the same originating user or not.
+
+`env['tor']` will be true for Tor users, false for non-Tor users, and nil if the lookup failed.
+
+## Todo
+
+[ ] Get the bulk list rather than doing DNS lookups
+[ ] Cache results
+[ ] Local-cache dns lookups
+
+## Contributing
+ 
+* Fork
+* Open an issue
+* Commit, push, Pull Req
+* Check the status of the existing tests / add new tests

data/Rakefile

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
+  gem.name = "rack-tor-tag"
+  gem.homepage = "http://github.com/saizai/rack-tor-tag"
+  gem.license = "MIT"
+  gem.summary = %Q{Mark Tor users using rack, for filtering / throttling / etc}
+  gem.description = %Q{Mark Tor users using rack, for filtering / throttling / etc}
+  gem.email = "github@saizai.com"
+  gem.authors = ["Sai"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.rspec_opts = "-fs --color"
+end
+
+desc "Code coverage detail"
+task :simplecov do
+  ENV['COVERAGE'] = "true"
+  Rake::Task['spec'].execute
+end
+
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
+
+task :default => :spec
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rack-tor-tag #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.0.8

data/features/rack-tor-tag.feature

@@ -0,0 +1,9 @@
+Feature: something something
+  In order to something something
+  A user something something
+  something something something
+
+  Scenario: something something
+    Given inspiration
+    When I create a sweet new gem
+    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -0,0 +1,29 @@
+require 'simplecov'
+
+module SimpleCov::Configuration
+  def clean_filters
+    @filters = []
+  end
+end
+
+SimpleCov.configure do
+  clean_filters
+  load_adapter 'test_frameworks'
+end
+
+ENV["COVERAGE"] && SimpleCov.start do
+  add_filter "/.rvm/"
+end
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+require 'rack-tor-tag'
+
+require 'rspec/expectations'

data/lib/rack/tor_tag.rb

@@ -6,11 +6,11 @@ module Rack
     DEFAULT_PARAMS = {
       # You could run your own if you want.
       # https://www.torproject.org/projects/tordnsel.html.en
-      :dnsel => 'ip-port.exitlist.torproject.org', 
+      :dnsel => 'ip-port.exitlist.torproject.org',
       :host_ips => nil, # will get from env
       :host_port => nil
     }
-    
+
     def initialize(app, params = {})
       @app = app
       @params = DEFAULT_PARAMS.merge(params)
@@ -18,11 +18,11 @@ module Rack
 
     def call(env)
       ip = env['action_dispatch.remote_ip']
-      # Getting the right IP is hard. Let's punt. 
+      # Getting the right IP is hard. Let's punt.
       # http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html
       # http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/
       raise 'Must run after ActionDispatch::RemoteIp' if ip.blank?
-      
+
       case is_tor?(ip, env)
       when true
         env['tor'] = true
@@ -33,21 +33,24 @@ module Rack
       else
         env['tor'] = nil # i.e. unknown
       end
-      
+
       # Continue normal processing
       @app.call(env)
     end
-    
+
+    protected
+
     # see https://www.torproject.org/projects/tordnsel.html.en
     def is_tor? ip, env
       # We're a hidden service! Of course it's Tor.
-      return true if env['HTTP_HOST'] =~ /\.onion\z/ 
-      
+      return true if env['HTTP_HOST'] =~ /\.onion\z/
+      return false if (ip == 'localhost') or (env['HTTP_HOST'] == 'localhost')
+
       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
-      
-      host_ips.each do |host_ip| 
+
+      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')
@@ -56,11 +59,11 @@ module Rack
         end
       end
       false
-    
+
     rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
-      return nil      
+      return nil
     end
-    
+
     def reverse_ip_octets(ip)
       ip.to_s.split('.').reverse.join('.')
     end

data/rack-tor-tag.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# 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
+
+Gem::Specification.new do |s|
+  s.name = "rack-tor-tag"
+  s.version = "0.0.8"
+
+  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.description = "Mark Tor users using rack, for filtering / throttling / etc"
+  s.email = "github@saizai.com"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "features/rack-tor-tag.feature",
+    "features/step_definitions/rack-tor-tag_steps.rb",
+    "features/support/env.rb",
+    "lib/rack-tor-tag.rb",
+    "lib/rack/tor_tag.rb",
+    "rack-tor-tag.gemspec",
+    "spec/rack-tor-tag_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/saizai/rack-tor-tag"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Mark Tor users using rack, for filtering / throttling / etc"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2"])
+      s.add_dependency(%q<rdoc>, ["~> 4"])
+      s.add_dependency(%q<cucumber>, ["~> 1"])
+      s.add_dependency(%q<bundler>, ["~> 1"])
+      s.add_dependency(%q<jeweler>, ["~> 2"])
+      s.add_dependency(%q<simplecov>, ["~> 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2"])
+    s.add_dependency(%q<rdoc>, ["~> 4"])
+    s.add_dependency(%q<cucumber>, ["~> 1"])
+    s.add_dependency(%q<bundler>, ["~> 1"])
+    s.add_dependency(%q<jeweler>, ["~> 2"])
+    s.add_dependency(%q<simplecov>, ["~> 0"])
+  end
+end
+

data/spec/rack-tor-tag_spec.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "RackTorTag" do
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+require 'simplecov'
+
+module SimpleCov::Configuration
+  def clean_filters
+    @filters = []
+  end
+end
+
+SimpleCov.configure do
+  clean_filters
+  load_profile 'test_frameworks'
+end
+
+ENV["COVERAGE"] && SimpleCov.start do
+  add_filter "/.rvm/"
+end
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'rspec'
+require 'rack-tor-tag'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+
+end

metadata

@@ -1,55 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: rack-tor-tag
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sai
-- Luca Bonmassar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   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: Mark Tor users using rack, for filtering / throttling / etc
-email:
-- sai@makeyourlaws.org
+email: github@saizai.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE
+- README.md
 files:
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- VERSION
+- features/rack-tor-tag.feature
+- features/step_definitions/rack-tor-tag_steps.rb
+- features/support/env.rb
 - lib/rack-tor-tag.rb
 - lib/rack/tor_tag.rb
-homepage: https://makeyourlaws.org
-licenses: []
+- rack-tor-tag.gemspec
+- spec/rack-tor-tag_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/saizai/rack-tor-tag
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -67,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mark Tor users using rack, for filtering / throttling / etc