passenger 4.0.60 → 5.0.0.beta1

data/test/ruby/debug_logging_spec.rb

@@ -1,137 +1,141 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 PhusionPassenger.require_passenger_lib 'debug_logging'
-PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 require 'stringio'
+require 'tmpdir'
+require 'fileutils'
 
 module PhusionPassenger
 
 describe DebugLogging do
 	after :each do
-		DebugLogging.log_level = 0
+		DebugLogging.log_level = DEFAULT_LOG_LEVEL
 		DebugLogging.log_file = nil
 		DebugLogging.stderr_evaluator = nil
+		FileUtils.rm_rf(@tmpdir) if @tmpdir
 	end
-	
+
 	class MyClass
 		include DebugLogging
 	end
-	
+
 	def use_log_file!
-		@log_file = PhusionPassenger::Utils.passenger_tmpdir + "/debug.log"
+		@tmpdir = Dir.mktmpdir
+		@log_file = "#{@tmpdir}/debug.log"
 		DebugLogging.log_file = @log_file
 	end
-	
+
 	describe "#debug" do
-		it "doesn't print the message if log level is 0" do
+		it "doesn't print the message if log level is LVL_INFO" do
 			use_log_file!
+			DebugLogging.log_level = LVL_INFO
 			DebugLogging.debug("hello")
 			File.exist?(@log_file).should be_false
 		end
-		
-		it "prints the message if log level is 1" do
+
+		it "prints the message if log level is LVL_DEBUG" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.debug("hello")
 			File.exist?(@log_file).should be_true
 		end
-		
-		it "prints the message if log level is greater than 1" do
+
+		it "prints the message if log level is greater than LVL_DEBUG" do
 			use_log_file!
-			DebugLogging.log_level = 2
+			DebugLogging.log_level = LVL_DEBUG2
 			DebugLogging.debug("hello")
 			File.exist?(@log_file).should be_true
 		end
-		
+
 		it "prints the location of the calling function" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.debug("hello")
 			File.read(@log_file).should include("debug_logging_spec.rb")
 		end
-		
+
 		it "prints to STDERR by default" do
 			io = StringIO.new
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.stderr_evaluator = lambda { io }
 			DebugLogging.debug("hello")
 			io.string.should include("hello")
 		end
-		
+
 		it "reopens the log file handle if it has been closed" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.debug("hello")
 			DebugLogging._log_device.close
 			DebugLogging.debug("world")
 			File.read(@log_file).should include("world")
 		end
-		
+
 		it "also works as included method" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			MyClass.new.send(:debug, "hello")
 			File.read(@log_file).should include("hello")
 		end
-		
+
 		it "is private when included" do
 			MyClass.private_method_defined?(:debug)
 		end
 	end
-	
+
 	describe "#trace" do
-		specify "#trace(x, ...) doesn't print the message if the log level is lower than x" do
+		specify "#trace(x, ...) doesn't print the message if the log level is lower than LVL_INFO + x" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_INFO + 1
 			DebugLogging.trace(2, "hello")
 			File.exist?(@log_file).should be_false
 		end
-		
-		specify "#trace(x, ...) prints the message if the log level equals x" do
+
+		specify "#trace(x, ...) prints the message if the log level equals LVL_INFO + 2" do
 			use_log_file!
-			DebugLogging.log_level = 2
+			DebugLogging.log_level = LVL_INFO + 2
 			DebugLogging.trace(2, "hello")
 			File.exist?(@log_file).should be_true
 		end
-		
-		specify "#trace(x, ...) prints the message if the log level is greater than x" do
+
+		specify "#trace(x, ...) prints the message if the log level is greater than LVL_INFO + 3" do
 			use_log_file!
-			DebugLogging.log_level = 3
+			DebugLogging.log_level = LVL_INFO + 3
 			DebugLogging.trace(2, "hello")
 			File.exist?(@log_file).should be_true
 		end
-		
+
 		specify "#trace prints the location of the calling function" do
 			io = StringIO.new
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.stderr_evaluator = lambda { io }
 			DebugLogging.trace(1, "hello")
 			io.string.should include("hello")
 		end
-		
+
 		it "prints to STDERR by default" do
 			io = StringIO.new
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.stderr_evaluator = lambda { io }
 			DebugLogging.trace(1, "hello")
 			io.string.should include("hello")
 		end
-		
+
 		it "reopens the log file handle if it has been closed" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			DebugLogging.trace(1, "hello")
 			DebugLogging._log_device.close
 			DebugLogging.trace(1, "world")
 			File.read(@log_file).should include("world")
 		end
-		
+
 		it "also works as included method" do
 			use_log_file!
-			DebugLogging.log_level = 1
+			DebugLogging.log_level = LVL_DEBUG
 			MyClass.new.send(:trace, 1, "hello")
 			File.read(@log_file).should include("hello")
 		end
-		
+
 		it "is private when included" do
 			MyClass.private_method_defined?(:trace)
 		end

data/test/ruby/rails3.0/preloader_spec.rb

