em-proxy 0.1.7 → 0.1.8

data/.gitignore

@@ -1 +1,3 @@
 .bundle
+pkg
+

data/.rspec

@@ -0,0 +1,2 @@
+--format=documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+

data/CHANGELOG.md

@@ -0,0 +1,59 @@
+0.1.8 (December 12, 2012)
+--------------------
+
+* [#28](https://github.com/igrigorik/em-proxy/pull/28) - Fix: bin script - close connections only on relay response - [@bo-chen](https://github.com/bo-chen).
+* [#31](https://github.com/igrigorik/em-proxy/pull/31) - Added support for proxying to a unix domain socket - [@dblock](https://github.com/dblock).
+* [#34](https://github.com/igrigorik/em-proxy/pull/34) - Fix: duplex TCP traffic to two backends spec race condition - [@dblock](https://github.com/dblock).
+
+0.1.7 (October 13, 2012)
+------------------------
+
+* Allow force-close on upstream connections - [@igrigoric](https://github.com/igrigorik).
+* [#25](https://github.com/igrigorik/em-proxy/pull/25): Added `bind` support - [@kostya](https://github.com/kostya).
+* [#27](https://github.com/igrigorik/em-proxy/pull/27): Alias `sock` for `get_sockname` - [@kostya](https://github.com/kostya).
+
+0.1.6 (December 27, 2011)
+-------------------------
+
+* Added HTTP proxy example - [@igrigoric](https://github.com/igrigorik).
+* [#11](https://github.com/igrigorik/em-proxy/issues/11) - Fix: closing the client connection immediately after servers connection are closed - [@igrigoric](https://github.com/igrigorik).
+* [#13](https://github.com/igrigorik/em-proxy/pull/13): Removed duplicate `unbind_backend` - [@outself](https://github.com/outself).
+* [#20](https://github.com/igrigorik/em-proxy/issues/20): Fix: don't buffer data in back-end - [@igrigoric](https://github.com/igrigorik).
+
+0.1.5 (January 16, 2011)
+------------------------
+
+* Added `em-proxy` bin script for easy proxy debugging & relay use cases - [@igrigoric](https://github.com/igrigorik).
+* Replaced Jeweler with Bundler - [@igrigoric](https://github.com/igrigorik).
+* Added example of a simple load-balancing proxy - [@karmi](https://github.com/karmi).
+
+0.1.4 (October 3, 2010)
+-----------------------
+
+* Fix: use `instance_eval` to allow unbind - [@igrigoric](https://github.com/igrigorik).
+
+0.1.3 (May 29, 2010)
+--------------------
+
+* Fix: `on_connect` should fire after connection is established to each backend - [@igrigoric](https://github.com/igrigorik).
+* Fix: `get_peername` can return nil - [@mdkent](https://github.com/mdkent).
+
+0.1.2 (March 26, 2010)
+----------------------
+
+* Fix: wait until finishing writing on the frontend - [@eudoxa](https://github.com/eudoxa).
+* Removed `:done` callback in `on_finish` - [@igrigoric](https://github.com/igrigorik).
+* Ruby 1.9 compatibility - [@dsander](https://github.com/dsander).
+* Use EM's `proxy_incomming_to` to do low-level data relaying - [@dsander](https://github.com/dsander).
+* Use `Proc#call` instead of `Object#instance_exec` - [@dsander](https://github.com/dsander).
+* Added `on_connect` callback, peer helper method - [@dsander](https://github.com/dsander).
+* Added schema-free mysql example - [@igrigoric](https://github.com/igrigorik).
+* Added support for async processing within the `on_data` callback - [@igrigoric](https://github.com/igrigorik).
+
+0.1.1 (October 25, 2009)
+------------------------
+
+* Initial public release - [@igrigoric](https://github.com/igrigorik).
+* Simple port forwarder - [@igrigoric](https://github.com/igrigorik).
+* Duplex, interceptor, smtp whitelist, beanstalkd interceptor, smtp spam filter and selective forward examples - [@igrigoric](https://github.com/igrigorik).
+* Control debug output - [@imbriaco](https://github.com/imbriaco).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    em-proxy (0.1.6)
+    em-proxy (0.1.7)
       eventmachine
 
 GEM
@@ -17,8 +17,9 @@ GEM
       http_parser.rb (>= 0.5.2)
     em-socksify (0.1.0)
       eventmachine
-    eventmachine (1.0.0.beta.4)
+    eventmachine (1.0.0)
     http_parser.rb (0.5.3)
+    posix-spawn (0.3.6)
     rake (0.9.2.2)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -36,5 +37,6 @@ DEPENDENCIES
   ansi
   em-http-request
   em-proxy!
+  posix-spawn
   rake
   rspec

data/README.md

@@ -1,5 +1,7 @@
 # EM-Proxy
 
+[![Build Status](https://travis-ci.org/igrigorik/em-proxy.png?branch=master)](https://travis-ci.org/igrigorik/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)
@@ -14,6 +16,7 @@ EventMachine Proxy DSL for writing high-performance transparent / intercepting p
       -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
+      -s, --socket [filename]          Relay endpoint: unix filename
       -v, --verbose                    Run in debug mode
 
     $> em-proxy -l 8080 -r localhost:8081 -d localhost:8082,localhost:8083 -v
@@ -64,4 +67,4 @@ A schema-free MySQL proof of concept, via an EM-Proxy server:
 
 ## License
 
-The MIT License - Copyright (c) 2010 Ilya Grigorik
+The MIT License - Copyright (c) 2010 Ilya Grigorik

data/bin/em-proxy

@@ -24,6 +24,10 @@ OptionParser.new do |opts|
     options[:relay] = v.split(":")
   end
 
+  opts.on("-s", "--socket [filename]", String, "Relay endpoint: unix filename") do |v|
+    options[:socket] = v
+  end
+
   opts.on("-v", "--verbose", "Run in debug mode") do |v|
     options[:verbose] = v
   end
@@ -31,7 +35,11 @@ end.parse!
 
 
 Proxy.start(:host => "0.0.0.0", :port => options[:listen] , :debug => options[:verbose]) do |conn|
-  conn.server :relay, :host => options[:relay].first, :port => options[:relay].last.to_i
+  if options[:socket]
+    conn.server :socket, :socket => options[:socket]
+  else
+    conn.server :relay, :host => options[:relay].first, :port => options[:relay].last.to_i
+  end
 
   options[:duplex].each_with_index do |backend,i|
     hostname, port = backend.split(":")
@@ -45,4 +53,8 @@ Proxy.start(:host => "0.0.0.0", :port => options[:listen] , :debug => options[:v
   conn.on_response do |server, resp|
     resp if server == :relay
   end
-end
+
+  conn.on_finish do |server|
+    :close if server == :relay
+  end
+end

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.7"
+  s.version     = "0.1.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "em-http-request"
   s.add_development_dependency "ansi"
   s.add_development_dependency "rake"
+  s.add_development_dependency "posix-spawn"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/em-proxy/connection.rb

@@ -43,11 +43,20 @@ module EventMachine
       # initialize connections to backend servers
       #
       def server(name, opts)
-        srv = EventMachine::bind_connect(opts[:bind_host], opts[:bind_port], 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]
+        if opts[:socket]
+          srv = EventMachine::connect_unix_domain(opts[:socket], EventMachine::ProxyServer::Backend, @debug) do |c|
+            c.name = name
+            c.plexer = self
+            c.proxy_incoming_to(self, 10240) if opts[:relay_server]
+          end
+        else
+          srv = EventMachine::bind_connect(opts[:bind_host], opts[:bind_port], 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
         end
+
         self.proxy_incoming_to(srv, 10240) if opts[:relay_client]
 
         @servers[name] = srv

data/spec/helper.rb

@@ -1,5 +1,7 @@
 require 'bundler/setup'
 require 'em-http'
 require 'pp'
+require 'tmpdir'
+require 'posix/spawn'
 
 require 'em-proxy'

data/spec/proxy_spec.rb

@@ -1,6 +1,7 @@
 require 'helper'
 
 describe Proxy do
+  include POSIX::Spawn
 
   def failed
     EventMachine.stop
@@ -68,7 +69,7 @@ describe Proxy do
       end
 
       Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
-        conn.server :bing, :host => "google.com", :port => 80
+        conn.server :goog, :host => "google.com", :port => 80
         conn.server :yhoo, :host => "yahoo.com", :port => 80
         conn.on_data { |data| data }
 
@@ -86,6 +87,12 @@ describe Proxy do
 
           EventMachine.stop if seen.size == 2
         end
+
+        conn.on_finish do |name|
+          # keep the connection open if we're still expecting a response
+          seen.count == 2 ? :close : :keep
+        end
+
       end
     end
   end
@@ -164,4 +171,69 @@ describe Proxy do
       end
     }.should_not raise_error
   end
+
+  context "echo server" do
+    before :each do
+      @echo_server = File.expand_path("../../spec/support/echo_server.rb", __FILE__)
+    end
+
+    context "with a server listening on a TCP port" do
+      before :each do
+        @host = '127.0.0.1'
+        @port = 4242
+        @pid  = spawn("ruby #{@echo_server} #{@host} #{@port}")
+        sleep 1 # let the server come up
+      end
+      after :each do
+        Process.kill('QUIT', @pid)
+      end
+      it "should connect to a unix socket" do
+        connected = false
+        EM.run do
+          EventMachine.add_timer(0.1) do
+            EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
+          end
+          host = @host
+          port = @port
+          Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
+            conn.server :local, :host => host, :port => port
+            conn.on_connect do |name|
+              connected = true
+              EventMachine.stop
+            end
+          end
+        end
+        connected.should == true
+      end
+    end
+
+    context "with a server listening on a unix socket" do
+      before :each do
+        @socket = File.join(Dir.tmpdir, 'em-proxy.sock')
+        @pid  = spawn("ruby #{@echo_server} #{@socket}")
+        sleep 1 # let the server come up
+      end
+      after :each do
+        Process.kill('QUIT', @pid)
+      end
+      it "should connect to a unix socket" do
+        connected = false
+        EM.run do
+          EventMachine.add_timer(0.1) do
+            EventMachine::HttpRequest.new('http://127.0.0.1:8080/').get({:timeout => 1})
+          end
+          socket = @socket
+          Proxy.start(:host => "0.0.0.0", :port => 8080) do |conn|
+            conn.server :local, :socket => socket
+            conn.on_connect do |name|
+              connected = true
+              EventMachine.stop
+            end
+          end
+        end
+        connected.should == true
+      end
+    end
+  end
+
 end

data/spec/support/echo_server.rb

@@ -0,0 +1,18 @@
+require 'eventmachine'
+
+module EchoServer
+  def receive_data data
+    send_data ">>>you sent: #{data}"
+    close_connection if data =~ /quit/i
+  end
+end
+
+EventMachine.run do
+  if ARGV.count == 2
+    EventMachine.start_server ARGV.first, ARGV.last.to_i, EchoServer
+  elsif ARGV.count == 1
+    EventMachine.start_server ARGV.first, EchoServer
+  else
+    raise "invalid number of params, expected [server] ([port])"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: EventMachine Proxy DSL
 email:
 - ilya@igvita.com
@@ -101,6 +117,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -128,6 +146,7 @@ files:
 - spec/balancing_spec.rb
 - spec/helper.rb
 - spec/proxy_spec.rb
+- spec/support/echo_server.rb
 homepage: http://github.com/igrigorik/em-proxy
 licenses: []
 post_install_message: 
@@ -156,4 +175,5 @@ test_files:
 - spec/balancing_spec.rb
 - spec/helper.rb
 - spec/proxy_spec.rb
+- spec/support/echo_server.rb
 has_rdoc: