proxy-server 0.0.6 → 0.0.7

data/.gitignore

@@ -1,4 +1,4 @@
-.idea
-.bundle
-coverage
-pkg
+.idea
+.bundle
+coverage
+pkg

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    proxy-server (0.0.6)
+    proxy-server (0.0.7)
       em-http-request
       em-synchrony
       goliath (= 0.9.2)
@@ -28,7 +28,7 @@ GEM
       eventmachine
     em-synchrony (1.0.0)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.0.beta.4.1-x86-mingw32)
+    eventmachine (1.0.0.beta.4)
     goliath (0.9.2)
       async-rack
       em-synchrony (>= 0.3.0.beta.1)
@@ -40,14 +40,14 @@ GEM
       rack (>= 1.2.2)
       rack-contrib
       rack-respond_to
-    http_parser.rb (0.5.3-x86-mingw32)
+    http_parser.rb (0.5.3)
     http_router (0.8.11)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    httpclient (2.2.3)
-    json (1.6.1)
+    httpclient (2.2.4)
+    json (1.6.3)
     log4r (1.1.9)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     rack (1.3.5)
     rack-accept-media-types (0.9)
     rack-contrib (1.1.0)
@@ -82,11 +82,12 @@ GEM
     tilt (1.3.3)
     url_mount (0.2.1)
       rack
-    webmock (1.7.6)
+    webmock (1.7.8)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS
+  ruby
   x86-mingw32
 
 DEPENDENCIES

data/Rakefile

@@ -1,19 +1,20 @@
-require 'rubygems'
-require 'bundler'
-require 'rspec/core/rake_task'
-Bundler::GemHelper.install_tasks
-
-task :coverage do
-  require 'simplecov'
-  require 'rspec/core'
-
-  SimpleCov.start do
-    add_group "lib", "lib"
-  end
-  SimpleCov.start
-  RSpec::Core::Runner.run %w[spec]
-end
-
-
-require 'rake/clean'
-CLEAN.include %w(**/*.{log,pyc,rbc,tgz} doc)
+require 'rubygems'
+require 'bundler'
+require 'rspec/core/rake_task'
+Bundler::GemHelper.install_tasks
+
+task :coverage do
+  require 'simplecov'
+  require 'rspec/core'
+
+  SimpleCov.start do
+    add_group "lib", "lib"
+    add_filter 'spec'
+  end
+  SimpleCov.start
+  RSpec::Core::Runner.run %w[spec]
+end
+
+
+require 'rake/clean'
+CLEAN.include %w(**/*.{log,pyc,rbc,tgz} doc)

data/examples/proxy_in_process.rb

@@ -1,22 +1,22 @@
-require '../lib/proxy-server'
-require 'rest_client' # you will need to install this via gem install rest-client / bundler etc
-require 'httpclient'
-require 'json'
-
-Thread.abort_on_exception=true
-Thread.new do
-  ProxyManager.start :port => 4983
-end
-
-until_proxy_is_running = 3
-sleep until_proxy_is_running # need to implement the ability to wait for the proxy to be running
-
-proxy = JSON.parse(RestClient.post 'http://localhost:4983/proxies', {})
-
-RestClient.post "http://localhost:4983/proxies/#{proxy['port']}/requests", {:track => 'google.com'}
-
-client = HTTPClient.new :proxy => "http://localhost:#{proxy['port']}"
-client.get 'http://www.google.com'
-client.get 'http://github.com'
-
-p JSON.parse(HTTPClient.get("http://localhost:4983/proxies/#{proxy['port']}/requests").body)
+require '../lib/proxy-server'
+require 'rest_client' # you will need to install this via gem install rest-client / bundler etc
+require 'httpclient'
+require 'json'
+
+Thread.abort_on_exception=true
+Thread.new do
+  ProxyManager.start :port => 4983
+end
+
+until_proxy_is_running = 3
+sleep until_proxy_is_running # need to implement the ability to wait for the proxy to be running
+
+proxy = JSON.parse(RestClient.post 'http://localhost:4983/proxies', {})
+
+RestClient.post "http://localhost:4983/proxies/#{proxy['port']}/requests", {:track => 'google.com'}
+
+client = HTTPClient.new :proxy => "http://localhost:#{proxy['port']}"
+client.get 'http://www.google.com'
+client.get 'http://github.com'
+
+p JSON.parse(HTTPClient.get("http://localhost:4983/proxies/#{proxy['port']}/requests").body)

data/lib/proxy-server.rb

@@ -1,2 +1,3 @@
-require_relative './proxy/proxy_server'
-require_relative './proxy/proxy_manager'
+require_relative './proxy/proxy_server'
+require_relative './proxy/proxy_manager'
+require_relative './proxy/proxy_app'