@@ -4,7 +4,7 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
-describe "Rack loader with Rails 3.0" do
+describe "Rack preloader with Rails 3.0" do
 	include LoaderSpecHelper
 
 	before :each do

data/test/ruby/rails3.1/preloader_spec.rb

@@ -4,7 +4,7 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
-describe "Rack loader with Rails 3.1" do
+describe "Rack preloader with Rails 3.1" do
 	include LoaderSpecHelper
 
 	before :each do

data/test/ruby/rails3.2/preloader_spec.rb

@@ -4,7 +4,7 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 
 module PhusionPassenger
 
-describe "Rack loader with Rails 3.2" do
+describe "Rack preloader with Rails 3.2" do
 	include LoaderSpecHelper
 
 	before :each do

data/test/ruby/rails4.0/preloader_spec.rb

@@ -5,7 +5,7 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 if RUBY_VERSION_INT >= 190
 module PhusionPassenger
 
-describe "Rack loader with Rails 4.0" do
+describe "Rack preloader with Rails 4.0" do
 	include LoaderSpecHelper
 
 	before :each do

data/test/ruby/rails4.1/preloader_spec.rb

@@ -5,7 +5,7 @@ require 'ruby/shared/rails/union_station_extensions_sharedspec'
 if RUBY_VERSION_INT >= 190
 module PhusionPassenger
 
-describe "Rack loader with Rails 4.1" do
+describe "Rack preloader with Rails 4.1" do
 	include LoaderSpecHelper
 
 	before :each do

data/test/ruby/request_handler_spec.rb

@@ -3,9 +3,11 @@ PhusionPassenger.require_passenger_lib 'request_handler'
 PhusionPassenger.require_passenger_lib 'request_handler/thread_handler'
 PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
 PhusionPassenger.require_passenger_lib 'union_station/core'
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'utils'
 
 require 'fileutils'
+require 'tmpdir'
 
 module PhusionPassenger
 
@@ -17,26 +19,26 @@ describe RequestHandler do
 	end
 
 	before :each do
+		@temp_dir = Dir.mktmpdir
 		preinitialize if respond_to?(:preinitialize)
-		@old_passenger_tmpdir = Utils.passenger_tmpdir
-		Utils.passenger_tmpdir = "request_handler_spec.tmp"
-		Utils.passenger_tmpdir
 		@owner_pipe = IO.pipe
 		@options ||= {}
 		@thread_handler = Class.new(DummyThreadHandler)
 		@options = {
 			"app_group_name" => "foobar",
 			"thread_handler" => @thread_handler,
-			"generation_dir" => "request_handler_spec.tmp"
+			"socket_dir"     => @temp_dir,
+			"keepalive"      => false
 		}.merge(@options)
 		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
 	end
 
 	after :each do
 		stop_request_handler
-		Utils.passenger_tmpdir = @old_passenger_tmpdir
-		FileUtils.chmod_R(0777, "request_handler_spec.tmp")
-		FileUtils.rm_rf("request_handler_spec.tmp")
+		if @temp_dir
+			FileUtils.chmod_R(0777, @temp_dir)
+			FileUtils.rm_rf(@temp_dir)
+		end
 	end
 
 	def stop_request_handler
@@ -72,14 +74,14 @@ describe RequestHandler do
 
 	it "creates a socket file in the Phusion Passenger temp folder, unless when using TCP sockets" do
 		if @request_handler.server_sockets[:main][1] == "unix"
-			File.chmod(0700, "request_handler_spec.tmp/backends")
-			Dir["request_handler_spec.tmp/backends/*"].should_not be_empty
+			File.chmod(0700, "#{@temp_dir}/backends")
+			Dir["#{@temp_dir}/backends/*"].should_not be_empty
 		end
 	end
 
 	specify "the main socket rejects headers that are too large" do
 		stderr = StringIO.new
-		DebugLogging.log_level = 0
+		DebugLogging.log_level = DEFAULT_LOG_LEVEL
 		DebugLogging.stderr_evaluator = lambda { stderr }
 		@request_handler.start_main_loop_thread
 		begin
@@ -146,7 +148,7 @@ describe RequestHandler do
 
 	specify "the HTTP socket rejects headers that are too large" do
 		stderr = StringIO.new
-		DebugLogging.log_level = 0
+		DebugLogging.log_level = DEFAULT_LOG_LEVEL
 		DebugLogging.stderr_evaluator = lambda { stderr }
 		@request_handler.start_main_loop_thread
 		begin
@@ -157,6 +159,7 @@ describe RequestHandler do
 				client.write("x" * RequestHandler::ThreadHandler::MAX_HEADER_SIZE)
 				sleep 0.01 # Context switch
 				client.write("x" * RequestHandler::ThreadHandler::MAX_HEADER_SIZE)
+				sleep 0.01 # Context switch
 				client.write(" HTTP/1.1\r\n")
 			end
 			block.should raise_error(SystemCallError)
@@ -167,7 +170,7 @@ describe RequestHandler do
 	end
 
 	specify "the HTTP socket rejects unauthenticated connections, if a connect password is supplied" do
