tor_requests 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: db0ac25341693bafea5996c448ef54db15aa0fde
+  data.tar.gz: 55d973833d109be95f02a01dee6750fb98f4bb38
+SHA512:
+  metadata.gz: e0d929d85ef4bcc132be60487d39e6e7125811bdea881b2f5853ede1e4fa0536722d7a90d51d7bb19fcfb3d4d7d3730600e6603669c81cb1329cc2cd3a85c08f
+  data.tar.gz: 9defd11b28a878c01703d016de736a2efeef137360830c2c5e5f6f26a32414f50e5c426e026ce8c4fcf8c5a2a0379a82972d321fa9ff46b083c48d4d8eaedb35

data/Gemfile

@@ -6,10 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.8.0"
+  gem "rspec", "~> 2.11.0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.3"
+  gem "bundler", "~> 1.3.5"
+  gem "jeweler", "~> 2.0.1"
   gem "simplecov"
   gem "socksify"
 end

data/Gemfile.lock

@@ -1,26 +1,51 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    git (1.2.6)
+    github_api (0.4.10)
+      faraday (~> 0.7.6)
+      hashie (~> 1.2.0)
+      multi_json (~> 1.0)
+      oauth2 (~> 0.5.2)
+    hashie (1.2.0)
+    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.7.3)
+    mini_portile (0.5.3)
     multi_json (1.3.6)