data/lib/proxy/port_prober.rb

@@ -1,15 +1,15 @@
-# lovingly reused from selenium-webdriver
-
-class PortProber
-  def self.above(port)
-    port += 1 until free? port
-    port
-  end
-
-  def self.free?(port)
-    TCPServer.new('localhost', port).close
-    true
-  rescue SocketError, Errno::EADDRINUSE
-    false
-  end
-end
+# lovingly reused from selenium-webdriver
+
+class PortProber
+  def self.above(port)
+    port += 1 until free? port
+    port
+  end
+
+  def self.free?(port)
+    TCPServer.new('localhost', port).close
+    true
+  rescue SocketError, Errno::EADDRINUSE
+    false
+  end
+end

data/lib/proxy/proxy_app.rb

@@ -0,0 +1,75 @@
+require 'sinatra/base'
+require 'json'
+
+class ProxyApp < Sinatra::Base
+  disable :show_exceptions
+
+  def initialize(proxy_manager = ProxyManager.new)
+    @proxy_manager = proxy_manager
+    super
+  end
+
+  get '/proxies' do
+    @proxy_manager.proxies.to_json
+  end
+
+  post '/proxies' do
+    proxy_uri = @proxy_manager.new_proxy
+
+    options = {
+        :port => proxy_uri.port
+    }
+
+    options[:proxy] = params[:proxy] if params[:proxy]
+    @proxy_manager.start_proxy(options)
+
+    {
+        :url => proxy_uri.to_s,
+        :port => proxy_uri.port
+    }.to_json
+  end
+
+  delete '/proxies' do
+    @proxy_manager.delete_proxies
+  end
+
+  delete '/proxies/:port' do |port|
+    @proxy_manager.stop_proxy port.to_i
+  end
+
+  post '/proxies/:port/reset' do |port|
+    proxy_server = @proxy_manager.get_proxy(port.to_i)
+    proxy_server.reset
+  end
+
+  post '/proxies/:port/requests' do |port|
+    proxy_server = @proxy_manager.get_proxy(port.to_i)
+    proxy_server.track_request(params[:track])
+  end
+
+  get '/proxies/:port/requests' do |port|
+    proxy_server = @proxy_manager.get_proxy(port.to_i)
+    proxy_server.requests.to_json
+  end
+
+  post '/proxies/:port/requests/substitute' do |port|
+    proxy_server = @proxy_manager.get_proxy(port.to_i)
+    options = {}
+    options[:body] = params[:body] if params[:body]
+    options[:url] = params[:url] if params[:url]
+    proxy_server.substitute_request(params[:pattern], options)
+  end
+
+  class << self
+    def start(options = {})
+      require 'thin'
+      server = ::Thin::Server.new(
+          '0.0.0.0',
+          options.fetch(:port, 4985),
+          ProxyApp.new
+      )
+
+      server.start
+    end
+  end
+end

data/lib/proxy/proxy_manager.rb

