passenger 2.1.2 → 2.1.3

data/lib/phusion_passenger/wsgi/application_spawner.rb

@@ -72,7 +72,7 @@ private
 			lower_privilege('passenger_wsgi.py', lowest_user)
 		end
 		
-		socket_file = "#{passenger_tmpdir}/passenger_wsgi.#{Process.pid}.#{rand 10000000}"
+		socket_file = "#{passenger_tmpdir}/backends/wsgi_backend.#{Process.pid}.#{rand 10000000}"
 		server = UNIXServer.new(socket_file)
 		begin
 			reader, writer = IO.pipe

data/misc/render_error_pages.rb

@@ -15,10 +15,11 @@
 #  with this program; if not, write to the Free Software Foundation, Inc.,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-$LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
-require 'passenger/html_template'
-require 'passenger/spawn_manager'
-require 'passenger/platform_info'
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")
+require 'phusion_passenger/html_template'
+require 'phusion_passenger/spawn_manager'
+require 'phusion_passenger/platform_info'
 include PhusionPassenger
 
 if !defined?(Mysql::Error)
@@ -101,7 +102,7 @@ def start
 	render_error_page(e, 'general_error.html',
 		'general_error')
 	
-	e = StandardError.new("Some error message")
+	e = AppInitError.new("Some error message", create_dummy_exception)
 	render_error_page(e, 'app_exited.html', 'app_exited_during_initialization')
 end
 

data/test/CxxTestMain.cpp

@@ -1,25 +1,127 @@
 #include "tut.h"
 #include "tut_reporter.h"
+#include <string>
 #include <apr_general.h>
 #include <signal.h>
+#include <cstdio>
 #include <cstdlib>
 
+#include "Utils.h"
+
+using namespace std;
+
 namespace tut {
 	test_runner_singleton runner;
 }
 
