passenger 5.3.3 → 5.3.4

data/dev/configkit-schemas/index.json

@@ -293,7 +293,7 @@
          "type" : "unsigned integer"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.3",
+         "default_value" : "Phusion_Passenger/5.3.4",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -795,7 +795,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.3",
+         "default_value" : "Phusion_Passenger/5.3.4",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -1517,7 +1517,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.3",
+         "default_value" : "Phusion_Passenger/5.3.4",
          "has_default_value" : "static",
          "type" : "string"
       },

data/src/agent/Core/AdminPanelConnector.h

@@ -47,6 +47,7 @@
 #include <Core/Controller.h>
 #include <ProcessManagement/Ruby.h>
 #include <FileTools/FileManip.h>
+#include <SystemTools/UserDatabase.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/IOUtils.h>
@@ -436,7 +437,8 @@ private:
 				files = Json::nullValue;
 			}
 			if (!files.isNull()) {
-				struct passwd *pwUser = getpwuid(ids.first);
+				string usernameOrUid = lookupSystemUsernameByUid(ids.first,
+					P_STATIC_STRING("%d"));
 
 				foreach (Json::Value file, files) {
 					string f = file.asString();
@@ -449,7 +451,7 @@ private:
 					execArgs.push_back("exec-helper");
 					if (geteuid() == 0) {
 						execArgs.push_back("--user");
-						execArgs.push_back(pwUser->pw_name);
+						execArgs.push_back(usernameOrUid.c_str());
 					}
 					execArgs.push_back("tail");
 					execArgs.push_back("-n");
@@ -642,7 +644,7 @@ public:
 		if (appPool == NULL) {
 			throw RuntimeException("appPool must be non-NULL");
 		}
-		if (configGetter == NULL) {
+		if (configGetter.empty()) {
 			throw RuntimeException("configGetter must be non-NULL");
 		}
 		server.initialize();

data/src/agent/Core/ApplicationPool/Common.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,7 +36,6 @@
 #include <StaticString.h>
 #include <MemoryKit/palloc.h>
 #include <DataStructures/StringKeyTable.h>
-#include <Utils/VariantMap.h>
 #include <Core/ApplicationPool/Options.h>
 #include <Core/ApplicationPool/Context.h>
 #include <Core/SpawningKit/Config.h>

data/src/agent/Core/ApplicationPool/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -30,7 +30,6 @@
 #include <boost/thread.hpp>
 #include <boost/pool/object_pool.hpp>
 #include <Exceptions.h>
-#include <Utils/VariantMap.h>
 #include <Core/SpawningKit/Factory.h>
 
 namespace Passenger {

data/src/agent/Core/ApplicationPool/Group/InternalUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -366,7 +366,7 @@ void
 Group::callAbortLongRunningConnectionsCallback(const ProcessPtr &process) {
 	Pool::AbortLongRunningConnectionsCallback callback =
 		getPool()->abortLongRunningConnectionsCallback;
-	if (callback != NULL) {
+	if (callback) {
 		callback(process);
 	}
 }

data/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -95,7 +95,7 @@ Pool::prepareForShutdown() {
 	ScopedLock lock(syncher);
 	assert(lifeStatus == ALIVE);
 	lifeStatus = PREPARED_FOR_SHUTDOWN;
-	if (abortLongRunningConnectionsCallback != NULL) {
+	if (abortLongRunningConnectionsCallback) {
 		vector<ProcessPtr> processes = getProcesses(false);
 		foreach (ProcessPtr process, processes) {
 			// Ensure that the process is not immediately respawned.

data/src/agent/Core/Config.h

@@ -154,7 +154,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/5.3.3")
+ *   server_software                                                 string             -          default("Phusion_Passenger/5.3.4")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_type                                        string             -          read_only

data/src/agent/Core/Controller.h

@@ -224,7 +224,7 @@ private:
 	void sendHeaderToApp(Client *client, Request *req);
 	void sendHeaderToAppWithSessionProtocol(Client *client, Request *req);
 	static void sendBodyToAppWhenAppSinkIdle(Channel *_channel, unsigned int size);
-	unsigned int determineHeaderSizeForSessionProtocol(Request *req,
+	unsigned int determineMaxHeaderSizeForSessionProtocol(Request *req,
 		SessionProtocolWorkingState &state, string delta_monotonic);
 	bool constructHeaderForSessionProtocol(Request *req, char * restrict buffer,
 		unsigned int &size, const SessionProtocolWorkingState &state, string delta_monotonic);
@@ -350,6 +350,7 @@ protected:
 		const MemoryKit::mbuf &buffer, int errcode);
 	virtual void onNextRequestEarlyReadError(Client *client, Request *req, int errcode);
 	virtual bool shouldDisconnectClientOnShutdown(Client *client);
+	virtual bool shouldAutoDechunkBody(Client *client, Request *req);
 	virtual bool supportsUpgrade(Client *client, Request *req);
 
 

data/src/agent/Core/Controller/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -38,6 +38,7 @@
 #include <ConfigKit/SchemaUtils.h>
 #include <MemoryKit/palloc.h>
 #include <ServerKit/HttpServer.h>
+#include <SystemTools/UserDatabase.h>
 #include <AppTypes.h>
 #include <Constants.h>
 #include <Exceptions.h>
@@ -112,7 +113,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/5.3.3")
+ *   server_software                                     string             -          default("Phusion_Passenger/5.3.4")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -179,13 +180,13 @@ private:
 	}
 
 	static Json::Value inferDefaultValueForDefaultGroup(const ConfigKit::Store &config) {
-		struct passwd *userEntry = getpwnam(config["default_user"].asCString());
-		if (userEntry == NULL) {
+		OsUser osUser;
+		if (!lookupSystemUserByName(config["default_user"].asString(), osUser)) {
 			throw ConfigurationException(
 				"The user that PassengerDefaultUser refers to, '" +
 				config["default_user"].asString() + "', does not exist.");
 		}
-		return getGroupName(userEntry->pw_gid);
+		return lookupSystemGroupnameByGid(osUser.pwd.pw_gid, P_STATIC_STRING("%d"));
 	}
 
 	static void validate(const ConfigKit::Store &config,

data/src/agent/Core/Controller/Hooks.cpp

@@ -273,6 +273,17 @@ Controller::shouldDisconnectClientOnShutdown(Client *client) {
 		|| !mainConfig.gracefulExit;
 }
 
+bool
+Controller::shouldAutoDechunkBody(Client *client, Request *req) {
+	// When buffering the body, we'll want to buffer the dechunked data,
+	// (and when passing the request to the app we'll also add Content-Length
+	// and remove Transfer-Encoding) so turn auto-dechunking on in that case.
+	//
+	// Otherwise we'll want to disable auto-dechunking because we'll
+	// pass the raw chunked body to the app.
+	return req->requestBodyBuffering;
+}
+
 bool
 Controller::supportsUpgrade(Client *client, Request *req) {
 	return true;

data/src/agent/Core/Controller/SendRequest.cpp

@@ -167,7 +167,7 @@ Controller::sendHeaderToAppWithSessionProtocol(Client *client, Request *req) {
 		deltaMonotonic = boost::to_string(-diff);
 	}
 
-	unsigned int bufferSize = determineHeaderSizeForSessionProtocol(req,
+	unsigned int bufferSize = determineMaxHeaderSizeForSessionProtocol(req,
 		state, deltaMonotonic);
 	MemoryKit::mbuf_pool &mbuf_pool = getContext()->mbuf_pool;
 	const unsigned int MBUF_MAX_SIZE = mbuf_pool_data_size(&mbuf_pool);
@@ -317,7 +317,7 @@ httpHeaderToScgiUpperCase(unsigned char *data, unsigned int size) {
 }
 
 unsigned int
-Controller::determineHeaderSizeForSessionProtocol(Request *req,
+Controller::determineMaxHeaderSizeForSessionProtocol(Request *req,
 	SessionProtocolWorkingState &state, string delta_monotonic)
 {
 	unsigned int dataSize = sizeof(boost::uint32_t);
@@ -563,15 +563,15 @@ Controller::constructHeaderForSessionProtocol(Request *req, char * restrict buff
 
 	ServerKit::HeaderTable::Iterator it(req->headers);
 	while (*it != NULL) {
-		// This header-skipping is not accounted for in determineHeaderSizeForSessionProtocol(), but
+		// This header-skipping is not accounted for in determineMaxHeaderSizeForSessionProtocol(), but
 		// since we are only reducing the size it just wastes some mem bytes.
 		if ((
 				(it->header->hash == HTTP_CONTENT_LENGTH.hash()
 						|| it->header->hash == HTTP_CONTENT_TYPE.hash()
 						|| it->header->hash == HTTP_CONNECTION.hash()
-				) && (psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-type"))
-						|| psg_lstr_cmp(&it->header->key, P_STATIC_STRING("content-length"))
-						|| psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection"))
+				) && (psg_lstr_cmp(&it->header->key, HTTP_CONTENT_TYPE)
+						|| psg_lstr_cmp(&it->header->key, HTTP_CONTENT_LENGTH)
+						|| psg_lstr_cmp(&it->header->key, HTTP_CONNECTION)
 				)
 			) || containsNonAlphaNumDash(it->header->key)
 		   )
@@ -756,7 +756,7 @@ Controller::constructHeaderBuffersForHttpProtocol(Request *req, struct iovec *bu
 	while (*it != NULL) {
 		if ((it->header->hash == HTTP_CONNECTION.hash()
 		  || it->header->hash == ServerKit::HTTP_SET_COOKIE.hash())
-		 && (psg_lstr_cmp(&it->header->key, P_STATIC_STRING("connection"))
+		 && (psg_lstr_cmp(&it->header->key, HTTP_CONNECTION)
 		  || psg_lstr_cmp(&it->header->key, ServerKit::HTTP_SET_COOKIE)))
 		{
 			it.next();

data/src/agent/Core/CoreMain.cpp

@@ -81,7 +81,6 @@
 #include <ConfigKit/SubComponentUtils.h>
 #include <ServerKit/Server.h>
 #include <ServerKit/AcceptLoadBalancer.h>
-#include <ConfigKit/VariantMapUtils.h>
 #include <MessageReadersWriters.h>
 #include <FileDescriptor.h>
 #include <ResourceLocator.h>
@@ -92,7 +91,6 @@
 #include <Utils.h>
 #include <Utils/Timer.h>
 #include <Utils/MessageIO.h>
-#include <Utils/VariantMap.h>
 #include <Core/OptionParser.h>
 #include <Core/Controller.h>
 #include <Core/ApiServer.h>

data/src/agent/Core/SpawningKit/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -37,7 +37,6 @@
 #include <RandomGenerator.h>
 #include <Exceptions.h>
 #include <Utils/JsonUtils.h>
-#include <Utils/VariantMap.h>
 #include <ConfigKit/Store.h>
 
 namespace Passenger {
@@ -53,7 +52,6 @@ using namespace std;
 
 
 class HandshakePrepare;
-typedef boost::function<void (const char *data, unsigned int size)> OutputHandler;
 typedef Passenger::ApplicationPool2::Options AppPoolOptions;
 
 

data/src/agent/Core/SpawningKit/Handshake/BackgroundIOCapturer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -112,7 +112,7 @@ private:
 			boost::lock_guard<boost::mutex> l(dataSyncher);
 			stopped = true;
 		}
-		if (endReachedCallback != NULL) {
+		if (endReachedCallback) {
 			endReachedCallback();
 		}
 	}

data/src/agent/Core/SpawningKit/Handshake/Perform.h

@@ -600,8 +600,8 @@ private:
 		if (s.st_uid != session.uid) {
 			errors.push_back("'sockets[" + toString(index)
 				+ "].address', when referring to a Unix domain socket file,"
-				" must be owned by user " + getUserName(session.uid)
-				+ " (actual owner: " + getUserName(s.st_uid) + ")");
+				" must be owned by user " + lookupSystemUsernameByUid(session.uid)
+				+ " (actual owner: " + lookupSystemUsernameByUid(s.st_uid) + ")");
 		}
 	}
 

data/src/agent/Core/SpawningKit/Handshake/Prepare.h

@@ -55,6 +55,7 @@
 #include <Exceptions.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
+#include <SystemTools/UserDatabase.h>
 #include <Utils/SystemTime.h>
 #include <Utils/Timer.h>
 #include <Utils/IOUtils.h>
@@ -90,55 +91,33 @@ private:
 		TRACE_POINT();
 		string username = config->user.toString(); // null terminate string
 		string groupname = config->group.toString(); // null terminate string
-		struct passwd pwd, *userInfo;
-		struct group grp, *groupInfo;
-		long pwdBufSize, grpBufSize;
-		boost::scoped_array<char> pwdBuf, grpBuf;
-		int ret;
-
-		// _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]);
+		OsUser osUser;
+		OsGroup osGroup;
 
-		ret = getpwnam_r(username.c_str(), &pwd, pwdBuf.get(), pwdBufSize,
-			&userInfo);
-		if (ret != 0) {
+		if (lookupSystemUserByName(username, osUser)) {
+			session.uid = osUser.pwd.pw_uid;
+			session.shell = osUser.pwd.pw_shell;
+			session.homedir = osUser.pwd.pw_dir;
+		} else {
 			if (looksLikePositiveNumber(username)) {
-				P_WARN("Error looking up system user database entry for user '"
-					<< username << "'. Will assume that this is a UID. Error message: "
-					<< strerror(ret) << " (errno=" << ret << ")");
+				P_WARN("OS user account '" << username << "' does not exist."
+					" Will assume that this is a UID.");
 				session.uid = (uid_t) atoi(username);
 			} else {
-				throw SystemException("Cannot lookup up system user database entry"
-					" for user '" + username + "'", ret);
+				throw RuntimeException("OS user account '" + username + "' does not exist");
 			}
-		} else if (userInfo == NULL) {
-			throw RuntimeException("The operating system user '" + username + "' does not exist");
-		} else {
-			session.uid = userInfo->pw_uid;
-			session.shell = userInfo->pw_shell;
-			session.homedir = userInfo->pw_dir;
 		}
 
-		ret = getgrnam_r(groupname.c_str(), &grp, grpBuf.get(), grpBufSize,
-			&groupInfo);
-		if (ret != 0) {
+		if (lookupSystemGroupByName(groupname, osGroup)) {
+			session.gid = osGroup.grp.gr_gid;
+		} else {
 			if (looksLikePositiveNumber(groupname)) {
-				P_WARN("Error looking up system group database entry for group '"
-					<< groupname << "'. Will assume that this is a GID. Error message: "
-					<< strerror(ret) << " (errno=" << ret << ")");
+				P_WARN("OS group account '" << groupname << "' does not exist."
+					" Will assume that this is a GID.");
 				session.gid = (gid_t) atoi(groupname);
 			} else {
-				throw SystemException("Cannot lookup up system group database entry"
-					" for group '" + groupname + "'", ret);
+				throw RuntimeException("OS group account '" + groupname + "' does not exist");
 			}
-		} else if (groupInfo == NULL) {
-			throw RuntimeException("The operating system group '" + groupname + "' does not exist");
-		} else {
-			session.gid = groupInfo->gr_gid;
 		}
 	}
 

data/src/agent/Core/SpawningKit/PipeWatcher.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2017 Phusion Holding B.V.
+ *  Copyright (c) 2012-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -133,8 +133,10 @@ private:
 		if (f == NULL) {
 			LoggingKit::logAppOutput(appGroupName, pid, name, line.data(), line.size(), appLogFile);
 		} else {
-			fwrite(line.data(), 1, line.size(), f);
-			fwrite("\n", 1, 2, f);
+			size_t ret = fwrite(line.data(), 1, line.size(), f);
+			(void) ret; // Avoid compiler warning
+			ret = fwrite("\n", 1, 2, f);
+			(void) ret; // Avoid compiler warning
 			fflush(f);
 		}
 	}

data/src/agent/Core/SpawningKit/UserSwitchingRules.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -39,6 +39,7 @@
 #include <Utils.h>
 #include <Core/SpawningKit/Context.h>
 #include <FileTools/PathManip.h>
+#include <SystemTools/UserDatabase.h>
 
 namespace Passenger {
 namespace SpawningKit {
@@ -80,13 +81,13 @@ prepareUserSwitching(const AppPoolOptions &options) {
 		 || userInfo == (struct passwd *) NULL)
 		{
 			throw RuntimeException("Cannot get user database entry for user " +
-				getProcessUsername() + "; it looks like your system's " +
+				lookupSystemUsernameByUid(geteuid()) + "; it looks like your system's " +
 				"user database is broken, please fix it.");
 		}
 
 		info.enabled = false;
 		info.username = userInfo->pw_name;
-		info.groupname = getGroupName(userInfo->pw_gid);
+		info.groupname = lookupSystemGroupnameByGid(userInfo->pw_gid, P_STATIC_STRING("%d"));
 		info.uid = geteuid();
 		info.gid = getegid();
 		return info;
@@ -215,7 +216,14 @@ prepareUserSwitching(const AppPoolOptions &options) {
 		groupId = userInfo->pw_gid;
 	}
 	if (groupId == 0 || groupId == (gid_t) -1) {
-		groupId = lookupGid(defaultGroup);
+		OsGroup osGroup;
+		if (lookupSystemGroupByName(defaultGroup, osGroup)) {
+			groupId = osGroup.grp.gr_gid;
+		} else if (looksLikePositiveNumber(defaultGroup)) {
+			groupId = atoi(defaultGroup);
+		} else {
+			groupId = -1;
+		}
 	}
 
 	UPDATE_TRACE_POINT();
@@ -229,7 +237,7 @@ prepareUserSwitching(const AppPoolOptions &options) {
 	UPDATE_TRACE_POINT();
 	info.enabled = true;
 	info.username = userInfo->pw_name;
-	info.groupname = getGroupName(groupId);
+	info.groupname = lookupSystemGroupnameByGid(groupId, P_STATIC_STRING("%d"));
 	info.uid = userInfo->pw_uid;
 	info.gid = groupId;