@@ -1,100 +1,59 @@
-require_relative './proxy_server'
-require_relative './port_prober'
-require 'sinatra/base'
-require 'json'
-
-class ProxyManager < Sinatra::Base
-  START_PORT = 5000
-
-  attr_reader :running_proxy_servers, :assigned_proxy_ports
-  disable :show_exceptions
-
-  def initialize()
-    @running_proxy_servers = {}
-    @assigned_proxy_ports = []
-    super
-  end
-
-  get '/proxies' do
-    assigned_proxy_ports.to_json
-  end
-
-  post '/proxies' do
-    new_proxy_port = find_proxy_port
-    assigned_proxy_ports << new_proxy_port
-
-    options = {
-        :port => new_proxy_port
-    }
-
-    options[:proxy] = params[:proxy] if params[:proxy]
-    start_proxy(options)
-
-    {:port => new_proxy_port}.to_json
-  end
-
-  delete '/proxies' do
-    assigned_proxy_ports.clear
-  end
-
-  delete '/proxies/:port' do |port|
-    stop_proxy port.to_i
-  end
-
-  post '/proxies/:port/reset' do |port|
-    proxy_server = get_proxy(port.to_i)
-    proxy_server.reset
-  end
-
-  post '/proxies/:port/requests' do |port|
-    proxy_server = get_proxy(port.to_i)
-    proxy_server.track_request(params[:track])
-  end
-
-  get '/proxies/:port/requests' do |port|
-    proxy_server = get_proxy(port.to_i)
-    proxy_server.requests.to_json
-  end
-
-  post '/proxies/:port/requests/substitute' do |port|
-    proxy_server = get_proxy(port.to_i)
-    options = {}
-    options[:body] = params[:body] if params[:body]
-    options[:url] = params[:url] if params[:url]
-    proxy_server.substitute_request(params[:pattern], options)
-  end
-
-  def get_proxy(port)
-    running_proxy_servers[port]
-  end
-
-  def stop_proxy(port)
-    proxy_server = running_proxy_servers[port]
-    proxy_server.stop
-    running_proxy_servers.delete proxy_server
-  end
-
-  def start_proxy(options)
-    proxy_server = ProxyServer.new(options)
-    proxy_server.start
-    running_proxy_servers[options[:port]] = proxy_server
-  end
-
- def find_proxy_port
-    new_proxy_port = (assigned_proxy_ports.max || ProxyManager::START_PORT) + 1
-    PortProber.above(new_proxy_port)
- end
-
-  class << self
-    def start(options = {})
-    require 'thin'
-    server = ::Thin::Server.new(
-      '0.0.0.0',
-      options.fetch(:port, 4985),
-      ProxyManager.new
-    )
-
-    server.start
-    end
-  end
+require_relative './proxy_server'
+require_relative './port_prober'
+
+class ProxyManager
+  START_PORT = 5000
+
+  attr_reader :running_proxy_servers, :assigned_proxy_ports
+
+  def initialize
+    @running_proxy_servers = {}
+    @assigned_proxy_ports = []
+  end
+
+  def get_proxy(port)
+    running_proxy_servers[port]
+  end
+
+  def stop_proxy(port)
+    proxy_server = running_proxy_servers[port]
+    proxy_server.stop
+    running_proxy_servers.delete proxy_server
+  end
+
+  def delete_proxies
+    assigned_proxy_ports.clear
+  end
+
+  def proxies
+    assigned_proxy_ports
+  end
+
+  def start_proxy(options)
+    proxy_server = ProxyServer.new(options)
+    proxy_server.start
+    running_proxy_servers[options[:port]] = proxy_server
+  end
+
+  def new_proxy
+    port = find_proxy_port
+    assigned_proxy_ports << port
+    URI.parse("http://#{proxy_host_address}:#{port}")
+  end
+
+  def proxy_host_address
+    orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true  # turn off reverse DNS resolution temporarily
+
+    UDPSocket.open do |s|
+      s.connect '64.233.187.99', 1
+      s.addr.last
+    end
+  ensure
+    Socket.do_not_reverse_lookup = orig
+  end
+
+  def find_proxy_port
+    new_proxy_port = (assigned_proxy_ports.max || ProxyManager::START_PORT) + 1
+    PortProber.above(new_proxy_port)
+  end
 end

data/lib/proxy/proxy_server.rb

