passenger 5.3.4 → 6.0.1

data/src/agent/Core/SpawningKit/Result.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.
@@ -33,7 +33,7 @@
 
 #include <FileDescriptor.h>
 #include <Exceptions.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 #include <ConfigKit/ConfigKit.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Config.h>
@@ -113,6 +113,19 @@ public:
 		}
 	};
 
+	enum Type {
+		UNKNOWN,
+		GENERIC,
+		KURIA,
+		AUTO_SUPPORTED,
+		/**
+		 * Indicates that this Process does not refer to a real OS
+		 * process. The sockets in the socket list are fake and need not be deleted.
+		 * Set to true by DummySpawner, used during unit tests.
+		 */
+		DUMMY
+	};
+
 private:
 	void validate_autoGeneratedCode(vector<StaticString> &internalFieldErrors,
 		vector<StaticString> &appSuppliedFieldErrors) const;
@@ -127,13 +140,9 @@ public:
 	pid_t pid;
 
 	/**
-	 * If true, then indicates that this Process does not refer to a real OS
-	 * process. The sockets in the socket list are fake and need not be deleted.
-	 * Set to true by DummySpawner, used during unit tests.
-	 *
 	 * @hinted_parseable
 	 */
-	bool dummy;
+	Type type;
 
 	/**
 	 * @hinted_parseable
@@ -188,7 +197,7 @@ public:
 
 	Result()
 		: pid(-1),
-		  dummy(false),
+		  type(UNKNOWN),
 		  spawnStartTime(0),
 		  spawnEndTime(0),
 		  spawnStartTimeMonotonic(0),
@@ -207,6 +216,9 @@ public:
 	{
 		validate_autoGeneratedCode(internalFieldErrors, appSuppliedFieldErrors);
 
+		if (type == UNKNOWN) {
+			internalFieldErrors.push_back(P_STATIC_STRING("type may not be unknown"));
+		}
 		if (sockets.empty()) {
 			appSuppliedFieldErrors.push_back(P_STATIC_STRING("sockets are not supplied"));
 		}

data/src/agent/Core/SpawningKit/SmartSpawner.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.
@@ -50,12 +50,12 @@
 #include <Exceptions.h>
 #include <DataStructures/StringKeyTable.h>
 #include <ProcessManagement/Utils.h>
+#include <SystemTools/ProcessMetricsCollector.h>
+#include <SystemTools/SystemTime.h>
 #include <FileTools/FileManip.h>
-#include <Utils/SystemTime.h>
-#include <Utils/BufferedIO.h>
-#include <Utils/JsonUtils.h>
+#include <IOTools/BufferedIO.h>
+#include <JsonTools/JsonUtils.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/ProcessMetricsCollector.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 #include <LveLoggingDecorator.h>
 #include <Core/SpawningKit/Spawner.h>
@@ -374,14 +374,14 @@ private:
 			dup2(stdinCopy, 0);
 			dup2(stdoutAndErrCopy, 1);
 			dup2(stdoutAndErrCopy, 2);
-			closeAllFileDescriptors(2, true);
+			closeAllFileDescriptors(2);
 
 			execlp(agentFilename.c_str(),
 				agentFilename.c_str(),
 				"spawn-env-setupper",
 				session.workDir->getPath().c_str(),
 				"--before",
-				NULL);
+				(char *) 0);
 
 			char *pos = buf;
 			e = errno;

data/src/agent/Core/SpawningKit/Spawner.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.
@@ -31,8 +31,9 @@
 
 #include <modp_b64.h>
 
+#include <AppLocalConfigFileUtils.h>
 #include <LoggingKit/Logging.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Result.h>
 #include <Core/SpawningKit/UserSwitchingRules.h>
@@ -79,7 +80,7 @@ protected:
 	void setConfigFromAppPoolOptions(Config *config, Json::Value &extraArgs,
 		const AppPoolOptions &options)
 	{
-		string startCommand = options.getStartCommand(*context->resourceLocator);
+		TRACE_POINT();
 		string envvarsData;
 		try {
 			envvarsData = modp::b64_decode(options.environmentVariables.data(),
@@ -90,16 +91,31 @@ protected:
 			envvarsData.clear();
 		}
 
+		AppLocalConfig appLocalConfig = parseAppLocalConfigFile(options.appRoot);
+		string startCommand;
+
+		if (appLocalConfig.appSupportsKuriaProtocol) {
+			config->genericApp = false;
+			config->startsUsingWrapper = false;
+			config->startCommand = options.appStartCommand;
+		} else if (options.appType.empty()) {
+			config->genericApp = true;
+			config->startCommand = options.appStartCommand;
+		} else {
+			startCommand = options.getStartCommand(*context->resourceLocator,
+				*context->wrapperRegistry);
+			config->genericApp = false;
+			config->startsUsingWrapper = true;
+			config->startCommand = startCommand;
+		}
+
 		config->appGroupName = options.getAppGroupName();
 		config->appRoot = options.appRoot;
 		config->logLevel = options.logLevel;
-		config->genericApp = false;
-		config->startsUsingWrapper = true;
 		config->wrapperSuppliedByThirdParty = false;
 		config->findFreePort = false;
 		config->loadShellEnvvars = options.loadShellEnvvars;
-		config->startCommand = startCommand;
-		config->startupFile = options.getStartupFile();
+		config->startupFile = options.getStartupFile(*context->wrapperRegistry);
 		config->appType = options.appType;
 		config->appEnv = options.environment;
 		config->baseURI = options.baseURI;
@@ -112,7 +128,8 @@ protected:
 		config->fileDescriptorUlimit = options.fileDescriptorUlimit;
 		config->startTimeoutMsec = options.startTimeout;
 
-		UserSwitchingInfo info = prepareUserSwitching(options);
+		UserSwitchingInfo info = prepareUserSwitching(options,
+			*context->wrapperRegistry);
 		config->user = info.username;
 		config->group = info.groupname;
 

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

@@ -35,6 +35,7 @@
 #include <boost/shared_array.hpp>
 #include <oxt/backtrace.hpp>
 #include <oxt/system_calls.hpp>
+#include <WrapperRegistry/Registry.h>
 #include <Exceptions.h>
 #include <Utils.h>
 #include <Core/SpawningKit/Context.h>
@@ -61,7 +62,9 @@ struct UserSwitchingInfo {
 };
 
 inline UserSwitchingInfo
-prepareUserSwitching(const AppPoolOptions &options) {
+prepareUserSwitching(const AppPoolOptions &options,
+	const WrapperRegistry::Registry &wrapperRegistry)
+{
 	TRACE_POINT();
 	UserSwitchingInfo info;
 
@@ -95,8 +98,8 @@ prepareUserSwitching(const AppPoolOptions &options) {
 
 	UPDATE_TRACE_POINT();
 	string defaultGroup;
-	string startupFile = absolutizePath(options.getStartupFile(),
-		absolutizePath(options.appRoot));
+	// This is the file that determines what user we lower privilege to.
+	string referenceFile;
 	struct passwd &pwd = info.lveUserPwd;
 	boost::shared_array<char> &pwdBuf = info.lveUserPwdStrBuf;
 	struct passwd *userInfo;
@@ -106,6 +109,13 @@ prepareUserSwitching(const AppPoolOptions &options) {
 	boost::shared_array<char> grpBuf;
 	int ret;
 
+	if (options.appType.empty()) {
+		referenceFile = absolutizePath(options.appRoot);
+	} else {
+		referenceFile = absolutizePath(options.getStartupFile(wrapperRegistry),
+			absolutizePath(options.appRoot));
+	}
+
 	// _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));
@@ -155,9 +165,9 @@ prepareUserSwitching(const AppPoolOptions &options) {
 		}
 	} else {
 		struct stat buf;
-		if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
+		if (syscalls::lstat(referenceFile.c_str(), &buf) == -1) {
 			int e = errno;
-			throw SystemException("Cannot lstat(\"" + startupFile +
+			throw SystemException("Cannot lstat(\"" + referenceFile +
 				"\")", e);
 		}
 		ret = getpwuid_r(buf.st_uid, &pwd, pwdBuf.get(),
@@ -184,10 +194,10 @@ prepareUserSwitching(const AppPoolOptions &options) {
 		if (options.group == "!STARTUP_FILE!") {
 			struct stat buf;
 
-			if (syscalls::lstat(startupFile.c_str(), &buf) == -1) {
+			if (syscalls::lstat(referenceFile.c_str(), &buf) == -1) {
 				int e = errno;
 				throw SystemException("Cannot lstat(\"" +
-					startupFile + "\")", e);
+					referenceFile + "\")", e);
 			}
 
 			ret = getgrgid_r(buf.st_gid, &grp, grpBuf.get(), grpBufSize,