-int main() {
+typedef tut::groupnames::const_iterator groupnames_iterator;
+
+/** All available groups. */
+static tut::groupnames allGroups;
+
+/** Whether the user wants to run all test groups, or only the specified test groups. */
+static enum { RUN_ALL_GROUPS, RUN_SPECIFIED_GROUPS } runMode = RUN_ALL_GROUPS;
+
+/** The test groups the user wants to run. Only meaningful if runMode == RUN_SPECIFIED_GROUPS. */
+static tut::groupnames groupsToRun;
+
+
+static void
+usage(int exitCode) {
+	printf("Usage: ./Apache2ModuleTests [options]\n");
+	printf("Runs the unit tests for the Apache 2 module.\n\n");
+	printf("Options:\n");
+	printf("  -g GROUP_NAME   Instead of running all unit tests, only run the test group\n");
+	printf("                  named GROUP_NAME. You can specify -g multiple times, which\n");
+	printf("                  will result in only the specified test groups being run.\n\n");
+	printf("                  Available test groups:\n\n");
+	for (groupnames_iterator it = allGroups.begin(); it != allGroups.end(); it++) {
+		printf("                    %s\n", it->c_str());
+	}
+	printf("\n");
+	printf("  -h              Print this usage information.\n");
+	exit(exitCode);
+}
+
+static bool
+groupExists(const string &name) {
+	for (groupnames_iterator it = allGroups.begin(); it != allGroups.end(); it++) {
+		if (name == *it) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static void
+parseOptions(int argc, char *argv[]) {
+	for (int i = 1; i < argc; i++) {
+		if (strcmp(argv[i], "-h") == 0) {
+			usage(0);
+		} else if (strcmp(argv[i], "-g") == 0) {
+			if (argv[i + 1] == NULL) {
+				fprintf(stderr, "*** ERROR: A -g option must be followed by a test group name.\n");
+				exit(1);
+			} else if (!groupExists(argv[i + 1])) {
+				fprintf(stderr,
+					"*** ERROR: Invalid test group '%s'. Available test groups are:\n\n",
+					argv[i + 1]);
+				for (groupnames_iterator it = allGroups.begin(); it != allGroups.end(); it++) {
+					printf("%s\n", it->c_str());
+				}
+				exit(1);
+			} else {
+				runMode = RUN_SPECIFIED_GROUPS;
+				groupsToRun.push_back(argv[i + 1]);
+				i++;
+			}
+		} else {
+			fprintf(stderr, "*** ERROR: Unknown option: %s\n", argv[i]);
+			fprintf(stderr, "Please pass -h for a list of valid options.\n");
+			exit(1);
+		}
+	}
+}
+
+struct Finalizer {
+	~Finalizer() {
+		Passenger::removeDirTree(Passenger::getPassengerTempDir());
+	}
+};
+
+int
+main(int argc, char *argv[]) {
 	apr_initialize();
-	tut::reporter reporter;
-	tut::runner.get().set_callback(&reporter);
 	signal(SIGPIPE, SIG_IGN);
 	setenv("RAILS_ENV", "production", 1);
 	setenv("TESTING_PASSENGER", "1", 1);
+	
+	tut::reporter reporter;
+	tut::runner.get().set_callback(&reporter);
+	allGroups = tut::runner.get().list_groups();
+	parseOptions(argc, argv);
+	
+	Finalizer finalizer;
+	
 	try {
-		tut::runner.get().run_tests();
+		bool all_ok = true;
+		if (runMode == RUN_ALL_GROUPS) {
+			tut::runner.get().run_tests();
+			all_ok = reporter.all_ok();
+		} else {
+			all_ok = true;
+			for (groupnames_iterator it = groupsToRun.begin(); it != groupsToRun.end(); it++) {
+				tut::runner.get().run_tests(*it);
+				all_ok = all_ok && reporter.all_ok();
+			}
+		}
+		if (all_ok) {
+			return 0;
+		} else {
+			return 1;
+		}
 	} catch (const std::exception &ex) {
-		std::cerr << "Exception raised: " << ex.what() << std::endl;
-		return 1;
+		cerr << "*** Exception raised: " << ex.what() << endl;
+		return 2;
 	}
-	return 0;
 }

data/test/UtilsTest.cpp

@@ -6,6 +6,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <limits.h>
+#include <string.h>
 
 using namespace Passenger;
 using namespace std;
@@ -14,17 +15,28 @@ namespace tut {
 	struct UtilsTest {
 		vector<string> output;
 		string oldPath;
+		char *oldInstanceTempDir;
 		
 		UtilsTest() {
 			oldPath = getenv("PATH");
+			oldInstanceTempDir = getenv("PASSENGER_INSTANCE_TEMP_DIR");
+			if (oldInstanceTempDir != NULL) {
+				oldInstanceTempDir = strdup(oldInstanceTempDir);
+			}
+			
 			unsetenv("TMPDIR");
-			unsetenv("PHUSION_PASSENGER_TMP");
+			unsetenv("PASSENGER_INSTANCE_TEMP_DIR");
 		}
 		
 		~UtilsTest() {
 			setenv("PATH", oldPath.c_str(), 1);
 			unsetenv("TMPDIR");
-			unsetenv("PHUSION_PASSENGER_TMP");
+			if (oldInstanceTempDir == NULL) {
+				unsetenv("PASSENGER_INSTANCE_TEMP_DIR");
+			} else {
+				setenv("PASSENGER_INSTANCE_TEMP_DIR", oldInstanceTempDir, 1);
+				free(oldInstanceTempDir);
+			}
 		}
 	};
 	
@@ -123,23 +135,23 @@ namespace tut {
 	}
 	
 	
-	/***** Test getTempDir() *****/
+	/***** Test getSystemTempDir() *****/
 	
 	TEST_METHOD(11) {
 		// It returns "/tmp" if the TMPDIR environment is NULL.
-		ensure_equals(string(getTempDir()), "/tmp");
+		ensure_equals(string(getSystemTempDir()), "/tmp");
 	}
 	
 	TEST_METHOD(12) {
 		// It returns "/tmp" if the TMPDIR environment is an empty string.
 		setenv("TMPDIR", "", 1);
-		ensure_equals(string(getTempDir()), "/tmp");
+		ensure_equals(string(getSystemTempDir()), "/tmp");
 	}
 	
 	TEST_METHOD(13) {
 		// It returns the value of the TMPDIR environment if it is not NULL and not empty.
 		setenv("TMPDIR", "/foo", 1);
-		ensure_equals(string(getTempDir()), "/foo");
+		ensure_equals(string(getSystemTempDir()), "/foo");
 	}
 	
 	
@@ -154,74 +166,72 @@ namespace tut {
 	}
 	
 	TEST_METHOD(16) {
-		// It caches the result into the PHUSION_PASSENGER_TMP environment variable.
+		// It caches the result into the PASSENGER_INSTANCE_TEMP_DIR environment variable.
 		char dir[128];
 		
 		snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
 		getPassengerTempDir();
-		ensure_equals(getenv("PHUSION_PASSENGER_TMP"), string(dir));
+		ensure_equals(getenv("PASSENGER_INSTANCE_TEMP_DIR"), string(dir));
 	}
 	
 	TEST_METHOD(17) {
-		// It returns the value of the PHUSION_PASSENGER_TMP environment variable if it's not NULL and not an empty string.
-		setenv("PHUSION_PASSENGER_TMP", "/foo", 1);
+		// It returns the value of the PASSENGER_INSTANCE_TEMP_DIR environment
+		// variable if it's not NULL and not an empty string.
+		setenv("PASSENGER_INSTANCE_TEMP_DIR", "/foo", 1);
 		ensure_equals(getPassengerTempDir(), "/foo");
 	}
 	
 	TEST_METHOD(18) {
-		// It does not use query the PHUSION_PASSENGER_TMP environment variable if bypassCache is true.
+		// It does not use query the PASSENGER_INSTANCE_TEMP_DIR environment variable if bypassCache is true.
 		char dir[128];
 		
-		setenv("PHUSION_PASSENGER_TMP", "/foo", 1);
+		setenv("PASSENGER_INSTANCE_TEMP_DIR", "/foo", 1);
 		snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
 		ensure_equals(getPassengerTempDir(true), dir);
 	}
 	
+	TEST_METHOD(19) {
+		// It uses the systemTempDir argument if it's not the empty string.
+		char dir[128];
+		
+		snprintf(dir, sizeof(dir), "/foo/passenger.%lu", (unsigned long) getpid());
+		ensure_equals(getPassengerTempDir(false, "/foo"), dir);
+	}
+	
+	
+	/***** Test BufferedUpload *****/
 	
-	/***** Test TempFile *****/
+	struct TemporarilySetInstanceTempDir {
+		TemporarilySetInstanceTempDir() {
+			setenv("PASSENGER_INSTANCE_TEMP_DIR", "utils_test.tmp", 1);
+			mkdir("utils_test.tmp", S_IRWXU);
+			mkdir(BufferedUpload::getDir().c_str(), S_IRWXU);
+		}
+		
+		~TemporarilySetInstanceTempDir() {
+			removeDirTree("utils_test.tmp");
+		}
+	};
 	
 	TEST_METHOD(20) {
-		// It creates a temp file inside getPassengerTempDir().
-		setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
-		mkdir("utils_test.tmp", S_IRWXU);
-		TempFile t("temp", false);
-		unsigned int size = listDir("utils_test.tmp").size();
-		removeDirTree("utils_test.tmp");
-		ensure_equals(size, 1u);
+		// The resulting file handle is readable and writable.
+		TemporarilySetInstanceTempDir d;
+		BufferedUpload t;
+		char line[30];
+		
+		fprintf(t.handle, "hello world!");
+		fflush(t.handle);
+		fseek(t.handle, 0, SEEK_SET);
+		memset(line, 0, sizeof(line));
+		fgets(line, sizeof(line), t.handle);
+		ensure_equals(string(line), "hello world!");
 	}
 	
 	TEST_METHOD(21) {
-		// It deletes the temp file upon destruction.
-		setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
-		mkdir("utils_test.tmp", S_IRWXU);
-		{
-			TempFile t("temp", false);
-		}
-		bool dirEmpty = listDir("utils_test.tmp").empty();
-		removeDirTree("utils_test.tmp");
-		ensure(dirEmpty);
-	}
-	
-	TEST_METHOD(22) {
-		// The temp file's filename is constructed using the given identifier.
-		setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
-		mkdir("utils_test.tmp", S_IRWXU);
-		TempFile t("foobar", false);
-		vector<string> files(listDir("utils_test.tmp"));
-		removeDirTree("utils_test.tmp");
-		
-		ensure(files[0].find("foobar") != string::npos);
-	}
-	
-	TEST_METHOD(23) {
-		// It immediately unlinks the temp file if 'anonymous' is true.
-		// It creates a temp file inside getPassengerTempDir().
-		setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
-		mkdir("utils_test.tmp", S_IRWXU);
-		TempFile t;
-		unsigned int size = listDir("utils_test.tmp").size();
-		removeDirTree("utils_test.tmp");
-		ensure_equals(size, 0u);
+		// It immediately unlinks the temp file.
+		TemporarilySetInstanceTempDir d;
+		BufferedUpload t;
+		ensure_equals(listDir(BufferedUpload::getDir().c_str()).size(), 0u);
 	}
 	
 	/***** Test escapeForXml() *****/

data/test/config.yml.example

@@ -10,8 +10,12 @@ normal_user_1: games
 normal_user_2: daemon
 
 # The username of a user that has less privileges than a normal user.
-# NOTE: this user MUST be able to access this 'test' directory, otherwise
-# the tests will fail.
+#
+# NOTES:
+# - this user MUST be able to access this 'test' directory, otherwise
+#   the tests will fail.
+# - this user MUST NOT have a negative UID value. So on OS X, this may
+#   not be the 'nobody' user.
 lowest_user: nobody
 
 # A nonexistant username.

data/test/integration_tests.rb

@@ -188,6 +188,7 @@ shared_examples_for "HelloWorld Rack application" do
 			run app
 		})
 		File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
+		File.utime(2, 2, "#{@stub.app_root}/tmp/restart.txt")
 		get('/').should == "changed"
 	end
 	
@@ -197,6 +198,7 @@ shared_examples_for "HelloWorld Rack application" do
 				File.new('foo.txt', 'w').close
 			})
 			File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
