tor_extend 1.0.2 → 2.0.0

data/lib/constants.rb

@@ -103,4 +103,8 @@ ATTACK_TOUR = {:lat   => 46.0,
 
 #  This determines how long the program Tor::TController.extendcir_slowly() waits between each extension.
 EXTEND_DELAY = 2.0
+
+# This determines how frequent the circuits that make up long circuits will be checked and reattached. 
+PERIODIC_TIMER = 7
+
 end

data/lib/tcontroller.rb

@@ -33,6 +33,27 @@ require 'socksify/http'
     #
     class TController < Tor::Controller
 
+    ##
+    # @param  [Hash{Symbol => Object}] options
+    # @option options [String, #to_s]  :host    ("127.0.0.1")
+    # @option options [Integer, #to_i] :port    (9051)
+    # @option options [String, #to_s]  :cookie  (nil)
+    # @option options [Integer, #to_i] :version (PROTOCOL_VERSION)
+        def initialize(options = {}, &block)
+            @options = options.dup
+            @host      = (@options.delete(:host)    || '127.0.0.1').to_s
+            @port      = (@options.delete(:port)    || 9051).to_i
+            @version  = (@options.delete(:version) || PROTOCOL_VERSION).to_i
+            @passwd     = (@options.delete(:password)    || '').to_s
+            connect
+            authenticate "\"#{@passwd}\"" if ! @passwd != "" 
+           if block_given?
+                block.call(self)
+                quit
+            end
+        end
+
+
 	#    This returns the circuit-status in an array,  or an empty array on failure
 	#
 	#    <b>Get the circuit-status from Tor</b>.
@@ -159,13 +180,12 @@ require 'socksify/http'
 	#    The return format is fo the form:  
 	#    [HTTPcode, [{:bridgeip, :bridgeport},{:bridgeip, :bridgeport},{:bridgeip, :bridgeport}].
 	#    The types can be one of 'tor', 'polipo', 'socks', 'http', 'https',nil, 'none'.
-        #     torctrl_cirnum must have the form:
-        #     torctrl_cirnum ={:torctrl=>Tor::TController, :cirnum=>cirnum,:hop=>hopcount}
 	#
 	#    <b>Get 3 bridges</b>
 	#
         #        Tor::TController.get_bridges( {:proxytype=>'tor',:proxyport=>9050,:proxyaddr=>'127.0.0.1'}  )
-        def get_bridges(url, cacheddesc, *config)
+        def get_bridges(cacheddesc, *config)
+            url = URI.parse "https://bridges.torproject.org/"
             if config.empty?
                 proxyconfig={:type=>'tor' ,:port=>9050,:addr=>'127.0.0.1'}
             else
@@ -202,7 +222,7 @@ require 'socksify/http'
                         bridgeip,bridgeport= eachbridge.split(':')
                         x=Bridge.where(:ipaddr=>bridgeip, :port =>bridgeport)
                         if x.empty?
-                            if (bridge_geoip=cacheddesc.get_geoiprecord(bridgeip)).nil?
+                            if cacheddesc.nil? or (bridge_geoip=cacheddesc.get_geoiprecord(bridgeip)).nil?
                                 Bridge.create(:ipaddr=>bridgeip, :port =>bridgeport,
                                                       :lat=>0, :lng=>0)
                             else
@@ -219,7 +239,7 @@ require 'socksify/http'
                 respcode=nil
                 bridges=[]
             end
-            bridges #Return array of all bridges
+            bridges.nil? ? [] : bridges #Return array of all bridges
         end
 
         #    Returns all the brdiges in the database as an array.
@@ -236,19 +256,19 @@ require 'socksify/http'
                 case eachstream
                   when /\d+ NEW 0/
                   # It might be simpler to use this /\d+ NEW/
-                  reply << eachstream.scan(/\d+/)[0]
+                  reply << eachstream.scan(/\d+/)[0].to_i
                 end
             }
             reply
         end
 
         # This attaches streams to circuits. No documentation yet.
-        def attach_stream(stream_no, cir_num ,hop_count)
-		puts "attachstream"
-            if hop_count==0	
+        def attach_stream(stream_no, cir_num ,*hop_count)
+		# puts "attachstream #{cir_num}\n"
+            if hop_count.empty? or hop_count[0] == 0	
                 sr(:attachstream,"#{stream_no} #{cir_num}")
             else
-                sr(:attachstream,"#{stream_no} #{cir_num} HOP=#{hop_count}")
+                sr(:attachstream,"#{stream_no} #{cir_num} HOP=#{hop_count[0]}")
             end
         end
 

data/lib/tor_extend.rb

@@ -12,12 +12,16 @@ module Tor
     require 'builder'
     require 'geoip'
     require 'net/https'
+    require 'tmpdir'          # used to store temporary directories for tor and polipo config
+    # require 'open3'           # required for launching multiple occurences of tor and polipo for spinning within the Tor circuit
+    require 'eventmachine'
     
     # Tor::Constants module is loaded from constants.rb and other classes from seperate files
     autoload :Constants, 'constants'
     require 'tcontroller'
     require 'tstats'
     require 'httpmod'
+    require 'circuits'
 
     #   Tor::Router is a class for the active record database holding the ip-addresses, platform, fingerprint, country, latitude,longitude.
     #

data/tor_extend.gemspec

@@ -2,7 +2,7 @@
 require 'rubygems'
 spec = Gem::Specification.new do |s|
     s.name = "tor_extend"
-    s.version = "1.0.2"
+    s.version = "2.0.0"
     s.summary = "TController inherits the features from the Controller class in Arto Bendiken\'s tor-ruby [https://github.com/bendiken/tor-ruby] and extends it to do so much more"
     s.files = Dir.glob("**/**/**")
     s.test_files = Dir.glob("test/*_test.rb")