-    rake (0.9.2.2)
+    multipart-post (1.2.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
+    rack (1.5.2)
+    rake (10.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -31,9 +56,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.8.3)
+  bundler (~> 1.3.5)
+  jeweler (~> 2.0.1)
   rdoc (~> 3.12)
-  rspec (~> 2.8.0)
+  rspec (~> 2.11.0)
   simplecov
   socksify

data/README.rdoc

@@ -6,8 +6,8 @@
 * Start Tor
 * You can change port configuration by clicking on Settings -> Advanced -> Adjust the port to 9050
 
-2 - Ruby code
-  
+2 - Usage
+
   res = Tor::HTTP.get("google.com", "/", 80)
   p res.code
   p res.body
@@ -16,10 +16,12 @@
   p res.code
   p res.body
 
-OR
+with URIs (http & https)
+
+  Tor::HTTP.get(URI('http://google.com/'))
+  Tor::HTTP.get(URI('https://github.com/'))
+  Tor::HTTP.post(URI('http://posttestserver.com/post.php?dir=example'), {"var" => "variable"})
 
-  res = Tor::HTTP.get(URI('http://google.com/'))
-  res = Tor::HTTP.post(URI('http://posttestserver.com/post.php?dir=example'), {"var" => "variable"})
   
 The default port configuration is 9050 and ip configuration is 127.0.0.1. If you need to change configuration, you can use:
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/tor/configuration.rb

@@ -7,19 +7,19 @@ module Tor
 
     attr_accessor :ip,
                   :port
-    
+
     attr_reader :headers
-    
+
     def add_header(header, value)
       @headers[header] = value
     end
-    
+
     def initialize
-      @ip = '127.0.0.1'
-      @port = 9050
+      @ip      = '127.0.0.1'
+      @port    = 9050
       @headers = Hash.new
-    end    
-    
+    end
+
   end
 
 end

data/lib/tor/http.rb

@@ -4,31 +4,40 @@ require 'socksify/http'
 module Tor
 
   class HTTP
+    class TooManyRedirects < StandardError; end
+    REDIRECT_LIMIT = 3
+
+    class << self
+      attr_accessor :redirects_count
+    end
 
     def self.get(uri_or_host, path = nil, port = nil)
-      res = ""
-      host = nil
+      res, host = "", nil
+      self.redirects_count = 0
+
       if path
         host = uri_or_host
       else
         host = uri_or_host.host
         port = uri_or_host.port
       end
-      Net::HTTP.SOCKSProxy(Tor.configuration.ip, Tor.configuration.port).start(host, port) do |http|
+
+      start_params = start_parameters(uri_or_host, host, port)
+      start_socks_proxy(start_params) do |http|
         request = Net::HTTP::Get.new(path || uri_or_host.path)
         Tor.configuration.headers.each do |header, value|
           request.delete(header)
           request.add_field(header, value)
         end
-        
-        res = http.request(request);
+
+        res = http.request(request)
+        res = follow_redirect(res, http) # Follow redirects
       end
       res
     end
-  
+
     def self.post(uri_or_host, post_options = {}, path = nil, port = nil)
-      res = ""
-      host = nil
+      res, host = "", nil
       if path
         host = uri_or_host
       else
@@ -37,7 +46,8 @@ module Tor
         path = uri_or_host.request_uri
       end
 
-      Net::HTTP.SOCKSProxy(Tor.configuration.ip, Tor.configuration.port).start(host, port) do |http|
+      start_params = start_parameters(uri_or_host, host, port)
+      start_socks_proxy(start_params) do |http|
         request = Net::HTTP::Post.new(path)
         request.set_form_data(post_options)
         Tor.configuration.headers.each do |header, value|
@@ -46,10 +56,52 @@ module Tor
         end
         res = http.request(request)
       end
+
       res
     end
 
+    private
+
+    def self.start_socks_proxy(start_params, &code_block)
+      Net::HTTP.SOCKSProxy(Tor.configuration.ip, Tor.configuration.port).
+        start(*start_params) { |http| code_block.call(http) }
+    end
+
+    def self.start_parameters(uri_or_host, host, port)
+      uri_or_host = URI.parse(uri_or_host) if uri_or_host.is_a? String
+      [
+        host, port,
+        :use_ssl     => uri_or_host.scheme == 'https',
+        :verify_mode => OpenSSL::SSL::VERIFY_NONE
+      ]
+    end
+
+    def self.follow_redirect(response, http)
+      if response.kind_of?(Net::HTTPRedirection)
+        raise TooManyRedirects if self.redirects_count >= REDIRECT_LIMIT
+
+        request  = Net::HTTP::Get.new(fetch_redirect_url(response))
+        response = http.request(request)
+        self.redirects_count += 1
+        response = follow_redirect(response, http)
+
+      else
+        response
+      end
+
+    end
+
+    # Get the redirect url from the response.
+    # It searches in the "location" header and response body
+    def self.fetch_redirect_url(response)
+      if response['location'].nil?
+        response.body.match(/<a href=\"([^>]+)\">/i)[1]
+      else
+        response['location']
+      end
+    end
+
   end
 
 end
-   
+

data/spec/http_spec.rb

@@ -1,56 +1,63 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-
 describe "Http" do
-  
+
   describe "get" do
-    
+
     context "with invalid parameters" do
       it "does not work" do
         expect { Tor::HTTP.get("google.com") }.to raise_error
       end
     end
-    
+
     context "with URI parameter" do
-      it "works" do
-        res = Tor::HTTP.get(URI('http://google.com/'))
-        res.code.should eq("301")
+      ["http", "https"].each do |protocol|
+        it "follows the #{protocol} redirects" do
+          res = Tor::HTTP.get(URI("#{protocol}://google.com/"))
+          res.code.should eq("200")
+        end
+
+        it "raises TooManyRedirects error" do
+          stub_const("Tor::HTTP::REDIRECT_LIMIT", 1)
+          expect { Tor::HTTP.get(URI("#{protocol}://google.com/")) }.to raise_error("Tor::HTTP::TooManyRedirects")
+        end
       end
     end
-    
+
     context "with host, path and port parameters" do
       it "works" do
         res = Tor::HTTP.get("google.com", "/", 80)
-        res.code.should eq("301")
+        res.code.should eq("200")
       end
-      
     end
-    
+
   end
 
   describe "post" do
-    
+
     context "with invalid parameters" do
       it "does not work" do
         expect { Tor::HTTP.post("google.com") }.to raise_error
       end
     end
-    
+
     context "with URI parameter" do
-      it "works" do
-        res = Tor::HTTP.post(URI('http://posttestserver.com/post.php?dir=example'), {"q" => "query", "var" => "variable"})
-        res.code.should eq("200")
+      ["http", "https"].each do |protocol|
+        it "works with #{protocol}" do
+          res = Tor::HTTP.post(URI("#{protocol}://posttestserver.com/post.php?dir=example"), {"q" => "query", "var" => "variable"})
+          res.code.should eq("200")
+        end
       end
     end
-    
+
     context "with host, path and port parameters" do
       it "works" do
         res = Tor::HTTP.post('posttestserver.com', {"q" => "query", "var" => "variable"}, '/post.php?dir=example', 80)
         res.code.should eq("200")
       end
-      
+
     end
-    
+
   end
 
 end

data/tor_requests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tor_requests"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bruno Ghisi"]
-  s.date = "2013-07-20"
+  s.date = "2014-04-07"
   s.description = "Create anonymously requests through Tor network"
   s.email = "brunogh@gmail.com"
   s.extra_rdoc_files = [
@@ -39,34 +39,34 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/brunogh/tor_requests"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "2.0.3"
   s.summary = "Create anonymously requests through Tor network"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<socksify>, [">= 0"])
       s.add_runtime_dependency(%q<socksify>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<socksify>, [">= 0"])
       s.add_dependency(%q<socksify>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<socksify>, [">= 0"])
     s.add_dependency(%q<socksify>, [">= 0"])

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: tor_requests
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Bruno Ghisi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124356799160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70124356799160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70124356798520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70124356798520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124356797860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70124356797860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70124356797300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *70124356797300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70124356796760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124356796760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: socksify
-  requirement: &70124356796120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124356796120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: socksify
-  requirement: &70124356795540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124356795540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create anonymously requests through Tor network
 email: brunogh@gmail.com
 executables: []
@@ -117,29 +137,25 @@ files:
 homepage: http://github.com/brunogh/tor_requests
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1434211554258270422
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Create anonymously requests through Tor network
 test_files: []