passenger 4.0.21 → 4.0.23

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -93,6 +93,7 @@ struct ProcessMetrics {
 	/** OS X Snow Leopard does not report the VM size correctly, so don't use this. */
 	size_t  vmsize;
 	pid_t   processGroupId;
+	uid_t   uid;
 	string  command;
 	
 	ProcessMetrics() {
@@ -381,6 +382,7 @@ private:
 			metrics.rss  = (size_t) readNextWordAsLongLong(&start);
 			metrics.vmsize  = (size_t) readNextWordAsLongLong(&start);
 			metrics.processGroupId = (pid_t) readNextWordAsLongLong(&start);
+			metrics.uid  = (uid_t) readNextWordAsLongLong(&start);
 			metrics.command = readRestOfLine(start);
 
 			bool pidAllowed;
@@ -452,9 +454,9 @@ public:
 		const char *command[] = {
 			"ps", "-o",
 			#if defined(sun) || defined(__sun)
-				"pid,ppid,pcpu,rss,vsz,pgid,args",
+				"pid,ppid,pcpu,rss,vsz,pgid,uid,args",
 			#else
-				"pid,ppid,%cpu,rss,vsize,pgid,command",
+				"pid,ppid,%cpu,rss,vsize,pgid,uid,command",
 			#endif
 			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
 				pidsArg.c_str(),

data/ext/common/Utils/VariantMap.h

@@ -110,7 +110,10 @@ public:
 			return key;
 		}
 	};
-	
+
+	typedef map<string, string>::iterator Iterator;
+	typedef map<string, string>::const_iterator ConstIterator;
+
 	/**
 	 * Populates a VariantMap from the data in <em>argv</em>, which
 	 * consists of <em>argc</em> elements.
@@ -413,7 +416,23 @@ public:
 		}
 		writeArrayMessage(fd, args);
 	}
-	
+
+	Iterator begin() {
+		return store.begin();
+	}
+
+	ConstIterator begin() const {
+		return store.begin();
+	}
+
+	Iterator end() {
+		return store.end();
+	}
+
+	ConstIterator end() const {
+		return store.end();
+	}
+
 	string inspect() const {
 		map<string, string>::const_iterator it;
 		map<string, string>::const_iterator end = store.end();

data/ext/common/agents/HelperAgent/RequestHandler.cpp

@@ -161,6 +161,14 @@ Client::onAppInputChunk(const char *data, size_t size, void *userData) {
 	client->requestHandler->onAppInputChunk(client->shared_from_this(), StaticString(data, size));
 }
 
+void
+Client::onAppInputChunkEnd(void *userData) {
+	Client *client = (Client *) userData;
+	assert(client != NULL);
+	assert(client->requestHandler != NULL);
+	client->requestHandler->onAppInputChunkEnd(client->shared_from_this());
+}
+
 void
 Client::onAppInputError(const EventedBufferedInputPtr &source, const char *message, int errnoCode) {
 	Client *client = (Client *) source->userData;

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -161,6 +161,7 @@ private:
 
 	static size_t onAppInputData(const EventedBufferedInputPtr &source, const StaticString &data);
 	static void onAppInputChunk(const char *data, size_t size, void *userData);
+	static void onAppInputChunkEnd(void *userData);
 	static void onAppInputError(const EventedBufferedInputPtr &source, const char *message, int errnoCode);
 	
 	void onAppOutputWritable(ev::io &io, int revents);
@@ -326,6 +327,7 @@ public:
 
 
 		responseDechunker.onData = onAppInputChunk;
+		responseDechunker.onEnd = onAppInputChunkEnd;
 		responseDechunker.userData = this;
 		
 
@@ -466,6 +468,8 @@ public:
 	}
 
 	bool shouldHalfCloseWrite() const {
+		// Many broken HTTP servers consider a half close to be a full close, so don't
+		// half close HTTP sessions.
 		return session->getProtocol() == "session";
 	}
 
@@ -1130,9 +1134,16 @@ private:
 		writeToClientOutputPipe(client, data);
 	}
 
+	void onAppInputChunkEnd(const ClientPtr &client) {
+		RH_LOG_EVENT(client, "onAppInputChunkEnd");
+		onAppInputEof(client);
+	}
+
 	void onAppInputEof(const ClientPtr &client) {
 		RH_LOG_EVENT(client, "onAppInputEof");
-		if (!client->connected()) {
+		// Check for session == NULL in order to avoid executing the code twice on
+		// responses with chunked encoding.
+		if (!client->connected() || client->session == NULL) {
 			return;
 		}
 
@@ -2200,7 +2211,7 @@ private:
 
 	/******* State: FORWARDING_BODY_TO_APP *******/
 
-	void state_forwardingBodyToApp_verifyInvariants(const ClientPtr &client) {
+	void state_forwardingBodyToApp_verifyInvariants(const ClientPtr &client) const {
 		assert(client->state == Client::FORWARDING_BODY_TO_APP);
 	}
 

data/ext/common/agents/Watchdog/Main.cpp

@@ -30,6 +30,8 @@
 #include <boost/foreach.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include <sys/select.h>
 #include <sys/types.h>
@@ -425,6 +427,85 @@ inferDefaultGroup(const string &defaultUser) {
 	return getGroupName(userEntry->pw_gid);
 }
 
+static vector< pair<string, string> >
+agentsOptionsToEnvVars(const VariantMap &agentsOptions) {
+	vector< pair<string, string> > result;
+	VariantMap::ConstIterator it, end = agentsOptions.end();
+
+	result.reserve(agentsOptions.size());
+	for (it = agentsOptions.begin(); it != end; it++) {
+		result.push_back(make_pair("passenger_" + it->first, it->second));
+	}
+
+	return result;
+}
+
+static void
+setEnvVarsFromVector(const vector< pair<string, string> > &envvars) {
+	vector< pair<string, string> >::const_iterator it;
+
+	for (it = envvars.begin(); it != envvars.end(); it++) {
+		setenv(it->first.c_str(), it->second.c_str(), 1);
+	}
+}
+
+static bool
+runHookScript(const char *name) {
+	TRACE_POINT();
+	string value = agentsOptions.get(string("hook_") + name, false);
+	if (value.empty()) {
+		return true;
+	}
+
+	vector< pair<string, string> > envvars = agentsOptionsToEnvVars(agentsOptions);
+	pid_t pid;
+	int e, status;
+
+	P_INFO("Running " << name << " hook script: " << value);
+
+	pid = fork();
+	if (pid == 0) {
+		resetSignalHandlersAndMask();
+		disableMallocDebugging();
+		closeAllFileDescriptors(2);
+		setEnvVarsFromVector(envvars);
+
+		execlp(value.c_str(), value.c_str(), (const char * const) 0);
+		e = errno;
+		fprintf(stderr, "*** ERROR: Cannot execute %s hook script %s: %s (errno=%d)\n",
+			name, value.c_str(), strerror(e), e);
+		fflush(stderr);
+		_exit(1);
+		return true; // Never reached.
+
+	} else if (pid == -1) {
+		e = errno;
+		P_ERROR("Cannot fork a process for hook script " << value <<
+			": " << strerror(e) << " (errno=" << e << ")");
+		return false;
+
+	} else if (waitpid(pid, &status, 0) == -1) {
+		e = errno;
+		P_ERROR("Unable to wait for hook script " << value <<
+			" (PID " << pid << "): " << strerror(e) << " (errno=" <<
+			e << ")");
+		return false;
+
+	} else {
+		P_INFO("Hook script " << value << " (PID " << pid <<
+			") exited with status " << WEXITSTATUS(status));
+		return WEXITSTATUS(status) == 0;
+	}
+}
+
+static void
+runHookScriptAndThrowOnError(const char *name) {
+	TRACE_POINT();
+	if (!runHookScript(name)) {
+		throw RuntimeException(string("Hook script ") + name + " failed");
+	}
+}
+
 static void
 initializeBareEssentials(int argc, char *argv[]) {
 	/*
@@ -555,6 +636,7 @@ initializeWorkingObjects(WorkingObjectsPtr &wo, ServerInstanceDirToucherPtr &ser
 		defaultGroup, webServerWorkerUid, webServerWorkerGid);
 	agentsOptions.set("server_instance_dir", wo->serverInstanceDir->getPath());
 	agentsOptions.setInt("generation_number", wo->generation->getNumber());
+	agentsOptions.set("generation_path", wo->generation->getPath());
 
 	UPDATE_TRACE_POINT();
 	serverInstanceDirToucher = boost::make_shared<ServerInstanceDirToucher>(wo);
@@ -660,6 +742,8 @@ main(int argc, char *argv[]) {
 		maybeSetsid();
 		initializeWorkingObjects(wo, serverInstanceDirToucher);
 		initializeAgentWatchers(wo, watchers);
+		UPDATE_TRACE_POINT();
+		runHookScriptAndThrowOnError("before_watchdog_initialization");
 	} catch (const std::exception &e) {
 		writeArrayMessage(FEEDBACK_FD,
 			"Watchdog startup error",
@@ -675,6 +759,8 @@ main(int argc, char *argv[]) {
 		beginWatchingAgents(wo, watchers);
 		reportAgentsInformation(wo, watchers);
 		P_INFO("All Phusion Passenger agents started!");
+		UPDATE_TRACE_POINT();
+		runHookScriptAndThrowOnError("after_watchdog_initialization");
 		
 		UPDATE_TRACE_POINT();
 		this_thread::disable_interruption di;
@@ -690,16 +776,19 @@ main(int argc, char *argv[]) {
 			P_DEBUG("Web server did not exit gracefully, forcing shutdown of all agents...");
 		}
 		UPDATE_TRACE_POINT();
+		runHookScriptAndThrowOnError("after_watchdog_shutdown");
+		UPDATE_TRACE_POINT();
 		AgentWatcher::stopWatching(watchers);
 		if (exitGracefully) {
 			UPDATE_TRACE_POINT();
 			cleanupAgentsInBackground(wo, watchers, argv);
-			return 0;
 		} else {
 			UPDATE_TRACE_POINT();
 			forceAllAgentsShutdown(watchers);
-			return 1;
 		}
+		UPDATE_TRACE_POINT();
+		runHookScriptAndThrowOnError("after_watchdog_shutdown");
+		return exitGracefully ? 0 : 1;
 	} catch (const tracable_exception &e) {
 		P_ERROR(e.what() << "\n" << e.backtrace());
 		return 1;

data/ext/ruby/extconf.rb

@@ -40,4 +40,13 @@ have_func('rb_thread_io_blocking_region')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')
+	if RUBY_PLATFORM =~ /solaris/
+		# Fix syntax error in Solaris /usr/ccs/bin/make.
+		# https://code.google.com/p/phusion-passenger/issues/detail?id=999
+		makefile = File.read("Makefile")
+		makefile.sub!(/^ECHO = .*/, "ECHO = echo")
+		File.open("Makefile", "w") do |f|
+			f.write(makefile)
+		end
+	end
 end

data/helper-scripts/meteor-loader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -93,6 +93,13 @@ module App
 
 		production = options["environment"] == "production" ? "production" : ""
 		pid = fork do
+			# Meteor is quite !@#$% here: if we kill its start script
+			# with *any* signal, it'll leave a ton of garbage processes
+			# around. Apparently it expects the user to press Ctrl-C in a
+			# terminal which happens to send a signal to all processes
+			# in the session. We emulate that behavior here by giving
+			# Meteor its own process group, and sending signals to the
+			# entire process group.
 			Process.setpgrp
 			exec("meteor run -p #{port} #{production}")
 		end
@@ -113,6 +120,7 @@ module App
 		end
 		puts "!> Ready"
 		puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
+		puts "!> pid: #{pid}"
 		puts "!> "
 		begin
 			STDIN.readline
@@ -121,6 +129,7 @@ module App
 	ensure
 		Process.kill('INT', -pid) rescue nil
 		Process.waitpid(pid) rescue nil
+		Process.kill('INT', -pid) rescue nil
 	end
 	
 end # module App

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.21'
+	VERSION_STRING = '4.0.23'
 	
 	PREFERRED_NGINX_VERSION = '1.4.3'
 	NGINX_SHA256_CHECKSUM = 'ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'

data/lib/phusion_passenger/console_text_template.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,12 +30,14 @@ class ConsoleTextTemplate
 	def initialize(input, options = {})
 		@buffer = ''
 		if input[:file]
-			data = File.read("#{PhusionPassenger.resources_dir}/templates/#{input[:file]}.txt.erb")
+			filename = "#{PhusionPassenger.resources_dir}/templates/#{input[:file]}.txt.erb"
+			data = File.read(filename)
 		else
 			data = input[:text]
 		end
 		@template = ERB.new(Utils::AnsiColors.ansi_colorize(data),
 			nil, '-', '@buffer')
+		@template.filename = filename if filename
 		options.each_pair do |name, value|
 			self[name] = value
 		end

data/lib/phusion_passenger/platform_info.rb

@@ -360,7 +360,7 @@ public
 	def self.find_all_commands(name)
 		search_dirs = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
 		search_dirs.concat(%w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin))
-		["/opt/*/bin", "/usr/local/*/bin"].each do |glob|
+		["/opt/*/bin", "/opt/*/sbin", "/usr/local/*/bin", "/usr/local/*/sbin"].each do |glob|
 			search_dirs.concat(Dir[glob])
 		end
 		search_dirs.delete("")

data/lib/phusion_passenger/platform_info/apache_detector.rb

@@ -22,10 +22,12 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger'
+require 'phusion_passenger/constants'
 require 'phusion_passenger/platform_info'
 require 'phusion_passenger/platform_info/ruby'
 require 'phusion_passenger/platform_info/apache'
-require 'phusion_passenger/utils/ansi_colors'	
+require 'phusion_passenger/utils/ansi_colors'
+require 'pathname'
 
 module PhusionPassenger
 module PlatformInfo
@@ -194,6 +196,8 @@ class ApacheDetector
 	end
 
 	def result_for(apxs2)
+		# All the results use realpaths, so the input must too.
+		apxs2 = Pathname.new(apxs2).realpath
 		return @results.find { |r| r.apxs2 == apxs2 }
 	end
 
@@ -206,30 +210,21 @@ private
 		end
 	end
 
-	# On Ubuntu, /usr/bin/apxs2 is a symlink to /usr/bin/apxs. We're only
-	# supposed to detect one Apache in that case so we need to resolve symlinks.
+	# On Ubuntu, /usr/bin/apxs2 is a symlink to /usr/bin/apxs.
+	# On recent Arch Linux releases, /bin, /sbin etc are symlinks to
+	# /usr/bin and /usr/sbin.
+	# We're only supposed to detect one Apache in that case so we need to
+	# resolve symlinks.
 	def remove_symlink_duplications(filenames)
-		result = []
-		symlink_files = []
-
-		filenames.each do |filename|
-			if File.symlink?(filename)
-				symlink_files << filename
-			else
-				result << filename
-			end
+		old_size = filenames.size
+		filenames = filenames.map do |filename|
+			Pathname.new(filename).realpath
 		end
-
-		symlink_files.each do |filename|
-			full_filename = File.expand_path(File.readlink(filename), File.dirname(filename))
-			if result.include?(full_filename)
-				log "#{filename} is a symlink to #{full_filename}. Ignoring it."
-			else
-				result << full_filename
-			end
+		filenames.uniq!
+		if old_size != filenames.size
+			log "#{old_size - filenames.size} symlink duplicate(s) detected; ignoring them."
 		end
-
-		return result
+		return filenames
 	end
 
 	def add_result

data/test/cxx/DechunkerTest.cpp

@@ -12,10 +12,13 @@ namespace tut {
 		Dechunker dechunker;
 		string input;
 		vector<string> chunks;
+		bool ended;
 		
 		DechunkerTest() {
 			dechunker.onData = onData;
+			dechunker.onEnd = onEnd;
 			dechunker.userData = this;
+			ended = false;
 		}
 		
 		void addChunk(const string &data) {
@@ -29,6 +32,11 @@ namespace tut {
 			DechunkerTest *self = (DechunkerTest *) userData;
 			self->chunks.push_back(string(data, len));
 		}
+
+		static void onEnd(void *userData) {
+			DechunkerTest *self = (DechunkerTest *) userData;
+			self->ended = true;
+		}
 	};
 	
 	DEFINE_TEST_GROUP(DechunkerTest);
@@ -37,6 +45,7 @@ namespace tut {
 		// Test initial state.
 		ensure(dechunker.acceptingInput());
 		ensure(!dechunker.hasError());
+		ensure(!ended);
 		ensure_equals(dechunker.getErrorMessage(), (const char *) NULL);
 	}
 	
@@ -51,6 +60,7 @@ namespace tut {
 		ensure_equals(chunks.size(), 2u);
 		ensure_equals(chunks[0], "hello");
 		ensure_equals(chunks[1], "world");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(3) {
@@ -76,6 +86,7 @@ namespace tut {
 		ensure_equals(chunks[2], "l");
 		ensure_equals(chunks[3], "l");
 		ensure_equals(chunks[4], "o");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(4) {
@@ -103,6 +114,7 @@ namespace tut {
 		ensure_equals(chunks[3], "w");
 		ensure_equals(chunks[4], "or");
 		ensure_equals(chunks[5], "ld");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(5) {
@@ -128,6 +140,7 @@ namespace tut {
 		ensure_equals(chunks[1], "lo");
 		ensure_equals(chunks[2], "wo");
 		ensure_equals(chunks[3], "rld");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(6) {
@@ -141,6 +154,7 @@ namespace tut {
 		ensure(!dechunker.hasError());
 		ensure_equals(chunks.size(), 1u);
 		ensure_equals(chunks[0], "xy");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(20) {
@@ -158,6 +172,7 @@ namespace tut {
 		ensure_equals(chunks.size(), 2u);
 		ensure_equals(chunks[0], "hello");
 		ensure_equals(chunks[1], "hello");
+		ensure(ended);
 	}
 	
 	TEST_METHOD(21) {
@@ -166,6 +181,7 @@ namespace tut {
 		ensure_equals(dechunker.feed(input.data(), input.size()), 2u);
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
 	}
 	
 	TEST_METHOD(22) {
@@ -174,6 +190,7 @@ namespace tut {
 		ensure_equals(dechunker.feed(input.data(), input.size()), 3u);
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
 	}
 	
 	TEST_METHOD(23) {
@@ -182,6 +199,7 @@ namespace tut {
 		ensure_equals(dechunker.feed(input.data(), input.size()), 7u);
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
 	}
 	
 	TEST_METHOD(24) {
@@ -191,6 +209,7 @@ namespace tut {
 		ensure_equals(dechunker.feed(input.data(), input.size()), 5u);
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
 	}
 	
 	TEST_METHOD(25) {
@@ -202,6 +221,7 @@ namespace tut {
 		ensure_equals(dechunker.feed(input.data(), input.size()), 11u);
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
 	}
 	
 	TEST_METHOD(26) {
@@ -212,5 +232,19 @@ namespace tut {
 		dechunker.feed(input.data(), input.size());
 		ensure(!dechunker.acceptingInput());
 		ensure(dechunker.hasError());
+		ensure(!ended);
+	}
+
+	TEST_METHOD(27) {
+		// Test feeding a partial stream.
+		addChunk("hello");
+		addChunk("world");
+		ensure_equals(dechunker.feed(input.data(), input.size()), input.size());
+		ensure(dechunker.acceptingInput());
+		ensure(!dechunker.hasError());
+		ensure_equals(chunks.size(), 2u);
+		ensure_equals(chunks[0], "hello");
+		ensure_equals(chunks[1], "world");
+		ensure(!ended);
 	}
 }