em-proxy 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -7,23 +7,26 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.2)
-    ansi (1.2.2)
-    diff-lcs (1.1.2)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
-    escape_utils (0.1.9)
-    eventmachine (0.12.11)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    addressable (2.2.6)
+    ansi (1.4.0)
+    diff-lcs (1.1.3)
+    em-http-request (1.0.0)
+      addressable (>= 2.2.3)
+      em-socksify
+      eventmachine (>= 1.0.0.beta.3)
+      http_parser.rb (>= 0.5.2)
+    em-socksify (0.1.0)
+      eventmachine
+    eventmachine (1.0.0.beta.4)
+    http_parser.rb (0.5.3)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.7.0)
 
 PLATFORMS
   ruby
@@ -32,5 +35,4 @@ DEPENDENCIES
   ansi
   em-http-request
   em-proxy!
-  eventmachine
   rspec

data/README.md

@@ -0,0 +1,67 @@
+# EM-Proxy
+
+EventMachine Proxy DSL for writing high-performance transparent / intercepting proxies in Ruby.
+
+- EngineYard tutorial: [Load testing your environment using em-proxy](http://docs.engineyard.com/em-proxy.html)
+- [Slides from RailsConf 2009](http://bit.ly/D7oWB)
+- [GoGaRuCo notes & Slides](http://www.igvita.com/2009/04/20/ruby-proxies-for-scale-and-monitoring/)
+
+## Getting started
+
+    $> gem install em-proxy
+    $> em-proxy
+    Usage: em-proxy [options]
+      -l, --listen [PORT]              Port to listen on
+      -d, --duplex [host:port, ...]    List of backends to duplex data to
+      -r, --relay [hostname:port]      Relay endpoint: hostname:port
+      -v, --verbose                    Run in debug mode
+
+    $> em-proxy -l 8080 -r localhost:8081 -d localhost:8082,localhost:8083 -v
+
+The above will start em-proxy on port 8080, relay and respond with data from port 8081, and also (optional) duplicate all traffic to ports 8082 and 8083 (and discard their responses).
+
+
+## Simple port forwarding proxy
+
+```ruby
+Proxy.start(:host => "0.0.0.0", :port => 80, :debug => true) do |conn|
+  conn.server :srv, :host => "127.0.0.1", :port => 81
+
+  # modify / process request stream
+  conn.on_data do |data|
+    p [:on_data, data]
+    data
+  end
+
+  # modify / process response stream
+  conn.on_response do |backend, resp|
+    p [:on_response, backend, resp]
+    resp
+  end
+
+  # termination logic
+  conn.on_finish do |backend, name|
+    p [:on_finish, name]
+
+    # terminate connection (in duplex mode, you can terminate when prod is done)
+    unbind if backend == :srv
+  end
+end
+```
+
+For more examples see the /examples directory.
+
+- SMTP Spam Filtering
+- Duplicating traffic
+- Selective forwarding
+- Beanstalkd interceptor
+- etc.
+
+A schema-free MySQL proof of concept, via an EM-Proxy server:
+
+- http://www.igvita.com/2010/03/01/schema-free-mysql-vs-nosql/
+- Code in examples/schemaless-mysql
+
+## License
+
+The MIT License - Copyright (c) 2010 Ilya Grigorik

data/Rakefile

@@ -1,4 +1,10 @@
 require 'bundler'
-
-Bundler.setup
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+task :test => [:spec]

data/em-proxy.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-proxy"
-  s.version     = "0.1.5"
+  s.version     = "0.1.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
@@ -22,4 +22,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

data/examples/balancing.rb

@@ -1,4 +1,6 @@
-require 'lib/em-proxy'
+$:<< '../lib' << 'lib'
+
+require 'em-proxy'
 require 'ansi/code'
 require 'uri'
 

data/examples/http_proxy.rb

@@ -0,0 +1,47 @@
+require 'em-proxy'
+require 'http/parser' # gem install http_parser.rb
+require 'uuid'        # gem install uuid
+
+# > ruby em-proxy-http.rb
+# > curl --proxy localhost:9889 www.google.com
+
+host = "0.0.0.0"
+port = 9889
+puts "listening on #{host}:#{port}..."
+
+Proxy.start(:host => host, :port => port) do |conn|
+
+  @p = Http::Parser.new
+  @p.on_headers_complete = proc do |h|
+    session = UUID.generate
+    puts "New session: #{session} (#{h.inspect})"
+
+    host, port = h['Host'].split(':')
+    conn.server session, :host => host, :port => (port || 80)
+    conn.relay_to_servers @buffer
+
+    @buffer.clear
+  end
+
+  @buffer = ''
+
+  conn.on_connect do |data,b|
+    puts [:on_connect, data, b].inspect
+  end
+
+  conn.on_data do |data|
+    @buffer << data
+    @p << data
+
+    data
+  end
+
+  conn.on_response do |backend, resp|
+    puts [:on_response, backend, resp].inspect
+    resp
+  end
+
+  conn.on_finish do |backend, name|
+    puts [:on_finish, name].inspect
+  end
+end

data/lib/em-proxy/backend.rb

@@ -1,12 +1,11 @@
 module EventMachine
   module ProxyServer
     class Backend < EventMachine::Connection
-      attr_accessor :plexer, :data, :name, :debug
+      attr_accessor :plexer, :name, :debug
 
       def initialize(debug = false)
         @debug = debug
         @connected = EM::DefaultDeferrable.new
-        @data = []
       end
 
       def connection_completed
@@ -17,7 +16,6 @@ module EventMachine
 
       def receive_data(data)
         debug [@name, data]
-        @data.push data
         @plexer.relay_from_backend(@name, data)
       end
 

data/lib/em-proxy/connection.rb

@@ -1,114 +1,114 @@
-module EventMachine
-  module ProxyServer
-    class Connection < EventMachine::Connection
-      attr_accessor :debug
-
-      ##### Proxy Methods
-      def on_data(&blk); @on_data = blk; end
-      def on_response(&blk); @on_response = blk; end
-      def on_finish(&blk); @on_finish = blk; end
-      def on_connect(&blk); @on_connect = blk; end
-
-      ##### EventMachine
-      def initialize(options)
-        @debug = options[:debug] || false
-        @servers = {}
-      end
-
-      def receive_data(data)
-        debug [:connection, data]
-        processed = @on_data.call(data) if @on_data
-
-        return if processed == :async or processed.nil?
-        relay_to_servers(processed)
-      end
-
-      def relay_to_servers(processed)
-        if processed.is_a? Array
-          data, servers = *processed
-
-          # guard for "unbound" servers
-          servers = servers.collect {|s| @servers[s]}.compact
-        else
-          data = processed
-          servers ||= @servers.values.compact
-        end
-
-        servers.each do |s|
-          s.send_data data unless data.nil?
-        end
-      end
-
-      #
-      # initialize connections to backend servers
-      #
-      def server(name, opts)
-        srv = EventMachine::connect(opts[:host], opts[:port], EventMachine::ProxyServer::Backend, @debug) do |c|
-          c.name = name
-          c.plexer = self
-          c.proxy_incoming_to(self, 10240) if opts[:relay_server]
-        end
-        self.proxy_incoming_to(srv, 10240) if opts[:relay_client]
-
-        @servers[name] = srv
-      end
-
-      #
-      # [ip, port] of the connected client
-      #
-      def peer
-        peername = get_peername
-        @peer ||= peername ? Socket.unpack_sockaddr_in(peername).reverse : nil
-      end
-
-      #
-      # relay data from backend server to client
-      #
-      def relay_from_backend(name, data)
-        debug [:relay_from_backend, name, data]
-
-        data = @on_response.call(name, data) if @on_response
-        send_data data unless data.nil?
-      end
-
-      def connected(name)
-        debug [:connected]
-        @on_connect.call(name) if @on_connect
-      end
-
-      def unbind
-        debug [:unbind, :connection]
-
-        # terminate any unfinished connections
-        @servers.values.compact.each do |s|
-          s.close_connection
-        end
-      end
-
-      def unbind_backend(name)
-        debug [:unbind_backend, name]
-        @servers[name] = nil
-
-        # if all connections are terminated downstream, then notify client
-        close_connection_after_writing if @servers.values.compact.size.zero?
-
-        if @on_finish
-          @on_finish.call(name)
-
-          # not sure if this is required
-          # @on_finish.call(:done) if @servers.values.compact.size.zero?
-        end
-      end
-
-      private
-
-      def debug(*data)
-        if @debug
-          require 'pp'
-          pp data
-          puts
-        end
-      end
-    end
-  end
-end
+module EventMachine
+  module ProxyServer
+    class Connection < EventMachine::Connection
+      attr_accessor :debug
+
+      ##### Proxy Methods
+      def on_data(&blk); @on_data = blk; end
+      def on_response(&blk); @on_response = blk; end
+      def on_finish(&blk); @on_finish = blk; end
+      def on_connect(&blk); @on_connect = blk; end
+
+      ##### EventMachine
+      def initialize(options)
+        @debug = options[:debug] || false
+        @servers = {}
+      end
+
+      def receive_data(data)
+        debug [:connection, data]
+        processed = @on_data.call(data) if @on_data
+
+        return if processed == :async or processed.nil?
+        relay_to_servers(processed)
+      end
+
+      def relay_to_servers(processed)
+        if processed.is_a? Array
+          data, servers = *processed
+
+          # guard for "unbound" servers
+          servers = servers.collect {|s| @servers[s]}.compact
+        else
+          data = processed
+          servers ||= @servers.values.compact
+        end
+
+        servers.each do |s|
+          s.send_data data unless data.nil?
+        end
+      end
+
+      #
+      # initialize connections to backend servers
+      #
+      def server(name, opts)
+        srv = EventMachine::connect(opts[:host], opts[:port], EventMachine::ProxyServer::Backend, @debug) do |c|
+          c.name = name
+          c.plexer = self
+          c.proxy_incoming_to(self, 10240) if opts[:relay_server]
+        end
+        self.proxy_incoming_to(srv, 10240) if opts[:relay_client]
+
+        @servers[name] = srv
+      end
+
+      #
+      # [ip, port] of the connected client
+      #
+      def peer
+        peername = get_peername
+        @peer ||= peername ? Socket.unpack_sockaddr_in(peername).reverse : nil
+      end
+
+      #
+      # relay data from backend server to client
+      #
+      def relay_from_backend(name, data)
+        debug [:relay_from_backend, name, data]
+
+        data = @on_response.call(name, data) if @on_response
+        send_data data unless data.nil?
+      end
+
+      def connected(name)
+        debug [:connected]
+        @on_connect.call(name) if @on_connect
+      end
+
+      def unbind
+        debug [:unbind, :connection]
+
+        # terminate any unfinished connections
+        @servers.values.compact.each do |s|
+          s.close_connection
+        end
+      end
+
+      def unbind_backend(name)
+        debug [:unbind_backend, name]
+        @servers[name] = nil
+        close = :close
+
+        if @on_finish
+          close = @on_finish.call(name)
+        end
+
+        # if all connections are terminated downstream, then notify client
+        if @servers.values.compact.size.zero? and close != :keep
+          close_connection_after_writing
+        end
+      end
+
+      private
+
+      def debug(*data)
+        if @debug
+          require 'pp'
+          pp data
+          puts
+        end
+      end
+    end
+  end
+end

data/spec/balancing_spec.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/balancing'
+require 'helper'
+require File.join(File.dirname(__FILE__), '../', 'examples/balancing')
 
 describe BalancingProxy do
 

data/spec/helper.rb

@@ -1,6 +1,5 @@
-require 'rubygems'
-require 'rspec'
-require 'pp'
+require 'bundler/setup'
 require 'em-http'
+require 'pp'
 
-require 'lib/em-proxy'
+require 'em-proxy'

data/spec/proxy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require 'helper'
 
 describe Proxy do
 
@@ -68,7 +68,7 @@ describe Proxy do
       end
 
       Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
-        conn.server :goog, :host => "google.com", :port => 80
+        conn.server :bing, :host => "google.com", :port => 80
         conn.server :yhoo, :host => "yahoo.com", :port => 80
         conn.on_data { |data| data }
 

metadata

@@ -1,89 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-proxy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.1.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-16 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156629200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156629200
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156628760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156628760
+- !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156628320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156628320
+- !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156627720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *2156627720
 description: EventMachine Proxy DSL
-email: 
+email:
 - ilya@igvita.com
-executables: 
+executables:
 - em-proxy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
-- README.rdoc
+- README.md
 - Rakefile
 - bin/em-proxy
 - em-proxy.gemspec
@@ -92,6 +76,7 @@ files:
 - examples/balancing.rb
 - examples/beanstalkd_interceptor.rb
 - examples/duplex.rb
+- examples/http_proxy.rb
 - examples/line_interceptor.rb
 - examples/port_forward.rb
 - examples/relay_port_forward.rb
@@ -107,41 +92,32 @@ files:
 - spec/balancing_spec.rb
 - spec/helper.rb
 - spec/proxy_spec.rb
-has_rdoc: true
 homepage: http://github.com/igrigorik/em-proxy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2051780992673318158
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2051780992673318158
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-proxy
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: EventMachine Proxy DSL
-test_files: 
+test_files:
 - spec/balancing_spec.rb
 - spec/helper.rb
 - spec/proxy_spec.rb
+has_rdoc: 

data/README.rdoc

@@ -1,82 +0,0 @@
-= EM-Proxy
-
-EventMachine Proxy DSL for writing high-performance transparent / intercepting proxies in Ruby.
-
-- Slides from RailsConf 2009: http://bit.ly/D7oWB
-- GoGaRuCo notes & Slides: http://www.igvita.com/2009/04/20/ruby-proxies-for-scale-and-monitoring/
-
-== Getting started
-
-  $> gem install em-proxy
-  $> em-proxy
-  Usage: em-proxy [options]
-      -l, --listen [PORT]              Port to listen on
-      -d, --duplex [host:port, ...]    List of backends to duplex data to
-      -r, --relay [hostname:port]      Relay endpoint: hostname:port
-      -v, --verbose                    Run in debug mode
-
-  $> em-proxy -l 8080 -r localhost:8081 -d localhost:8082,localhost:8083 -v
-
-The above will start em-proxy on port 8080, relay and respond with data from port 8081, and also (optional) duplicate all traffic to ports 8082 and 8083 (and discard their responses).
-
-== Simple port forwarding proxy
-
-    Proxy.start(:host => "0.0.0.0", :port => 80, :debug => true) do |conn|
-      conn.server :srv, :host => "127.0.0.1", :port => 81
-
-      # modify / process request stream
-      conn.on_data do |data|
-        p [:on_data, data]
-        data
-      end
-
-      # modify / process response stream
-      conn.on_response do |backend, resp|
-        p [:on_response, backend, resp]
-        resp
-      end
-
-      # termination logic
-      conn.on_finish do |backend, name|
-        p [:on_finish, name]
-
-        # terminate connection (in duplex mode, you can terminate when prod is done)
-        unbind if backend == :srv
-      end
-    end
-
-For more examples see the /examples directory.
-- SMTP Spam Filtering
-- Duplicating traffic
-- Selective forwarding
-- Beanstalkd interceptor
-- etc.
-
-A schema-free MySQL proof of concept, via an EM-Proxy server:
-- http://www.igvita.com/2010/03/01/schema-free-mysql-vs-nosql/
-- Code in examples/schemaless-mysql
-
-== License
-
-(The MIT License)
-
-Copyright (c) 2010 Ilya Grigorik
-
-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.