passenger 5.3.5 → 5.3.6

data/src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h

@@ -60,7 +60,7 @@ Passenger::SpawningKit::Result::validate_autoGeneratedCode(vector<StaticString>
 	/*
 	 * Excluded:
 	 *
-	 * dummy
+	 * type
 	 * codeRevision
 	 * stdinFd
 	 * stdoutAndErrFd

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,7 +374,7 @@ private:
 			dup2(stdinCopy, 0);
 			dup2(stdoutAndErrCopy, 1);
 			dup2(stdoutAndErrCopy, 2);
-			closeAllFileDescriptors(2, true);
+			closeAllFileDescriptors(2);
 
 			execlp(agentFilename.c_str(),
 				agentFilename.c_str(),

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.
@@ -32,7 +32,7 @@
 #include <modp_b64.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>

data/src/agent/Core/TelemetryCollector.h

@@ -46,7 +46,7 @@
 #include <LoggingKit/LoggingKit.h>
 #include <ConfigKit/ConfigKit.h>
 #include <Utils/Curl.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace Core {
@@ -57,15 +57,21 @@ using namespace std;
 class TelemetryCollector {
 public:
 	/*
-	 * BEGIN ConfigKit schema: Passenger::TelemetryCollector::Schema
+	 * BEGIN ConfigKit schema: Passenger::Core::TelemetryCollector::Schema
 	 * (do not edit: following text is automatically generated
 	 * by 'rake configkit_schemas_inline_comments')
 	 *
-	 * (unknown: Passenger::TelemetryCollector::Schema not in dev/configkit-schemas/index.json
-	 *  Please run:
-	 *    touch src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder
-	 *    rake configkit_schemas_inline_comments
-	 * )
+	 *   ca_certificate_path   string             -   -
+	 *   debug_curl            boolean            -   default(false)
+	 *   disabled              boolean            -   default(false)
+	 *   final_run_timeout     unsigned integer   -   default(5)
+	 *   first_interval        unsigned integer   -   default(7200)
+	 *   interval              unsigned integer   -   default(21600)
+	 *   interval_jitter       unsigned integer   -   default(7200)
+	 *   proxy_url             string             -   -
+	 *   timeout               unsigned integer   -   default(180)
+	 *   url                   string             -   default("https://anontelemetry.phusionpassenger.com/v1/collect.json")
+	 *   verify_server         boolean            -   default(true)
 	 *
 	 * END
 	 */

data/src/agent/ExecHelper/ExecHelperMain.cpp

@@ -40,7 +40,7 @@
 #include <Constants.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils/OptionParsing.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ExecHelper {

data/src/agent/README.md

@@ -12,7 +12,7 @@ The most important parts are:
 ## Minor parts
 
  * SpawnEnvSetupper is a tool used internally by `Core/SpawningKit/` to spawn application processes. See the README in that directory for more information.
- * SystemMetrics is a tool that shows system metrics such as CPU and memory usage. The main functionality is implemented in src/cxxUtils/SystemMetricsCollector.h. This tool is mainly useful for developing and debugging SystemMetricsCollector.h.
+ * SystemMetrics is a tool that shows system metrics such as CPU and memory usage. The main functionality is implemented in src/cxx/SystemTools/SystemMetricsCollector.h. This tool is mainly useful for developing and debugging SystemMetricsCollector.h.
  * TempDirToucher is a tool used internally by Passenger Standalone to keep a temporary directory's timestamp up-to-date so that it doesn't get removed by /tmp cleaner daemons.
 
 ## Shared code

data/src/agent/Shared/ApiAccountUtils.h

@@ -38,7 +38,7 @@
 #include <StaticString.h>
 #include <FileTools/PathManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ApiAccountUtils { // Avoid conflict with classes of the same name in ApiServerUtils.h, until we've migrated everything

data/src/agent/Shared/ApiServerUtils.h

@@ -72,9 +72,9 @@
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/BufferedIO.h>
-#include <Utils/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/BufferedIO.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/VariantMap.h>
 #include <Shared/ApplicationPoolApiKey.h>
 

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015-2017 Phusion Holding B.V.
+ *  Copyright (c) 2015-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -31,7 +31,7 @@
 #include <cstring>
 #include <Exceptions.h>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ApplicationPool2 {

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -50,9 +50,9 @@
 #include <ResourceLocator.h>
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
+#include <SystemTools/SystemTime.h>
 
 
 namespace Passenger {

data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -64,7 +64,7 @@
 #include <FileTools/PathManip.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Handshake/WorkDir.h>
 #include <Core/SpawningKit/Exceptions.h>
 

data/src/agent/SystemMetrics/SystemMetricsMain.cpp

@@ -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.
@@ -28,9 +28,10 @@
 #include <unistd.h>
 #include <cstdio>
 #include <cstring>
+
+#include <SystemTools/SystemMetricsCollector.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemMetricsCollector.h>
+#include <StrIntTools/StrIntUtils.h>
 
 using namespace std;
 using namespace Passenger;

data/src/agent/Watchdog/ApiServer.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.
@@ -40,8 +40,8 @@
 #include <StaticString.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Constants.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
 
 namespace Passenger {
 namespace Watchdog {

data/src/agent/Watchdog/Config.h

@@ -33,7 +33,7 @@
 #include <Watchdog/ApiServer.h>
 #include <Shared/ApiAccountUtils.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace Watchdog {
@@ -146,7 +146,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.5")
+ *   server_software                                                          string             -          default("Phusion_Passenger/5.3.6")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
@@ -296,6 +296,7 @@ public:
 		core.translator.finalize();
 		addSubSchema(core.schema, core.translator);
 		erase("instance_dir");
+		erase("oom_score");
 		erase("watchdog_fd_passing_password");
 		/***********/
 		/***********/

data/src/agent/Watchdog/CoreWatcher.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -25,7 +25,7 @@
  */
 
 #include <Shared/Fundamentals/Utils.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/MessageIO.h>
 
 class CoreWatcher: public AgentWatcher {
 protected:

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -73,18 +73,19 @@
 #include <FileDescriptor.h>
 #include <FileTools/PathSecurityCheck.h>
 #include <SystemTools/UserDatabase.h>
+#include <SystemTools/ContainerHelpers.h>
 #include <RandomGenerator.h>
 #include <BackgroundEventLoop.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Exceptions.h>
 #include <StaticString.h>
 #include <Hooks.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/MessageIO.h>
 #include <Utils.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/OptionParsing.h>
 #include <Utils/VariantMap.h>
 
@@ -180,8 +181,22 @@ static void cleanup(const WorkingObjectsPtr &wo);
 /***** Functions *****/
 
 #if !BOOST_OS_MACOS
+
+struct WatchdogOomAdjustResult {
+	struct Message {
+		LoggingKit::Level level;
+		string text;
+	};
+
+	string oldScore;
+	// LoggingKit has not been initialized yet when setOomScoreNeverKill()
+	// is called, so we store the messages here and print them after
+	// LoggingKit initialization.
+	vector<Message> messages;
+};
+
 static FILE *
-openOomAdjFileGetType(const char *mode, OomFileType &type) {
+openOomAdjFileGetType(const char *mode, OomFileType &type, string &path) {
 	FILE *f = fopen("/proc/self/oom_score_adj", mode);
 	if (f == NULL) {
 		f = fopen("/proc/self/oom_adj", mode);
@@ -189,40 +204,46 @@ openOomAdjFileGetType(const char *mode, OomFileType &type) {
 			return NULL;
 		} else {
 			type = OOM_ADJ;
+			path = "/proc/self/oom_adj";
 			return f;
 		}
 	} else {
 		type = OOM_SCORE_ADJ;
+		path = "/proc/self/oom_score_adj";
 		return f;
 	}
 }
 
-static FILE *
-openOomAdjFileForcedType(const char *mode, OomFileType &type) {
-	if (type == OOM_SCORE_ADJ) {
-		return fopen("/proc/self/oom_score_adj", mode);
-	} else {
-		assert(type == OOM_ADJ);
-		return fopen("/proc/self/oom_adj", mode);
-	}
-}
-
 /**
  * Set the current process's OOM score to "never kill".
  */
-static string
+static WatchdogOomAdjustResult
 setOomScoreNeverKill() {
-	string oldScore;
+	WatchdogOomAdjustResult result;
 	FILE *f;
+	string path;
 	OomFileType type;
+	int e;
+
+	if (geteuid() != 0) {
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::DEBUG;
+		msg.text = "Not adjusting Watchdog's OOM score because not running with root privileges";
+		result.messages.push_back(msg);
+		return result;
+	}
 
-	f = openOomAdjFileGetType("r", type);
+	f = openOomAdjFileGetType("r", type, path);
 	if (f == NULL) {
-		return "";
+		e = errno;
+		P_ERROR("Error adjusting Watchdog's OOM score: error opening both"
+			" /proc/self/oom_score_adj and /proc/self/oom_adj for reading: " <<
+			strerror(e) << " (errno=" << e << ")");
+		return result;
 	}
 	// mark if this is a legacy score so we won't try to write it as OOM_SCORE_ADJ
 	if (type == OOM_ADJ) {
-		oldScore.append("l");
+		result.oldScore.append("l");
 	}
 	char buf[1024];
 	size_t bytesRead;
@@ -231,17 +252,27 @@ setOomScoreNeverKill() {
 		if (bytesRead == 0 && feof(f)) {
 			break;
 		} else if (bytesRead == 0 && ferror(f)) {
+			P_ERROR("Error adjusting Watchdog's OOM score: error reading " << path);
 			fclose(f);
-			return "";
+			result.oldScore.clear();
+			return result;
 		} else {
-			oldScore.append(buf, bytesRead);
+			result.oldScore.append(buf, bytesRead);
 		}
 	}
 	fclose(f);
 
-	f = openOomAdjFileForcedType("w", type);
+	f = fopen(path.c_str(), "w");
 	if (f == NULL) {
-		return "";
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::ERROR;
+		msg.text = "Error adjusting Watchdog's OOM score: error opening "
+			+ path + " for writing: " + strerror(e) + " (errno="
+			+ toString(e) + ")";
+		result.messages.push_back(msg);
+		result.oldScore.clear();
+		return result;
 	}
 	if (type == OOM_SCORE_ADJ) {
 		fprintf(f, "-1000\n");
@@ -249,10 +280,44 @@ setOomScoreNeverKill() {
 		assert(type == OOM_ADJ);
 		fprintf(f, "-17\n");
 	}
-	fclose(f);
 
-	return oldScore;
+	e = fflush(f);
+	if (e != 0) {
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		if (autoDetectInContainer()) {
+			msg.level = LoggingKit::INFO;
+			msg.text = "Running in container, so couldn't adjust Watchdog's"
+				" OOM score through " + path;
+		} else {
+			msg.level = LoggingKit::ERROR;
+			msg.text = "Error adjusting Watchdog's OOM score: error writing to "
+				+ path + ": " + strerror(e) + " (errno=" + toString(e) + ")";
+		}
+		result.messages.push_back(msg);
+	}
+	e = fclose(f);
+	if (e == EOF) {
+		e = errno;
+		WatchdogOomAdjustResult::Message msg;
+		msg.level = LoggingKit::ERROR;
+		msg.text = "Error adjusting Watchdog's OOM score: error closing "
+			+ path + ": " + strerror(e) + " (errno=" + toString(e) + ")";
+		result.messages.push_back(msg);
+	}
+
+	return result;
+}
+
+static void
+printOomAdjustResultMessages(const WatchdogOomAdjustResult &result) {
+	vector<WatchdogOomAdjustResult::Message>::const_iterator it;
+
+	for (it = result.messages.begin(); it != result.messages.end(); it++) {
+		P_LOG(LoggingKit::context, it->level, __FILE__, __LINE__, it->text);
+	}
 }
+
 #endif
 
 static void
@@ -798,7 +863,7 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	 * so we need to restore it after each fork().
 	 */
 #if !BOOST_OS_MACOS
-	string oldOomScore = setOomScoreNeverKill();
+	WatchdogOomAdjustResult oomAdjustResult = setOomScoreNeverKill();
 #endif
 
 	watchdogWrapperRegistry = new WrapperRegistry::Registry();
@@ -815,7 +880,8 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	wo = boost::make_shared<WorkingObjects>();
 	workingObjects = wo.get();
 #if !BOOST_OS_MACOS
-	wo->extraConfigToPassToSubAgents["oom_score"] = oldOomScore;
+	printOomAdjustResultMessages(oomAdjustResult);
+	wo->extraConfigToPassToSubAgents["oom_score"] = oomAdjustResult.oldScore;
 #endif
 }