thin 1.2.2 → 1.2.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 1.2.3
+ * Fix a few issues in thin to make it a better "gem citizen" [josh]
+ * Fix test for rack based Rails in adapter under Ruby >= 1.8.7 [#109 state:resolved]
+ * Fix Remote address spoofing vulnerability in Connection#remote_address [Alexey Borzenkov]
+ * Fix uninitialized constant ActionController::Dispatcher error with Rails 1.2.3 [Chris Anderton] [#103 state:resolved]
+
 == 1.2.2 I Find Your Lack of Sauce Disturbing release
  * Fix force kill under 1.9 [Alexey Chebotar]
  * Fix regression when --only option is used w/ --socket.

data/README

@@ -20,20 +20,12 @@ For the latest stable version:
 
  sudo gem install thin
 
-or using my mirror (might be more recent and unstable):
-
- sudo gem install thin --source http://code.macournoyer.com
-
 Or from source:
 
  git clone git://github.com/macournoyer/thin.git
  cd thin
  rake install
 
-To use Thin with UNIX domain sockets you need EventMachine 0.11.0 from my gem server:
-
- gem install eventmachine --source http://code.macournoyer.com
-
 === Usage
 A +thin+ script offers an easy way to start your Rails application:
 

data/Rakefile

@@ -4,10 +4,33 @@ SUDO     = (WIN ? "" : "sudo")
 
 require 'rake'
 require 'rake/clean'
-require 'lib/thin'
+require 'rake/extensiontask' # from rake-compiler gem
 
+$: << File.join(File.dirname(__FILE__), 'lib')
+require 'thin'
+
+# Load tasks in tasks/
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 task :default => :spec
 
-ext_task :thin_parser
+Rake::ExtensionTask.new('thin_parser', Thin::GemSpec) do |ext|
+  ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
+  ext.cross_platform = 'i386-mswin32'     # forces the Windows platform instead of the default one
+                                          # configure options only for cross compile
+end
+
+CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
+
+desc "Compile the Ragel state machines"
+task :ragel do
+  Dir.chdir 'ext/thin_parser' do
+    target = "parser.c"
+    File.unlink target if File.exist? target
+    sh "ragel parser.rl | rlgen-cd -G2 -o #{target}"
+    raise "Failed to compile Ragel state machine" unless File.exist? target
+  end
+end
+
+desc "Release version #{Thin::VERSION::STRING} gems to rubyforge"
+task :release => [:clean, :cross, :native, :gem, :tag, "gem:upload"]

data/benchmark/runner

@@ -6,7 +6,10 @@
 #
 #  ruby simple.rb [num of request] [print|graph] [concurrency levels]
 #
-require File.dirname(__FILE__) + '/../lib/thin'
+
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'thin'
+
 require File.dirname(__FILE__) + '/benchmarker'
 require 'optparse'
 

data/bin/thin

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Thin command line interface script.
 # Run <tt>thin -h</tt> to get more usage.
-require File.dirname(__FILE__) + '/../lib/thin'
 
-Thin::Runner.new(ARGV).run!
+require 'thin'
+Thin::Runner.new(ARGV).run!

data/example/adapter.rb

@@ -1,7 +1,7 @@
 # Run with: ruby adapter.rb
 # Then browse to http://localhost:3000/test
 # and http://localhost:3000/files/adapter.rb
-require File.dirname(__FILE__) + '/../lib/thin'
+require 'thin'
 
 class SimpleAdapter
   def call(env)

data/example/config.ru

@@ -5,8 +5,7 @@
 # 
 # Check Rack::Builder doc for more details on this file format:
 #  http://rack.rubyforge.org/doc/classes/Rack/Builder.html
-
-require ::File.dirname(__FILE__) + '/../lib/thin'
+require 'thin'
 
 app = proc do |env|
   # Response body has to respond to each and yield strings

data/lib/rack/adapter/rails.rb

@@ -22,7 +22,7 @@ module Rack
         
         load_application
         
-        @rails_app = if ActionController::Dispatcher.instance_methods.include?(:call)
+        @rails_app = if rack_based?
           ActionController::Dispatcher.new
         else
           CgiApp.new
@@ -31,6 +31,12 @@ module Rack
         @file_app = Rack::File.new(::File.join(RAILS_ROOT, "public"))
       end
       
+      def rack_based?
+        ActionController.const_defined?(:Dispatcher) &&
+          (ActionController::Dispatcher.instance_methods.include?(:call)
+           || ActionController::Dispatcher.instance_methods.include?("call"))
+      end
+      
       def load_application
         ENV['RAILS_ENV'] = @env
 

data/lib/thin.rb

@@ -1,12 +1,9 @@
-$:.unshift File.expand_path(File.dirname(__FILE__))
-
 require 'fileutils'
 require 'timeout'
 require 'stringio'
 require 'time'
 require 'forwardable'
 
-require 'rubygems'
 require 'openssl'
 require 'eventmachine'
 

data/lib/thin/connection.rb

@@ -126,7 +126,7 @@ module Thin
     end
 
     def close_request_response
-      @request.async_close.succeed
+      @request.async_close.succeed if @request.async_close
       @request.close  rescue nil
       @response.close rescue nil
     end
@@ -180,7 +180,7 @@ module Thin
 
     # IP Address of the remote client.
     def remote_address
-      @request.forwarded_for || socket_address
+      socket_address
     rescue Exception
       log_error
       nil

data/lib/thin/request.rb

@@ -21,7 +21,6 @@ module Thin
     HTTP_VERSION      = 'HTTP_VERSION'.freeze
     HTTP_1_0          = 'HTTP/1.0'.freeze
     REMOTE_ADDR       = 'REMOTE_ADDR'.freeze
-    FORWARDED_FOR     = 'HTTP_X_FORWARDED_FOR'.freeze
     CONTENT_LENGTH    = 'CONTENT_LENGTH'.freeze
     CONNECTION        = 'HTTP_CONNECTION'.freeze
     KEEP_ALIVE_REGEXP = /\bkeep-alive\b/i.freeze
@@ -123,10 +122,6 @@ module Thin
       @env[REMOTE_ADDR] = address
     end
 
-    def forwarded_for
-      @env[FORWARDED_FOR]
-    end
-
     def threaded=(value)
       @env[RACK_MULTITHREAD] = value
     end

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 2
+    TINY     = 3
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "I Find Your Lack of Sauce Disturbing".freeze
+    CODENAME = "Flaming Astroboy".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/connection_spec.rb

@@ -40,9 +40,10 @@ describe Connection do
     @connection.process
   end
   
-  it "should return HTTP_X_FORWARDED_FOR as remote_address" do
+  it "should not 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'
+    @connection.stub!(:socket_address).and_return("127.0.0.1")
+    @connection.remote_address.should == "127.0.0.1"
   end
   
   it "should return nil on error retreiving remote_address" do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require File.dirname(__FILE__) + '/../lib/thin'
+require 'thin'
 require 'spec'
 require 'benchmark'
 require 'timeout'

data/tasks/deploy.rake

@@ -1,14 +1,11 @@
 namespace :deploy do
   task :site => %w(site:upload rdoc:upload)
   
-  desc 'Deploy on code.macournoyer.com'
-  task :alpha => %w(gem:upload deploy:site)
-  
   desc 'Deploy on rubyforge'
-  task :public => %w(gem:upload_rubyforge deploy:site)  
+  task :gem => %w(gem:upload_rubyforge deploy:site)
 end
 desc 'Deploy on all servers'
-task :deploy => %w(deploy:alpha deploy:public)
+task :deploy => "deploy:gem"
 
 def upload(file, to, options={})
   sh %{ssh macournoyer@code.macournoyer.com "rm -rf code.macournoyer.com/#{to}"} if options[:replace]

data/tasks/gem.rake

@@ -1,11 +1,11 @@
 require 'rake/gempackagetask'
 require 'yaml'
 
-WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
+WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'x86-mswin32'
 
 task :clean => :clobber_package
 
-spec = Gem::Specification.new do |s|
+Thin::GemSpec = Gem::Specification.new do |s|
   s.name                  = Thin::NAME
   s.version               = Thin::VERSION::STRING
   s.platform              = WIN ? Gem::Platform::CURRENT : Gem::Platform::RUBY
@@ -40,8 +40,8 @@ spec = Gem::Specification.new do |s|
   s.bindir                = "bin"
 end
 
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
+Rake::GemPackageTask.new(Thin::GemSpec) do |p|
+  p.gem_spec = Thin::GemSpec
 end
 
 task :tag_warn do
@@ -61,48 +61,14 @@ task :gem => :tag_warn
 namespace :gem do
   desc "Update the gemspec for GitHub's gem server"
   task :github do
-    File.open("thin.gemspec", 'w') { |f| f << YAML.dump(spec) }
+    File.open("thin.gemspec", 'w') { |f| f << YAML.dump(Thin::GemSpec) }
   end
   
-  desc 'Upload gem to code.macournoyer.com'
+  desc 'Upload gems (ruby & win32) to rubyforge.org'
   task :upload => :gem do
-    upload "pkg/#{spec.full_name}.gem", 'gems'
-    system 'ssh macournoyer@code.macournoyer.com "cd code.macournoyer.com && gem generate_index"'
-  end
-  
-  namespace :upload do
-    desc 'Upload the precompiled win32 gem to code.macournoyer.com'
-    task :win do
-      upload "pkg/#{spec.full_name}-#{WIN_SUFFIX}.gem", 'gems'
-      system 'ssh macournoyer@code.macournoyer.com "cd code.macournoyer.com && gem generate_index"'
-    end    
-
-    desc 'Upload gems (ruby & win32) to rubyforge.org'
-    task :rubyforge => :gem do
-      sh 'rubyforge login'
-      sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
-      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}.gem"
-      sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{spec.full_name}-#{WIN_SUFFIX}.gem"
-    end
-  end
-  
-  desc 'Download the Windows gem from Kevin repo'
-  task 'download:win' => 'pkg' do
-    cd 'pkg' do
-      `wget http://rubygems.bantamtech.com/ruby18/gems/#{spec.full_name}-#{WIN_SUFFIX}.gem`
-    end
+    sh 'rubyforge login'
+    sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}.gem"
+    sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}.gem"
+    sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}-#{WIN_SUFFIX}.gem"
   end
 end