-		DebugLogging.log_level = -1
+		DebugLogging.log_level = LVL_ERROR
 		@request_handler.connect_password = "1234"
 		@request_handler.start_main_loop_thread
 		begin
@@ -197,7 +200,6 @@ describe RequestHandler do
 		lambda_called = false
 
 		# Here we test that the exception is not propagated to outside the request handler.
-		DebugLogging.log_level = -2
 		@options["app"] = lambda do |env|
 			lambda_called = true
 			raise "an error"
@@ -226,7 +228,6 @@ describe RequestHandler do
 		lambda_called = false
 
 		# Here we test that the exception is not propagated to outside the request handler.
-		DebugLogging.log_level = -2
 		@options["app"] = lambda do |env|
 			lambda_called = true
 			body = Object.new
@@ -318,8 +319,9 @@ describe RequestHandler do
 				"REQUEST_METHOD" => "GET",
 				"PATH_INFO" => "/")
 			client.read.should ==
-				"Status: 200\r\n" +
+				"HTTP/1.1 200 Whatever\r\n" +
 				"Content-Type: text/html\r\n" +
+				"Connection: close\r\n" +
 				"\r\n" +
 				"Hijacked partial response!"
 		ensure
@@ -354,7 +356,9 @@ describe RequestHandler do
 			client.write("abc")
 			client.close_write
 			client.read.should ==
-				"Status: 200\r\n" +
+				"HTTP/1.1 200 Whatever\r\n" +
+				"Connection: close\r\n" +
+				"Content-Length: 2\r\n" +
 				"\r\n" +
 				"ok"
 		ensure
@@ -387,14 +391,16 @@ describe RequestHandler do
 			send_binary_request(client,
 				"REQUEST_METHOD" => "GET",
 				"PATH_INFO" => "/",
-				"HTTP_TRANSFER_ENCODING" => "chunked")
+				"TRANSFER_ENCODING" => "chunked")
 			client.write(
 				"3\r\n" +
 				"abc\r\n" +
 				"0\r\n\r\n")
 			client.close_write
 			client.read.should ==
-				"Status: 200\r\n" +
+				"HTTP/1.1 200 Whatever\r\n" +
+				"Connection: close\r\n" +
+				"Content-Length: 2\r\n" +
 				"\r\n" +
 				"ok"
 		ensure
@@ -427,7 +433,9 @@ describe RequestHandler do
 				"PATH_INFO" => "/")
 			client.close_write
 			client.read.should ==
-				"Status: 200\r\n" +
+				"HTTP/1.1 200 Whatever\r\n" +
+				"Connection: close\r\n" +
+				"Content-Length: 2\r\n" +
 				"\r\n" +
 				"ok"
 		ensure
@@ -444,6 +452,36 @@ describe RequestHandler do
 			end
 		end
 
+		it "doesn't allow reading from rack.input" do
+			lambda_called = false
+
+			@options["app"] = lambda do |env|
+				lambda_called = true
+				body = env['rack.input'].read.inspect
+				[200, { "Content-Type" => "text/plain" }, [body]]
+			end
+
+			@request_handler = RequestHandler.new(@owner_pipe[1], @options)
+			@request_handler.start_main_loop_thread
+			client = connect
+			begin
+				send_binary_request(client,
+					"REQUEST_METHOD" => "GET",
+					"PATH_INFO" => "/")
+				client.read.should ==
+					"HTTP/1.1 200 Whatever\r\n" +
+					"Content-Type: text/plain\r\n" +
+					"Connection: close\r\n" +
+					"Content-Length: 2\r\n" +
+					"\r\n" +
+					"\"\""
+			ensure
+				client.close
+			end
+
+			lambda_called.should be_true
+		end
+
 		it "allows reading from the client socket once the socket has been fully hijacked" do
 			lambda_called = false
 
@@ -503,7 +541,8 @@ describe RequestHandler do
 				client.write("hi")
 				client.close_write
 				client.read.should ==
-					"Status: 200\r\n" +
+					"HTTP/1.1 200 Whatever\r\n" +
+					"Connection: close\r\n" +
 					"\r\n" +
 					"ok"
 			ensure
@@ -520,10 +559,10 @@ describe RequestHandler do
 				Process.kill('KILL', @agent_pid)
 				Process.waitpid(@agent_pid)
 			end
-			@dump_file = "#{Utils.passenger_tmpdir}/log.txt"
+			@dump_file = "#{@temp_dir}/log.txt"
 			@logging_agent_password = "1234"
-			@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@dump_file,
-				@logging_agent_password)
+			@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(
+				@temp_dir, @dump_file, @logging_agent_password)
 
 			@union_station_core = UnionStation::Core.new(@socket_address, "logging",
 				"1234", "localhost")
@@ -576,7 +615,6 @@ describe RequestHandler do
 			@request_handler.start_main_loop_thread
 			client = connect
 			begin
-				DebugLogging.log_level = -2
 				send_binary_request(client,
 					"REQUEST_METHOD" => "GET",
 					"PASSENGER_TXN_ID" => "1234-abcd")