thin 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.6.4 Sexy Lobster release
+ * Fix error when stopping server on UNIX domain socket, fixes #42
+ * Rescue errors in Connection#get_peername more gracefully, setting REMOTE_ADDR to nil, fixes #43
+
 == 0.6.3 Ninja Cookie release
  * Add tasks for Vlad the Deployer in example/vlad.rake [cnantais]
  * Add Ramaze Rackup config file in example dir [tmm1]

data/lib/thin/connection.rb

@@ -11,6 +11,8 @@ module Thin
     # Connector to the server
     attr_accessor :connector
     
+    attr_accessor :request, :response
+    
     def post_init
       @request  = Request.new
       @response = Response.new
@@ -53,9 +55,20 @@ module Thin
       @connector.connection_finished(self)
     end
     
+    def remote_address
+      @request.env[Request::FORWARDED_FOR] || (has_peername? ? socket_address : nil)
+    rescue
+      log_error($!)
+      nil
+    end
+    
     protected
-      def remote_address
-        @request.env[Request::FORWARDED_FOR] || Socket.unpack_sockaddr_in(get_peername)[1]
+      def has_peername?
+        !get_peername.nil? && !get_peername.empty?
+      end
+      
+      def socket_address
+        Socket.unpack_sockaddr_in(get_peername)[1]
       end
   end
 end

data/lib/thin/connectors/unix_server.rb

@@ -1,6 +1,6 @@
 module Thin
   module Connectors
-    # Connectior to act as a UNIX domain socket server.
+    # Connector to act as a UNIX domain socket server.
     class UnixServer < Connector
       # UNIX domain socket on which the server is listening for connections.
       attr_accessor :socket
@@ -14,7 +14,10 @@ module Thin
       # Connect the server
       def connect
         at_exit { remove_socket_file } # In case it crashes
-        @signature = EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+        EventMachine.start_unix_domain_server(@socket, UnixConnection, &method(:initialize_connection))
+        # HACK EventMachine.start_unix_domain_server doesn't return the connection signature
+        #      so we have to go in the internal stuff to find it.
+        @signature = EventMachine.instance_eval{@acceptors.keys.first}
       end
       
       # Stops the server
@@ -38,9 +41,10 @@ module Thin
     end    
   end
 
+  # Connection through a UNIX domain socket.
   class UnixConnection < Connection
     protected
-      def remote_address
+      def socket_address
         # FIXME not sure about this, does it even make sense on a UNIX socket?
         Socket.unpack_sockaddr_un(get_peername)
       end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 0
     MINOR    = 6
-    TINY     = 3
+    TINY     = 4
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = 'Ninja Cookie'
+    CODENAME = 'Sexy Lobster'
   end
   
   NAME    = 'thin'.freeze

data/spec/connection_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Connection do
+  before do
+    @connection = Connection.new(mock('EM', :null_object => true))
+    @connection.silent = true
+    @connection.post_init
+    @connection.app = proc do |env|
+      [200, {}, ['']]
+    end
+  end
+  
+  it "should parse on receive_data" do
+    @connection.request.should_receive(:parse).with('GET')
+    @connection.receive_data('GET')
+  end
+
+  it "should close connection on InvalidRequest error in receive_data" do
+    @connection.request.stub!(:parse).and_raise(InvalidRequest)
+    @connection.should_receive(:close_connection)
+    @connection.receive_data('')
+  end
+  
+  it "should process when parsing complete" do
+    @connection.request.should_receive(:parse).and_return(true)
+    @connection.should_receive(:process)
+    @connection.receive_data('GET')
+  end
+  
+  it "should process" do
+    @connection.process
+  end
+  
+  it "should return HTTP_X_FORWARDED_FOR as remote_address" do
+    @connection.request.env['HTTP_X_FORWARDED_FOR'] = '1.2.3.4'
+    @connection.remote_address.should == '1.2.3.4'
+  end
+  
+  it "should return nil on error retreiving remote_address" do
+    @connection.stub!(:get_peername).and_raise(RuntimeError)
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return nil on nil get_peername" do
+    @connection.stub!(:get_peername).and_return(nil)
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return nil on empty get_peername" do
+    @connection.stub!(:get_peername).and_return('')
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return remote_address" do
+    @connection.stub!(:get_peername).and_return("\020\002?E\177\000\000\001\000\000\000\000\000\000\000\000")
+    @connection.remote_address.should == '127.0.0.1'
+  end
+end

data/spec/connectors/tcp_server_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Connectors::TcpServer do
+  before do
+    @connector = Connectors::TcpServer.new('0.0.0.0', 3333)
+  end
+  
+  it "should connect" do
+    EventMachine.run do
+      @connector.connect
+      EventMachine.stop
+    end
+  end
+  
+  it "should disconnect" do
+    EventMachine.run do
+      @connector.connect
+      @connector.disconnect
+      EventMachine.stop
+    end
+  end
+end

data/spec/connectors/unix_server_spec.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Connectors::UnixServer do
+  before do
+    @connector = Connectors::UnixServer.new('/tmp/thin-test.sock')
+  end
+  
+  it "should connect" do
+    EventMachine.run do
+      @connector.connect
+      EventMachine.stop
+    end
+  end
+  
+  it "should disconnect" do
+    EventMachine.run do
+      @connector.connect
+      @connector.disconnect
+      EventMachine.stop
+    end
+  end
+  
+  it "should remove socket file on close" do
+    @connector.close
+    File.exist?('/tmp/thin-test.sock').should be_false
+  end
+end
+
+describe UnixConnection do
+  before do
+    @connection = UnixConnection.new(nil)
+  end
+  
+  it "should return nil on error retreiving remote_address" do
+    @connection.stub!(:get_peername).and_raise(RuntimeError)
+    @connection.remote_address.should be_nil
+  end
+  
+  it "should return remote_address" do
+    @connection.stub!(:get_peername).and_return("\000\001127.0.0.1\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000")
+    @connection.remote_address.should == '127.0.0.1'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-07 00:00:00 -05:00
+date: 2008-02-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,10 +93,15 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
+- lib/thin_parser.bundle
 - spec/command_spec.rb
 - spec/configs
 - spec/configs/cluster.yml
 - spec/configs/single.yml
+- spec/connection_spec.rb
+- spec/connectors
+- spec/connectors/tcp_server_spec.rb
+- spec/connectors/unix_server_spec.rb
 - spec/controllers
 - spec/controllers/cluster_spec.rb
 - spec/controllers/controller_spec.rb
@@ -126,6 +131,7 @@ files:
 - spec/rails_app/config/initializers/mime_types.rb
 - spec/rails_app/config/routes.rb
 - spec/rails_app/log
+- spec/rails_app/log/mongrel_debug
 - spec/rails_app/public
 - spec/rails_app/public/404.html
 - spec/rails_app/public/422.html