+			File.utime(1, 1, "#{@stub.app_root}/tmp/restart.txt")
 			get('/')
 			stat = File.stat("#{@stub.app_root}/foo.txt")
 			stat.uid.should_not == 0
@@ -229,6 +231,7 @@ shared_examples_for "HelloWorld WSGI application" do
 		
 		File.write("#{@stub.app_root}/passenger_wsgi.py", code)
 		File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
+		File.utime(2, 2, "#{@stub.app_root}/tmp/restart.txt")
 		get('/').should == "changed"
 	end
 	
@@ -237,6 +240,7 @@ shared_examples_for "HelloWorld WSGI application" do
 			File.prepend("#{@stub.app_root}/passenger_wsgi.py",
 				"file('foo.txt', 'w').close()\n")
 			File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
+			File.utime(1, 1, "#{@stub.app_root}/tmp/restart.txt")
 			get('/')
 			stat = File.stat("#{@stub.app_root}/foo.txt")
 			stat.uid.should_not == 0

data/test/ruby/abstract_request_handler_spec.rb

@@ -8,7 +8,8 @@ include PhusionPassenger
 
 describe AbstractRequestHandler do
 	before :each do
-		ENV['PHUSION_PASSENGER_TMP'] = "abstract_request_handler_spec.tmp"
+		@old_instance_temp_dir = ENV['PASSENGER_INSTANCE_TEMP_DIR']
+		ENV['PASSENGER_INSTANCE_TEMP_DIR'] = "abstract_request_handler_spec.tmp"
 		@owner_pipe = IO.pipe
 		@request_handler = AbstractRequestHandler.new(@owner_pipe[1])
 		def @request_handler.process_request(*args)