@@ -16,11 +16,24 @@ spec = Gem::Specification.new do |s|
     s.add_dependency('tor', '>= 0.1.2')
     s.add_dependency('geoip', '>= 1.1.1')
     s.add_dependency('socksify', '>= 1.4.1')
+    s.add_dependency('eventmachine', '>= 0.12.10')
+    
+    s.requirements << ' ruby'
+    s.requirements << ' socksify'
+    s.requirements << ' tor'
+    s.requirements << ' eventmachine'
+    
     s.description = <<-EOF
-    TController is an extension of the open source Tor::Controller library written for ruby by Bendiken
-    dependencies are specified in standard Ruby syntax. It adds several functionalities that were not already included in the original library, and this is still a work in progress.
+    This library extends Bendiken's tor-ruby [https://github.com/bendiken/tor-ruby], and provides methods for working with circuits, packet spinning, as well as obtaining Bridges from the Tor anonymous network as described at the following conference:
+    PacSec Applied Security Conference, Tokyo, Japan on, 9-10 Nov. 2011, "Filiol E., Remi-Omosowon O. B., Mutembei L., 2011. Dynamic cryptographic trapdoors to take over the TOR network".
+    H2HC 2011, Sao Paulo, Brazil on, 29-30 Oct. 2011, "Filiol E., Remi-Omosowon O. B., Mutembei L., 2011. How to take over the Tor network operationally "
+
+    It will be updated before and after the talk at:  
+    28C3, Chaos Communication Congress Conference, Berlin, Germany on, 27-30 Dec. 2011, "Filiol E., Remi-Omosowon O. B., Mutembei L., 2011. Dynamic cryptographic trapdoors to take over the TOR network.
+
+    It requires the geoip, socksify and tor gems, which I included in the specification file to auto install for clients. So other licences may apply.
+    Also available at http://cvo-lab.blogspot.com/2011/11/tor-attack-technical-details.html
     EOF
-    s.homepage = ("http://cvo-lab.blogspot.com")
     s.homepage = ("http://tor-extend.rubyforge.org")
     s.rubyforge_project = 'tor_extend'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tor_extend
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tor
-  requirement: &72847450 !ruby/object:Gem::Requirement
+  requirement: &83061440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *72847450
+  version_requirements: *83061440
 - !ruby/object:Gem::Dependency
   name: geoip
-  requirement: &72847010 !ruby/object:Gem::Requirement
+  requirement: &83061210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *72847010
+  version_requirements: *83061210
 - !ruby/object:Gem::Dependency
   name: socksify
-  requirement: &72846180 !ruby/object:Gem::Requirement
+  requirement: &83060980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,11 +43,31 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *72846180
-description: ! "    TController is an extension of the open source Tor::Controller
-  library written for ruby by Bendiken\n    dependencies are specified in standard
-  Ruby syntax. It adds several functionalities that were not already included in the
-  original library, and this is still a work in progress.\n"
+  version_requirements: *83060980
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &83060750 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :runtime
+  prerelease: false
+  version_requirements: *83060750
+description: ! "    This library extends Bendiken's tor-ruby [https://github.com/bendiken/tor-ruby],
+  and provides methods for working with circuits, packet spinning, as well as obtaining
+  Bridges from the Tor anonymous network as described at the following conference:\n
+  \   PacSec Applied Security Conference, Tokyo, Japan on, 9-10 Nov. 2011, \"Filiol
+  E., Remi-Omosowon O. B., Mutembei L., 2011. Dynamic cryptographic trapdoors to take
+  over the TOR network\".\n    H2HC 2011, Sao Paulo, Brazil on, 29-30 Oct. 2011, \"Filiol
+  E., Remi-Omosowon O. B., Mutembei L., 2011. How to take over the Tor network operationally
+  \"\n\n    It will be updated before and after the talk at:  \n    28C3, Chaos Communication
+  Congress Conference, Berlin, Germany on, 27-30 Dec. 2011, \"Filiol E., Remi-Omosowon
+  O. B., Mutembei L., 2011. Dynamic cryptographic trapdoors to take over the TOR network.\n\n
+  \   It requires the geoip, socksify and tor gems, which I included in the specification
+  file to auto install for clients. So other licences may apply.\n    Also available
+  at http://cvo-lab.blogspot.com/2011/11/tor-attack-technical-details.html\n"
 email: remi-omosowon@et.esiea-ouest.fr
 executables: []
 extensions: []
@@ -93,12 +113,15 @@ files:
 - doc/js/jquery.js
 - doc/js/search.js
 - doc/Tor/Constants.html
+- doc/Tor/Circuit.html
+- doc/Tor/LongCircuit.html
 - doc/Tor/StatsObj.html
 - doc/Tor/Bridge.html
 - doc/Tor/Router.html
 - doc/Tor/TController.html
 - doc/Tor/CachedDesc.html
 - doc/lib/constants_rb.html
+- doc/lib/circuits_rb.html
 - doc/lib/tor_extend_rb.html
 - doc/lib/tcontroller_rb.html
 - doc/lib/tstats_rb.html
@@ -107,6 +130,7 @@ files:
 - lib/httpmod.rb
 - lib/tor_extend.rb
 - lib/tstats.rb
+- lib/circuits.rb
 - lib/tcontroller.rb
 - lib/constants.rb
 - tor_extend.gemspec
@@ -128,9 +152,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- ! ' ruby'
+- ! ' socksify'
+- ! ' tor'
+- ! ' eventmachine'
 rubyforge_project: tor_extend
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: TController inherits the features from the Controller class in Arto Bendiken's