passenger 3.0.21 → 3.9.1.beta

data/test/cxx/UtilsTest.cpp

@@ -15,10 +15,13 @@ using namespace std;
 namespace tut {
 	struct UtilsTest {
 		vector<string> output;
+		string cwd;
 		string oldPath;
 		TempDir tempDir;
 		
 		UtilsTest(): tempDir("tmp.dir") {
+			char buffer[PATH_MAX];
+			cwd = getcwd(buffer, sizeof(buffer));
 			oldPath = getenv("PATH");
 			unsetenv("PASSENGER_TEMP_DIR");
 		}
@@ -26,6 +29,7 @@ namespace tut {
 		~UtilsTest() {
 			setenv("PATH", oldPath.c_str(), 1);
 			unsetenv("PASSENGER_TEMP_DIR");
+			chdir(cwd.c_str());
 		}
 		
 		void testMakeDirTreeMode(const char *name, const char *mode, mode_t expected) {
@@ -169,11 +173,11 @@ namespace tut {
 	
 	TEST_METHOD(27) {
 		TempDir d("tmp.symlinks");
-		system("touch tmp.symlinks/foo.txt");
-		system("ln -s /usr/bin tmp.symlinks/absolute_symlink");
-		system("ln -s foo.txt tmp.symlinks/file");
-		system("ln -s file tmp.symlinks/file2");
-		system("ln -s file2 tmp.symlinks/file3");
+		runShellCommand("touch tmp.symlinks/foo.txt");
+		runShellCommand("ln -s /usr/bin tmp.symlinks/absolute_symlink");
+		runShellCommand("ln -s foo.txt tmp.symlinks/file");
+		runShellCommand("ln -s file tmp.symlinks/file2");
+		runShellCommand("ln -s file2 tmp.symlinks/file3");
 		ensure_equals(resolveSymlink("tmp.symlinks/file"), "tmp.symlinks/foo.txt");
 		ensure_equals(resolveSymlink("tmp.symlinks/file2"), "tmp.symlinks/file");
 		ensure_equals(resolveSymlink("tmp.symlinks/file3"), "tmp.symlinks/file2");
@@ -531,4 +535,54 @@ namespace tut {
 			"Weird &#1;&#0; characters?");
 		ensure_equals(escapeHTML("UTF-8: ☃ ☀; ☁ ☂\x01"), "UTF-8: ☃ ☀; ☁ ☂&#1;");
 	}
+
+	/***** Test absolutizePath() *****/
+
+	TEST_METHOD(53) {
+		ensure_equals(absolutizePath(""), cwd);
+		ensure_equals(absolutizePath("."), cwd);
+		ensure_equals(absolutizePath("foo"), cwd + "/foo");
+		ensure_equals(absolutizePath("foo/bar"), cwd + "/foo/bar");
+		ensure_equals(absolutizePath("foo//bar"), cwd + "/foo/bar");
+		ensure_equals(absolutizePath("foo/bar///baz"), cwd + "/foo/bar/baz");
+		ensure_equals(absolutizePath("foo/./bar"), cwd + "/foo/bar");
+		ensure_equals(absolutizePath("foo/bar/../baz"), cwd + "/foo/baz");
+		ensure_equals(absolutizePath("foo/bar/../.."), cwd);
+		ensure_equals(absolutizePath("foo/.././bar"), cwd + "/bar");
+		ensure_equals(absolutizePath("foo/../bar/./baz"), cwd + "/bar/baz");
+		ensure_equals(absolutizePath("foo/"), cwd + "/foo");
+		ensure_equals(absolutizePath("foo//"), cwd + "/foo");
+
+		ensure_equals(absolutizePath("/"), "/");
+		ensure_equals(absolutizePath("////"), "/");
+		ensure_equals(absolutizePath("/."), "/");
+		ensure_equals(absolutizePath("/foo"), "/foo");
+		ensure_equals(absolutizePath("/foo/bar"), "/foo/bar");
+		ensure_equals(absolutizePath("/foo//bar"), "/foo/bar");
+		ensure_equals(absolutizePath("/foo/bar///baz"), "/foo/bar/baz");
+		ensure_equals(absolutizePath("/foo/./bar"), "/foo/bar");
+		ensure_equals(absolutizePath("/foo/bar/../baz"), "/foo/baz");
+		ensure_equals(absolutizePath("/foo/bar/../.."), "/");
+		ensure_equals(absolutizePath("/foo/.././bar"), "/bar");
+		ensure_equals(absolutizePath("/foo/../bar/./baz"), "/bar/baz");
+		ensure_equals(absolutizePath("/foo/"), "/foo");
+		ensure_equals(absolutizePath("/foo//"), "/foo");
+		ensure_equals(absolutizePath("//foo/bar"), "/foo/bar");
+		ensure_equals(absolutizePath("///foo//bar"), "/foo/bar");
+		ensure_equals(absolutizePath("/../.."), "/");
+		ensure_equals(absolutizePath("/../.././foo"), "/foo");
+
+		chdir("/usr/lib");
+		ensure_equals(absolutizePath(".."), "/usr");
+		ensure_equals(absolutizePath("."), "/usr/lib");
+		ensure_equals(absolutizePath("../.."), "/");
+		ensure_equals(absolutizePath("../../foo"), "/foo");
+		ensure_equals(absolutizePath("../.././foo/bar"), "/foo/bar");
+
+		ensure_equals(absolutizePath("..", "/usr/local/bin"), "/usr/local");
+		ensure_equals(absolutizePath(".", "/usr/local/bin"), "/usr/local/bin");
+		ensure_equals(absolutizePath("../..", "/usr/local/bin"), "/usr");
+		ensure_equals(absolutizePath("../../foo", "/usr/local/bin"), "/usr/foo");
+		ensure_equals(absolutizePath("../.././foo/bar", "/usr/local/bin"), "/usr/foo/bar");
+	}
 }

data/test/integration_tests/apache2_tests.rb

@@ -561,8 +561,8 @@ describe "Apache 2 module" do
 			
 			# Now kill the helper server.
 			instance = AdminTools::ServerInstance.list.first
-			Process.kill('SIGKILL', instance.helper_server_pid)
-			sleep 0.01 # Give the signal a small amount of time to take effect.
+			Process.kill('SIGKILL', instance.helper_agent_pid)
+			sleep 0.02 # Give the signal a small amount of time to take effect.
 			
 			# Each worker process should detect that the old
 			# helper server has died, and should reconnect.

data/test/integration_tests/nginx_tests.rb

@@ -8,7 +8,7 @@ require 'integration_tests/hello_world_wsgi_spec'
 describe "Phusion Passenger for Nginx" do
 	before :all do
 		if !CONFIG['nginx']
-			STDERR.puts "*** ERROR: You must set the 'nginx' config option in test/config.yml."
+			STDERR.puts "*** ERROR: You must set the 'nginx' config option in test/config.json."
 			exit!(1)
 		end
 		

data/test/integration_tests/spec_helper.rb

@@ -1,13 +1,14 @@
 source_root = File.expand_path(File.dirname(__FILE__) + "/../..")
 Dir.chdir("#{source_root}/test")
 
-require 'yaml'
+require 'rubygems'
+require 'json'
 begin
-	CONFIG = YAML::load_file('config.yml')
+	CONFIG = JSON.load(File.read('config.json'))
 rescue Errno::ENOENT
-	STDERR.puts "*** You do not have the file test/config.yml. " <<
-		"Please copy test/config.yml.example to " <<
-		"test/config.yml, and edit it."
+	STDERR.puts "*** You do not have the file test/config.json. " <<
+		"Please copy test/config.json.example to " <<
+		"test/config.json, and edit it."
 	exit 1
 end
 
@@ -15,5 +16,6 @@ $LOAD_PATH.unshift("#{source_root}/lib")
 $LOAD_PATH.unshift("#{source_root}/test")
 
 require 'phusion_passenger'
+PhusionPassenger.locate_directories
 require 'support/test_helper'
 include TestHelper

data/test/oxt/oxt_test_main.cpp

@@ -1,5 +1,6 @@
 #include "../tut/tut.h"
 #include "../tut/tut_reporter.h"
+#include <oxt/initialize.hpp>
 #include <oxt/system_calls.hpp>
 #include <signal.h>
 #include <cstdlib>
@@ -14,6 +15,7 @@ int main() {
 	signal(SIGPIPE, SIG_IGN);
 	setenv("RAILS_ENV", "production", 1);
 	setenv("TESTING_PASSENGER", "1", 1);
+	oxt::initialize();
 	oxt::setup_syscall_interruption_support();
 	try {
 		tut::runner.get().run_tests();

data/test/oxt/syscall_interruption_test.cpp

@@ -7,6 +7,7 @@
 
 using namespace oxt;
 using namespace std;
+using namespace boost;
 
 namespace tut {
 	struct syscall_interruption_test {

data/test/ruby/classic_rails/loader_spec.rb

@@ -0,0 +1,48 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_spec'
+require 'ruby/shared/ruby_loader_spec'
+require 'ruby/shared/rails/analytics_logging_extensions_spec'
+
+module PhusionPassenger
+
+describe "Classic Rails 2.3 loader" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(ClassicRailsStub.new("rails2.3"))
+	end
+
+	def start(options = {})
+		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/classic-rails-loader.rb"], @stub.app_root)
+		return @loader.start(options)
+	end
+
+	def rails_version
+		return "2.3"
+	end
+
+	it_should_behave_like "a loader"
+	it_should_behave_like "a Ruby loader"
+	include_shared_example_group "analytics logging extensions for Rails"
+
+	it "calls the starting_worker_process event with forked=false" do
+		File.prepend(@stub.environment_rb, %q{
+			history_file = "history.txt"
+			PhusionPassenger.on_event(:starting_worker_process) do |forked|
+				::File.open(history_file, 'a') do |f|
+					f.puts "worker_process_started: forked=#{forked}\n"
+				end
+			end
+			::File.open(history_file, 'a') do |f|
+				f.puts "end of startup file\n"
+			end
+		})
+		result = start
+		result[:status].should == "Ready"
+		File.read("#{@stub.app_root}/history.txt").should ==
+			"end of startup file\n" +
+			"worker_process_started: forked=false\n"
+	end
+end
+
+end # module PhusionPassenger

data/test/ruby/classic_rails/preloader_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_spec'
+require 'ruby/shared/ruby_loader_spec'
+require 'ruby/shared/rails/analytics_logging_extensions_spec'
+
+module PhusionPassenger
+
+describe "Classic Rails 2.3 preloader" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(ClassicRailsStub.new("rails2.3"))
+	end
+
+	def start(options = {})
+		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/classic-rails-preloader.rb"], @stub.app_root)
+		result = @preloader.start(options)
+		if result[:status] == "Ready"
+			@loader = @preloader.spawn(options)
+			return @loader.start(options)
+		else
+			return result
+		end
+	end
+
+	def rails_version
+		return "2.3"
+	end
+
+	it_should_behave_like "a loader"
+	it_should_behave_like "a Ruby loader"
+	include_shared_example_group "analytics logging extensions for Rails"
+
+	it "calls the starting_worker_process event with forked=true" do
+		File.prepend(@stub.environment_rb, %q{
+			history_file = "history.txt"
+			PhusionPassenger.on_event(:starting_worker_process) do |forked|
+				::File.open(history_file, 'a') do |f|
+					f.puts "worker_process_started: forked=#{forked}\n"
+				end
+			end
+			::File.open(history_file, 'a') do |f|
+				f.puts "end of startup file\n"
+			end
+		})
+		result = start
+		result[:status].should == "Ready"
+		File.read("#{@stub.app_root}/history.txt").should ==
+			"end of startup file\n" +
+			"worker_process_started: forked=true\n"
+	end
+end
+
+end # module PhusionPassenger

data/test/ruby/rack/loader_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_spec'
+require 'ruby/shared/ruby_loader_spec'
+require 'ruby/shared/rails/analytics_logging_extensions_spec'
+
+module PhusionPassenger
+
+describe "Rack loader" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rack"))
+	end
+
+	def start(options = {})
+		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+		return @loader.start(options)
+	end
+
+	it_should_behave_like "a loader"
+	it_should_behave_like "a Ruby loader"
+
+	it "calls the starting_worker_process event with forked=false" do
+		File.prepend(@stub.startup_file, %q{
+			history_file = "history.txt"
+			PhusionPassenger.on_event(:starting_worker_process) do |forked|
+				::File.open(history_file, 'a') do |f|
+					f.puts "worker_process_started: forked=#{forked}\n"
+				end
+			end
+			::File.open(history_file, 'a') do |f|
+				f.puts "end of startup file\n"
+			end
+		})
+		result = start
+		result[:status].should == "Ready"
+		File.read("#{@stub.app_root}/history.txt").should ==
+			"end of startup file\n" +
+			"worker_process_started: forked=false\n"
+	end
+end
+
+describe "Rack loader with Rails 3.0" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rails3.0"))
+	end
+
+	def start(options = {})
+		@loader = Loader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-loader.rb"], @stub.app_root)
+		return @loader.start(options)
+	end
+
+	def rails_version
+		return "3.0"
+	end
+
+	include_shared_example_group "analytics logging extensions for Rails"
+end
+
+end # module PhusionPassenger

data/test/ruby/rack/preloader_spec.rb

@@ -0,0 +1,74 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'ruby/shared/loader_spec'
+require 'ruby/shared/ruby_loader_spec'
+require 'ruby/shared/rails/analytics_logging_extensions_spec'
+
+module PhusionPassenger
+
+describe "Rack preloader" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rack"))
+	end
+
+	def start(options = {})
+		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+		result = @preloader.start(options)
+		if result[:status] == "Ready"
+			@loader = @preloader.spawn(options)
+			return @loader.start(options)
+		else
+			return result
+		end
+	end
+
+	it_should_behave_like "a loader"
+	it_should_behave_like "a Ruby loader"
+
+	it "calls the starting_worker_process event with forked=true" do
+		File.prepend(@stub.startup_file, %q{
+			history_file = "history.txt"
+			PhusionPassenger.on_event(:starting_worker_process) do |forked|
+				::File.open(history_file, 'a') do |f|
+					f.puts "worker_process_started: forked=#{forked}\n"
+				end
+			end
+			::File.open(history_file, 'a') do |f|
+				f.puts "end of startup file\n"
+			end
+		})
+		result = start
+		result[:status].should == "Ready"
+		File.read("#{@stub.app_root}/history.txt").should ==
+			"end of startup file\n" +
+			"worker_process_started: forked=true\n"
+	end
+end
+
+describe "Rack loader with Rails 3.0" do
+	include LoaderSpecHelper
+
+	before :each do
+		@stub = register_stub(RackStub.new("rails3.0"))
+	end
+
+	def start(options = {})
+		@preloader = Preloader.new(["ruby", "#{PhusionPassenger.helper_scripts_dir}/rack-preloader.rb"], @stub.app_root)
+		result = @preloader.start(options)
+		if result[:status] == "Ready"
+			@loader = @preloader.spawn(options)
+			return @loader.start(options)
+		else
+			return result
+		end
+	end
+
+	def rails_version
+		return "3.0"
+	end
+
+	include_shared_example_group "analytics logging extensions for Rails"
+end
+
+end # module PhusionPassenger

data/test/ruby/{abstract_request_handler_spec.rb → request_handler_spec.rb}

@@ -1,38 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'phusion_passenger/abstract_request_handler'
+require 'phusion_passenger/request_handler'
+require 'phusion_passenger/request_handler/thread_handler'
 require 'phusion_passenger/analytics_logger'
+require 'phusion_passenger/utils'
 
 require 'fileutils'
 
 module PhusionPassenger
 
-describe AbstractRequestHandler do
+describe RequestHandler do
+	class DummyThreadHandler < RequestHandler::ThreadHandler
+		def process_request(*args)
+			# Do nothing.
+		end
+	end
+
 	before :each do
 		preinitialize if respond_to?(:preinitialize)
 		@old_passenger_tmpdir = Utils.passenger_tmpdir
-		Utils.passenger_tmpdir = "abstract_request_handler_spec.tmp"
+		Utils.passenger_tmpdir = "request_handler_spec.tmp"
 		@owner_pipe = IO.pipe
-		@request_handler = AbstractRequestHandler.new(@owner_pipe[1], @options || {})
-		def @request_handler.process_request(*args)
-			# Do nothing.
-		end
+		@options ||= {}
+		@thread_handler = Class.new(DummyThreadHandler)
+		@options = {
+			"app_group_name" => "foobar",
+			"thread_handler" => @thread_handler
+		}.merge(@options)
+		@request_handler = RequestHandler.new(@owner_pipe[1], @options)
 	end
 	
 	after :each do
 		@request_handler.cleanup
 		@owner_pipe[0].close rescue nil
 		Utils.passenger_tmpdir = @old_passenger_tmpdir
-		FileUtils.chmod_R(0777, "abstract_request_handler_spec.tmp")
-		FileUtils.rm_rf("abstract_request_handler_spec.tmp")
+		FileUtils.chmod_R(0777, "request_handler_spec.tmp")
+		FileUtils.rm_rf("request_handler_spec.tmp")
 	end
 	
 	def connect(socket_name = :main)
-		if @request_handler.server_sockets[socket_name][1] == "unix"
-			return UNIXSocket.new(@request_handler.server_sockets[socket_name][0])
-		else
-			addr, port = @request_handler.server_sockets[socket_name][0].split(/:/)
-			return TCPSocket.new(addr, port.to_i)
-		end
+		address = @request_handler.server_sockets[socket_name][:address]
+		return Utils.connect_to_server(address)
 	end
 	
 	def send_binary_request(socket, env)
@@ -52,22 +59,11 @@ describe AbstractRequestHandler do
 			!@request_handler.main_loop_running?
 		end
 	end
-	
-	it "ignores new connections that don't send any data" do
-		def @request_handler.accept_connection
-			return nil
-		end
-		@request_handler.start_main_loop_thread
-		eventually do
-			@request_handler.iterations != 0
-		end
-		@request_handler.processed_requests.should == 0
-	end
-	
+
 	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, "abstract_request_handler_spec.tmp/backends")
-			Dir["abstract_request_handler_spec.tmp/backends/*"].should_not be_empty
+			File.chmod(0700, "request_handler_spec.tmp/backends")
+			Dir["request_handler_spec.tmp/backends/*"].should_not be_empty
 		end
 	end
 	
@@ -81,7 +77,7 @@ describe AbstractRequestHandler do
 			client.sync = true
 			block = lambda do
 				data = "REQUEST_METHOD\0/"
-				data << "x" * (AbstractRequestHandler::MAX_HEADER_SIZE * 2)
+				data << "x" * (RequestHandler::ThreadHandler::MAX_HEADER_SIZE * 2)
 				data << "\0"
 				MessageChannel.new(client).write_scalar(data)
 			end
@@ -127,8 +123,7 @@ describe AbstractRequestHandler do
 	
 	it "accepts pings on the HTTP server socket" do
 		@request_handler.start_main_loop_thread
-		addr, port = @request_handler.server_sockets[:http][0].split(/:/)
-		client = TCPSocket.new(addr, port.to_i)
+		client = connect(:http)
 		begin
 			client.write("PING / HTTP/1.1\r\n")
 			client.write("Host: foo.com\r\n\r\n")
@@ -149,9 +144,9 @@ describe AbstractRequestHandler do
 			client.sync = true
 			block = lambda do
 				client.write("GET /")
-				client.write("x" * AbstractRequestHandler::MAX_HEADER_SIZE)
+				client.write("x" * RequestHandler::ThreadHandler::MAX_HEADER_SIZE)
 				sleep 0.01 # Context switch
-				client.write("x" * AbstractRequestHandler::MAX_HEADER_SIZE)
+				client.write("x" * RequestHandler::ThreadHandler::MAX_HEADER_SIZE)
 				client.write(" HTTP/1.1\r\n")
 			end
 			block.should raise_error(SystemCallError)
@@ -244,8 +239,7 @@ describe AbstractRequestHandler do
 				DebugLogging.log_level = -2
 				send_binary_request(client,
 					"REQUEST_METHOD" => "GET",
-					"PASSENGER_TXN_ID" => "1234-abcd",
-					"PASSENGER_GROUP_NAME" => "foobar")
+					"PASSENGER_TXN_ID" => "1234-abcd")
 			ensure
 				client.close
 			end
@@ -268,9 +262,7 @@ describe AbstractRequestHandler do
 	describe "HTTP parsing" do
 		before :each do
 			@request_handler.start_main_loop_thread
-			addr, port = @request_handler.server_sockets[:http][0].split(/:/)
-			port = port.to_i
-			@client = TCPSocket.new(addr, port)
+			@client = connect(:http)
 			@client.sync = true
 		end
 		
@@ -371,35 +363,6 @@ describe AbstractRequestHandler do
 		end
 	end
 	
-	specify "upon receiving a soft shutdown signal, the main loop quits a while after the last connection was accepted" do
-		@request_handler.soft_termination_linger_time = 0.2
-		@request_handler.start_main_loop_thread
-		@request_handler.soft_shutdown
-		
-		# Each time we ping the server it should reset the exit time.
-		deadline = Time.now + 0.6
-		while Time.now < deadline
-			@request_handler.should be_main_loop_running
-			client = connect
-			begin
-				channel = MessageChannel.new(client)
-				channel.write_scalar("REQUEST_METHOD\0PING\0")
-				client.read
-				sleep 0.02
-			ensure
-				client.close
-			end
-		end
-		@request_handler.should be_main_loop_running
-		
-		# After we're done pinging it should quit within a short period of time.
-		deadline = Time.now + 0.6
-		while Time.now < deadline && @request_handler.main_loop_running?
-			sleep 0.01
-		end
-		@request_handler.should_not be_main_loop_running
-	end
-	
 	############################
 end