@@ -19,7 +20,11 @@ describe AbstractRequestHandler do
 	after :each do
 		@request_handler.cleanup
 		@owner_pipe[0].close rescue nil
-		ENV.delete('PHUSION_PASSENGER_TMP')
+		if @old_instance_temp_dir
+			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = @old_instance_temp_dir
+		else
+			ENV.delete('PASSENGER_INSTANCE_TEMP_DIR')
+		end
 		FileUtils.rm_rf("abstract_request_handler_spec.tmp")
 	end
 	
@@ -54,7 +59,8 @@ describe AbstractRequestHandler do
 	
 	it "creates a socket file in the Phusion Passenger temp folder, unless when using TCP sockets" do
 		if @request_handler.socket_type == "unix"
-			Dir["abstract_request_handler_spec.tmp/*"].should_not be_empty
+			File.chmod(0700, "abstract_request_handler_spec.tmp/backends")
+			Dir["abstract_request_handler_spec.tmp/backends/*"].should_not be_empty
 		end
 	end
 	

data/test/ruby/rack/application_spawner_spec.rb

@@ -34,8 +34,9 @@ describe PhusionPassenger::Rack::ApplicationSpawner do
 		config_ru_owner.should == touch_txt_owner
 	end if Process.euid == 0
 	
-	def spawn(*args)
-		PhusionPassenger::Rack::ApplicationSpawner.spawn_application(*args)
+	def spawn(app_root)
+		PhusionPassenger::Rack::ApplicationSpawner.spawn_application(app_root,
+			"lowest_user" => CONFIG['lowest_user'])
 	end
 end