passenger 4.0.48 → 4.0.49

data/ext/common/ApplicationPool2/Socket.h

@@ -49,13 +49,13 @@ struct Connection {
 	int fd;
 	bool persistent: 1;
 	bool fail: 1;
-	
+
 	Connection() {
 		fd = -1;
 		persistent = false;
 		fail = false;
 	}
-	
+
 	void close() {
 		if (fd != -1) {
 			int fd2 = fd;
@@ -75,37 +75,37 @@ private:
 	boost::mutex connectionPoolLock;
 	int totalConnections;
 	vector<Connection> idleConnections;
-	
+
 	int connectionPoolLimit() const {
 		return concurrency;
 	}
-	
+
 	Connection connect() const {
 		Connection connection;
 		P_TRACE(3, "Connecting to " << address);
 		connection.fd = connectToServer(address);
 		return connection;
 	}
-	
+
 public:
 	// Read-only.
 	string name;
 	string address;
 	string protocol;
 	int concurrency;
-	
+
 	/** The handle inside the associated Process's 'sessionSockets' priority queue.
 	 * Guaranteed to be valid as long as the Process is alive.
 	 */
 	PriorityQueue<Socket>::Handle pqHandle;
-	
+
 	/** Invariant: sessions >= 0 */
 	int sessions;
-	
+
 	Socket()
 		: concurrency(0)
 		{ }
-	
+
 	Socket(const string &_name, const string &_address, const string &_protocol, int _concurrency)
 		: totalConnections(0),
 		  name(_name),
@@ -114,7 +114,7 @@ public:
 		  concurrency(_concurrency),
 		  sessions(0)
 		{ }
-	
+
 	Socket(const Socket &other)
 		: totalConnections(other.totalConnections),
 		  idleConnections(other.idleConnections),
@@ -125,7 +125,7 @@ public:
 		  pqHandle(other.pqHandle),
 		  sessions(other.sessions)
 		{ }
-	
+
 	Socket &operator=(const Socket &other) {
 		totalConnections = other.totalConnections;
 		idleConnections = other.idleConnections;
@@ -137,7 +137,7 @@ public:
 		sessions = other.sessions;
 		return *this;
 	}
-	
+
 	/**
 	 * Connect to this socket or reuse an existing connection.
 	 *
@@ -146,7 +146,7 @@ public:
 	 */
 	Connection checkoutConnection() {
 		boost::lock_guard<boost::mutex> l(connectionPoolLock);
-		
+
 		if (!idleConnections.empty()) {
 			Connection connection = idleConnections.back();
 			idleConnections.pop_back();
@@ -160,10 +160,10 @@ public:
 			return connect();
 		}
 	}
-	
+
 	void checkinConnection(Connection connection) {
 		boost::unique_lock<boost::mutex> l(connectionPoolLock);
-		
+
 		if (connection.persistent) {
 			if (connection.fail) {
 				totalConnections--;
@@ -177,12 +177,12 @@ public:
 			connection.close();
 		}
 	}
-	
-	
+
+
 	bool isIdle() const {
 		return sessions == 0;
 	}
-	
+
 	int busyness() const {
 		/* Different sockets within a Process may have different
 		 * 'concurrency' values. We want:
@@ -204,7 +204,7 @@ public:
 			return (int) (((long long) sessions * INT_MAX) / (double) concurrency);
 		}
 	}
-	
+
 	bool isTotallyBusy() const {
 		return concurrency != 0 && sessions >= concurrency;
 	}

data/ext/common/ApplicationPool2/Spawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2013 Phusion
+ *  Copyright (c) 2011-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -57,6 +57,7 @@
 #include <map>
 #include <vector>
 #include <utility>
+#include <algorithm>
 #include <boost/make_shared.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/bind.hpp>
@@ -107,7 +108,7 @@ class Spawner {
 protected:
 	friend struct tut::ApplicationPool2_DirectSpawnerTest;
 	friend struct tut::ApplicationPool2_SmartSpawnerTest;
-	
+
 	/**
 	 * Given a file descriptor, captures its output in a background thread
 	 * and also forwards it immediately to a target file descriptor.
@@ -122,13 +123,13 @@ protected:
 		boost::mutex dataSyncher;
 		string data;
 		oxt::thread *thr;
-		
+
 		void capture() {
 			TRACE_POINT();
 			while (!this_thread::interruption_requested()) {
 				char buf[1024 * 8];
 				ssize_t ret;
-				
+
 				UPDATE_TRACE_POINT();
 				ret = syscalls::read(fd, buf, sizeof(buf));
 				int e = errno;
@@ -162,7 +163,7 @@ protected:
 				}
 			}
 		}
-		
+
 	public:
 		BackgroundIOCapturer(const FileDescriptor &_fd, pid_t _pid, const char *_channelName)
 			: fd(_fd),
@@ -170,7 +171,7 @@ protected:
 			  channelName(_channelName),
 			  thr(NULL)
 			{ }
-		
+
 		~BackgroundIOCapturer() {
 			TRACE_POINT();
 			if (thr != NULL) {
@@ -181,17 +182,17 @@ protected:
 				thr = NULL;
 			}
 		}
-		
+
 		const FileDescriptor &getFd() const {
 			return fd;
 		}
-		
+
 		void start() {
 			assert(thr == NULL);
 			thr = new oxt::thread(boost::bind(&BackgroundIOCapturer::capture, this),
 				"Background I/O capturer", 64 * 1024);
 		}
-		
+
 		string stop() {
 			TRACE_POINT();
 			assert(thr != NULL);
@@ -210,9 +211,9 @@ protected:
 			data.append(dataToAdd.data(), dataToAdd.size());
 		}
 	};
-	
+
 	typedef boost::shared_ptr<BackgroundIOCapturer> BackgroundIOCapturerPtr;
-	
+
 	/**
 	 * A temporary directory for spawned child processes to write
 	 * debugging information to. It is removed after spawning has
@@ -345,14 +346,14 @@ protected:
 		FileDescriptor errorPipe;
 		const Options *options;
 		DebugDirPtr debugDir;
-		
+
 		/****** Working state ******/
 		BufferedIO io;
 		string gupid;
 		string connectPassword;
 		unsigned long long spawnStartTime;
 		unsigned long long timeout;
-		
+
 		NegotiationDetails() {
 			preparation = NULL;
 			pid = 0;
@@ -361,8 +362,8 @@ protected:
 			timeout = 0;
 		}
 	};
-	
-	
+
+
 private:
 	/**
 	 * Appends key + "\0" + value + "\0" to 'output'.
@@ -425,7 +426,7 @@ private:
 		SocketListPtr sockets = boost::make_shared<SocketList>();
 		while (true) {
 			string line;
-			
+
 			try {
 				line = readMessageLine(details);
 			} catch (const SystemException &e) {
@@ -440,7 +441,7 @@ private:
 					SpawnException::APP_STARTUP_TIMEOUT,
 					details);
 			}
-			
+
 			if (line.empty()) {
 				throwAppSpawnException("An error occurred while starting the "
 					"web application. It unexpected closed the connection while "
@@ -456,7 +457,7 @@ private:
 			} else if (line == "\n") {
 				break;
 			}
-			
+
 			string::size_type pos = line.find(": ");
 			if (pos == string::npos) {
 				throwAppSpawnException("An error occurred while starting the "
@@ -465,7 +466,7 @@ private:
 					SpawnException::APP_STARTUP_PROTOCOL_ERROR,
 					details);
 			}
-			
+
 			string key = line.substr(0, pos);
 			string value = line.substr(pos + 2, line.size() - pos - 3);
 			if (key == "socket") {
@@ -525,7 +526,7 @@ private:
 				SpawnException::APP_STARTUP_PROTOCOL_ERROR,
 				details);
 		}
-		
+
 		ProcessPtr process = boost::make_shared<Process>(
 			details.pid,
 			details.gupid, details.connectPassword,
@@ -534,17 +535,17 @@ private:
 		process->codeRevision = details.preparation->codeRevision;
 		return process;
 	}
-	
+
 protected:
 	ServerInstanceDir::GenerationPtr generation;
 	SpawnerConfigPtr config;
-	
+
 	static void nonInterruptableKillAndWaitpid(pid_t pid) {
 		this_thread::disable_syscall_interruption dsi;
 		syscalls::kill(pid, SIGKILL);
 		syscalls::waitpid(pid, NULL, 0);
 	}
-	
+
 	/**
 	 * Behaves like <tt>waitpid(pid, status, WNOHANG)</tt>, but waits at most
 	 * <em>timeout</em> miliseconds for the process to exit.
@@ -552,7 +553,7 @@ protected:
 	static int timedWaitpid(pid_t pid, int *status, unsigned long long timeout) {
 		Timer timer;
 		int ret;
-		
+
 		do {
 			ret = syscalls::waitpid(pid, status, WNOHANG);
 			if (ret > 0 || ret == -1) {
@@ -563,7 +564,7 @@ protected:
 		} while (timer.elapsed() < timeout);
 		return 0; // timed out
 	}
-	
+
 	static string fixupSocketAddress(const Options &options, const string &address) {
 		TRACE_POINT();
 		if (!options.preexecChroot.empty() && !options.postexecChroot.empty()) {
@@ -662,7 +663,7 @@ protected:
 			// and whether postexecChroot is a child directory of appRoot.
 		}
 	}
-	
+
 	static void createCommandArgs(const vector<string> &command,
 		shared_array<const char *> &args)
 	{
@@ -678,7 +679,7 @@ protected:
 			throw RuntimeException("An internal error!");
 		}
 	}
-	
+
 	void throwAppSpawnException(const string &msg,
 		SpawnException::ErrorKind errorKind,
 		NegotiationDetails &details)
@@ -690,7 +691,7 @@ protected:
 		if (details.stderrCapturer != NULL) {
 			stderrOutput = details.stderrCapturer->stop();
 		}
-		
+
 		// If the exception wasn't due to a timeout, try to capture the
 		// remaining stderr output for at most 2 seconds.
 		if (errorKind != SpawnException::PRELOADER_STARTUP_TIMEOUT
@@ -702,7 +703,7 @@ protected:
 			while (!done) {
 				char buf[1024 * 32];
 				unsigned int ret;
-				
+
 				try {
 					ret = readExact(details.stderrCapturer->getFd(), buf,
 						sizeof(buf), &timeout);
@@ -720,7 +721,7 @@ protected:
 			}
 		}
 		details.stderrCapturer.reset();
-		
+
 		// Now throw SpawnException with the captured stderr output
 		// as error response.
 		SpawnException e(msg,
@@ -782,7 +783,7 @@ protected:
 			if (!line.empty() && line[line.size() - 1] == '\n') {
 				line.erase(line.size() - 1, 1);
 			}
-			
+
 			if (result.empty()) {
 				// EOF
 				return result;
@@ -840,11 +841,9 @@ protected:
 			long bufSize;
 			shared_array<char> strings;
 
-			bufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
-			if (bufSize == -1) {
-				// Let's hope this is enough.
-				bufSize = 1024 * 64;
-			}
+			// _SC_GETPW_R_SIZE_MAX is not a maximum:
+			// http://tomlee.co/2012/10/problems-with-large-linux-unix-groups-and-getgrgid_r-getgrnam_r/
+			bufSize = std::max<long>(1024 * 128, sysconf(_SC_GETPW_R_SIZE_MAX));
 			strings.reset(new char[bufSize]);
 
 			userInfo = (struct passwd *) NULL;
@@ -855,7 +854,7 @@ protected:
 					getProcessUsername() + "; it looks like your system's " +
 					"user database is broken, please fix it.");
 			}
-			
+
 			info.switchUser = false;
 			info.username = userInfo->pw_name;
 			info.groupname = getGroupName(userInfo->pw_gid);
@@ -866,7 +865,7 @@ protected:
 			info.ngroups = 0;
 			return;
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		string defaultGroup;
 		string startupFile = absolutizePath(options.getStartupFile(), info.appRoot);
@@ -876,19 +875,12 @@ protected:
 		long pwdBufSize, grpBufSize;
 		shared_array<char> pwdBuf, grpBuf;
 		int ret;
-		
-		pwdBufSize = sysconf(_SC_GETPW_R_SIZE_MAX);
-		if (pwdBufSize == -1) {
-			// Let's hope this is enough.
-			pwdBufSize = 1024 * 64;
-		}
-		pwdBuf.reset(new char[pwdBufSize]);
 
-		grpBufSize = sysconf(_SC_GETGR_R_SIZE_MAX);
-		if (grpBufSize == -1) {
-			// Let's hope this is enough.
-			grpBufSize = 1024 * 64;
-		}
+		// _SC_GETPW_R_SIZE_MAX/_SC_GETGR_R_SIZE_MAX are not maximums:
+		// http://tomlee.co/2012/10/problems-with-large-linux-unix-groups-and-getgrgid_r-getgrnam_r/
+		pwdBufSize = std::max<long>(1024 * 128, sysconf(_SC_GETPW_R_SIZE_MAX));
+		pwdBuf.reset(new char[pwdBufSize]);
+		grpBufSize = std::max<long>(1024 * 128, sysconf(_SC_GETGR_R_SIZE_MAX));
 		grpBuf.reset(new char[grpBufSize]);
 
 		if (options.defaultGroup.empty()) {
@@ -920,7 +912,7 @@ protected:
 		} else {
 			defaultGroup = options.defaultGroup;
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		userInfo = (struct passwd *) NULL;
 		if (!options.user.empty()) {
@@ -950,7 +942,7 @@ protected:
 				userInfo = (struct passwd *) NULL;
 			}
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		if (!options.group.empty()) {
 			struct group *groupInfo = (struct group *) NULL;
@@ -1000,7 +992,7 @@ protected:
 		if (groupId == (gid_t) -1) {
 			throw RuntimeException("Cannot determine a group to lower privilege to");
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		#ifdef __APPLE__
 			int groups[1024];
@@ -1110,11 +1102,11 @@ protected:
 			return false;
 		}
 	}
-	
+
 	string serializeEnvvarsFromPoolOptions(const Options &options) const {
 		vector< pair<StaticString, StaticString> >::const_iterator it, end;
 		string result;
-		
+
 		appendNullTerminatedKeyValue(result, "IN_PASSENGER", "1");
 		appendNullTerminatedKeyValue(result, "PYTHONUNBUFFERED", "1");
 		appendNullTerminatedKeyValue(result, "NODE_PATH", config->resourceLocator.getNodeLibDir());
@@ -1134,14 +1126,14 @@ protected:
 				"PASSENGER_BASE_URI",
 				options.baseURI);
 		}
-		
+
 		it  = options.environmentVariables.begin();
 		end = options.environmentVariables.end();
 		while (it != end) {
 			appendNullTerminatedKeyValue(result, it->first, it->second);
 			it++;
 		}
-		
+
 		return Base64::encode(result);
 	}
 
@@ -1189,7 +1181,7 @@ protected:
 				fflush(stdout);
 				_exit(1);
 			}
-			
+
 			// We set these environment variables here instead of
 			// in the SpawnPreparer because SpawnPreparer might
 			// be executed by bash, but these environment variables
@@ -1200,7 +1192,7 @@ protected:
 			setenv("HOME", info.home.c_str(), 1);
 		}
 	}
-	
+
 	void setChroot(const SpawnPreparationInfo &info) {
 		if (info.chrootDir != "/") {
 			int ret = chroot(info.chrootDir.c_str());
@@ -1215,7 +1207,7 @@ protected:
 			}
 		}
 	}
-	
+
 	void setWorkingDirectory(const SpawnPreparationInfo &info) {
 		vector<string>::const_iterator it, end = info.appRootPathsInsideChroot.end();
 		int ret;
@@ -1279,7 +1271,7 @@ protected:
 			_exit(1);
 		}
 	}
-	
+
 	/**
 	 * Execute the process spawning negotiation protocol.
 	 */
@@ -1290,7 +1282,7 @@ protected:
 			config->randomGenerator->generateAsciiString(11);
 		details.connectPassword = config->randomGenerator->generateAsciiString(43);
 		details.timeout = details.options->startTimeout * 1000;
-		
+
 		string result;
 		try {
 			result = readMessageLine(details);
@@ -1306,7 +1298,7 @@ protected:
 				SpawnException::APP_STARTUP_TIMEOUT,
 				details);
 		}
-		
+
 		protocol_begin:
 		if (result == "I have control 1.0\n") {
 			UPDATE_TRACE_POINT();
@@ -1344,11 +1336,11 @@ protected:
 		}
 		return ProcessPtr(); // Never reached.
 	}
-	
+
 	void handleSpawnErrorResponse(NegotiationDetails &details) {
 		TRACE_POINT();
 		map<string, string> attributes;
-		
+
 		while (true) {
 			string line = readMessageLine(details);
 			if (line.empty()) {
@@ -1366,7 +1358,7 @@ protected:
 			} else if (line == "\n") {
 				break;
 			}
-			
+
 			string::size_type pos = line.find(": ");
 			if (pos == string::npos) {
 				throwAppSpawnException("An error occurred while starting the "
@@ -1375,12 +1367,12 @@ protected:
 					SpawnException::APP_STARTUP_PROTOCOL_ERROR,
 					details);
 			}
-			
+
 			string key = line.substr(0, pos);
 			string value = line.substr(pos + 2, line.size() - pos - 3);
 			attributes[key] = value;
 		}
-		
+
 		try {
 			string message = details.io.readAll(&details.timeout);
 			SpawnException e("An error occured while starting the web application.",
@@ -1404,7 +1396,7 @@ protected:
 				details);
 		}
 	}
-	
+
 	void handleInvalidSpawnResponseType(const string &line, NegotiationDetails &details) {
 		if (line.empty()) {
 			throwAppSpawnException("An error occurred while starting "
@@ -1420,7 +1412,7 @@ protected:
 				details);
 		}
 	}
-	
+
 public:
 	/**
 	 * Timestamp at which this Spawner was created. Microseconds resolution.
@@ -1431,10 +1423,10 @@ public:
 		: config(_config),
 		  creationTime(SystemTime::getUsec())
 		{ }
-	
+
 	virtual ~Spawner() { }
 	virtual ProcessPtr spawn(const Options &options) = 0;
-	
+
 	/** Does not depend on the event loop. */
 	virtual bool cleanable() const {
 		return false;