-
-task :install => [:clobber, :compile, :package] do
-  sh "#{SUDO} #{gem} install pkg/#{spec.full_name}.gem"
-end
-
-task :uninstall => :clean do
-  sh "#{SUDO} #{gem} uninstall -v #{Thin::VERSION::STRING} -x #{Thin::NAME}"
-end
-
-
-def gem
-  RUBY_1_9 ? 'gem19' : 'gem'
-end

data/tasks/spec.rake

@@ -23,6 +23,7 @@ else
   
   def spec_task(name, specs)
     Spec::Rake::SpecTask.new(name) do |t|
+      t.libs << 'lib'
       t.spec_opts = %w(-fs -c)
       t.spec_files = specs
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -04:00
+date: 2009-09-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- lib/thin_parser.bundle
+- lib/thin_parser.so
 - spec/backends
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
@@ -204,7 +204,6 @@ files:
 - tasks/announce.rake
 - tasks/deploy.rake
 - tasks/email.erb
-- tasks/ext.rake
 - tasks/gem.rake
 - tasks/rdoc.rake
 - tasks/site.rake

data/tasks/ext.rake

@@ -1,42 +0,0 @@
-CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM)
-
-def ext_task(name)
-  ext_dir    = "ext/#{name}"
-  ext_bundle = "#{ext_dir}/#{name}.#{Config::CONFIG['DLEXT']}"
-  ext_files  = FileList[
-    "#{ext_dir}/*.c",
-    "#{ext_dir}/*.h",
-    "#{ext_dir}/*.rl",
-    "#{ext_dir}/extconf.rb",
-    "#{ext_dir}/Makefile",
-    "lib"
-  ]
-  
-  task "compile:#{name}" => ["#{ext_dir}/Makefile", ext_bundle]
-  task :compile => "compile:#{name}"
-  
-  file "#{ext_dir}/Makefile" => ["#{ext_dir}/extconf.rb"] do
-    cd(ext_dir) { ruby "extconf.rb" }
-  end
-
-  file ext_bundle => ext_files do
-    cd ext_dir do
-      sh(WIN ? 'nmake' : 'make')
-    end
-    cp ext_bundle, 'lib/'
-  end
-end
-
-desc "Compile the Ragel state machines"
-task :ragel do
-  Dir.chdir 'ext/thin_parser' do
-    target = "parser.c"
-    File.unlink target if File.exist? target
-    sh "ragel parser.rl | rlgen-cd -G2 -o #{target}"
-    raise "Failed to compile Ragel state machine" unless File.exist? target
-  end
-end
-  
-desc "Compile the extensions"
-task :compile
-task :package => :compile