@@ -1,122 +1,122 @@
-require 'goliath/api'
-require 'goliath/server'
-require 'em-synchrony/em-http'
-class ProxyServer < Goliath::API
-  attr_reader :upstream_proxy, :port
-  attr_reader :requests, :track_requests, :substitute_requests
-  DEFAULT_PORT = 8080
-
-  def initialize(options = {})
-    @upstream_proxy = URI.parse(options[:proxy]) if options[:proxy]
-
-    @port = options.fetch(:port, DEFAULT_PORT)
-
-    @substitute_requests = {}
-    @requests = []
-    @track_requests = []
-  end
-
-  def start
-    Thread.abort_on_exception = true
-    require 'log4r'
-    @proxy_thread = Thread.new do
-      Goliath.env = :development
-      server = Goliath::Server.new('0.0.0.0', self.port)
-      server.app = Goliath::Rack::Builder.build(self.class, self)
-      server.logger = Log4r::Logger.new 'proxy-server'
-
-      server.options = {
-          :daemonize => false,
-          :verbose => true,
-          :log_stdout => true,
-          :env => :development
-      }
-      server.start do
-        p "Proxy started"
-      end
-    end
-  end
-
-  def stop
-    Thread.kill @proxy_thread if @proxy_thread
-  end
-
-  def reset
-    @requests.clear
-    @track_requests.clear
-    @substitute_requests.clear
-  end
-
-  def response(env)
-    uri = get_uri env
-    track uri if tracking_enabled? uri
-    return substitute uri if has_substitute? uri
-    request_uri uri
-  end
-
-  def get_uri(env)
-    env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length > 0 ? '?'+env['QUERY_STRING'] : ''}"
-  end
-
-  def request_uri(uri)
-    options = {
-        :redirects => 1
-    }
-    get_proxy(options)
-    client= EM::HttpRequest.new(uri, options)
-    request = client.get
-    [request.response_header.status, request.response_header, request.response]
-  end
-
-  def get_proxy(options)
-    options[:proxy] = {:type => 'http', :host => @upstream_proxy.host, :port => @upstream_proxy.port} if @upstream_proxy
-  end
-
-  def get_substituted_response(options)
-    if options[:body]
-      [200, {}, [options[:body]]]
-    elsif options[:url]
-      request_uri options[:url]
-    end
-  end
-
-  def substitute(uri)
-    @substitute_requests.each do |pattern, options|
-      if Regexp.new(pattern) =~ uri
-        return get_substituted_response(options)
-      end
-    end
-    nil
-  end
-
-  def has_substitute?(uri)
-    @substitute_requests.each do |pattern, options|
-      if Regexp.new(pattern) =~ uri
-        return true
-      end
-    end
-    false
-  end
-
-  def substitute_request(pattern, options)
-    @substitute_requests[pattern] = options
-  end
-
-  def track_request(pattern)
-    @track_requests << pattern
-  end
-
-  def track(uri)
-    @requests << uri
-    @track_requests.each do |pattern|
-      @requests << uri if Regexp.new(pattern) =~ uri
-    end
-  end
-
-  def tracking_enabled?(uri)
-    @track_requests.each do |pattern|
-      return true if Regexp.new(pattern) =~ uri
-    end
-    false
-  end
-end
+require 'goliath/api'
+require 'goliath/server'
+require 'em-synchrony/em-http'
+class ProxyServer < Goliath::API
+  attr_reader :upstream_proxy, :port
+  attr_reader :requests, :track_requests, :substitute_requests
+  DEFAULT_PORT = 8080
+
+  def initialize(options = {})
+    @upstream_proxy = URI.parse(options[:proxy]) if options[:proxy]
+
+    @port = options.fetch(:port, DEFAULT_PORT)
+
+    @substitute_requests = {}
+    @requests = []
+    @track_requests = []
+  end
+
+  def start
+    Thread.abort_on_exception = true
+    require 'log4r'
+    @proxy_thread = Thread.new do
+      Goliath.env = :development
+      server = Goliath::Server.new('0.0.0.0', self.port)
+      server.app = Goliath::Rack::Builder.build(self.class, self)
+      server.logger = Log4r::Logger.new 'proxy-server'
+
+      server.options = {
+          :daemonize => false,
+          :verbose => true,
+          :log_stdout => true,
+          :env => :development
+      }
+      server.start do
+        p "Proxy started"
+      end
+    end
+  end
+
+  def stop
+    Thread.kill @proxy_thread if @proxy_thread
+  end
+
+  def reset
+    @requests.clear
+    @track_requests.clear
+    @substitute_requests.clear
+  end
+
+  def response(env)
+    uri = get_uri env
+    track uri if tracking_enabled? uri
+    return substitute uri if has_substitute? uri
+    request_uri uri
+  end
+
+  def get_uri(env)
+    env['REQUEST_URI'] || "http://#{env['SERVER_NAME']}#{env['PATH_INFO']}#{env['QUERY_STRING'].length > 0 ? '?'+env['QUERY_STRING'] : ''}"
+  end
+
+  def request_uri(uri)
+    options = {
+        :redirects => 1
+    }
+    get_proxy(options)
+    client= EM::HttpRequest.new(uri, options)
+    request = client.get
+    [request.response_header.status, request.response_header, request.response]
+  end
+
+  def get_proxy(options)
+    options[:proxy] = {:type => 'http', :host => @upstream_proxy.host, :port => @upstream_proxy.port} if @upstream_proxy
+  end
+
+  def get_substituted_response(options)
+    if options[:body]
+      [200, {}, [options[:body]]]
+    elsif options[:url]
+      request_uri options[:url]
+    end
+  end
+
+  def substitute(uri)
+    @substitute_requests.each do |pattern, options|
+      if Regexp.new(pattern) =~ uri
+        return get_substituted_response(options)
+      end
+    end
+    nil
+  end
+
+  def has_substitute?(uri)
+    @substitute_requests.each do |pattern, options|
+      if Regexp.new(pattern) =~ uri
+        return true
+      end
+    end
+    false
+  end
+
+  def substitute_request(pattern, options)
+    @substitute_requests[pattern] = options
+  end
+
+  def track_request(pattern)
+    @track_requests << pattern
+  end
+
+  def track(uri)
+    @requests << uri
+    @track_requests.each do |pattern|
+      @requests << uri if Regexp.new(pattern) =~ uri
+    end
+  end
+
+  def tracking_enabled?(uri)
+    @track_requests.each do |pattern|
+      return true if Regexp.new(pattern) =~ uri
+    end
+    false
+  end
+end