passenger 5.3.5 → 5.3.6

data/src/agent/Core/ApplicationPool/Socket.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,7 @@
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
 #include <MemoryKit/palloc.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Core/ApplicationPool/Common.h>
 
 namespace Passenger {

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2017 Phusion Holding B.V.
+ *  Copyright (c) 2016-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -29,8 +29,8 @@
 #include <boost/thread.hpp>
 #include <string>
 #include <cassert>
-#include <Utils/IOUtils.h>
-#include <Utils/BufferedIO.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/BufferedIO.h>
 #include <Core/ApplicationPool/AbstractSession.h>
 
 namespace Passenger {

data/src/agent/Core/Config.h

@@ -50,7 +50,7 @@
 #include <Shared/ApiAccountUtils.h>
 #include <Constants.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 
 namespace Passenger {
 namespace Core {
@@ -145,6 +145,7 @@ using namespace std;
  *   max_instances_per_app                                           unsigned integer   -          read_only
  *   max_pool_size                                                   unsigned integer   -          default(6)
  *   multi_app                                                       boolean            -          default(false),read_only
+ *   oom_score                                                       string             -          read_only
  *   passenger_root                                                  string             required   read_only
  *   pid_file                                                        string             -          read_only
  *   pool_idle_time                                                  unsigned integer   -          default(300)
@@ -156,7 +157,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")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_type                                        string             -          read_only
@@ -470,6 +471,7 @@ public:
 		add("config_manifest", OBJECT_TYPE, OPTIONAL | READ_ONLY);
 		add("pid_file", STRING_TYPE, OPTIONAL | READ_ONLY);
 		add("web_server_version", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("oom_score", STRING_TYPE, OPTIONAL | READ_ONLY);
 		addWithDynamicDefault("controller_threads", UINT_TYPE, OPTIONAL | READ_ONLY, getDefaultThreads);
 		add("max_pool_size", UINT_TYPE, OPTIONAL, DEFAULT_MAX_POOL_SIZE);
 		add("pool_idle_time", UINT_TYPE, OPTIONAL, Json::UInt(DEFAULT_POOL_IDLE_TIME));

data/src/agent/Core/Controller.h

@@ -62,7 +62,7 @@
 #include <cctype>
 
 #include <LoggingKit/LoggingKit.h>
-#include <MessageReadersWriters.h>
+#include <IOTools/MessageSerialization.h>
 #include <Constants.h>
 #include <ConfigKit/ConfigKit.h>
 #include <ServerKit/Errors.h>
@@ -74,9 +74,9 @@
 #include <WrapperRegistry/Registry.h>
 #include <StaticString.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/JsonUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <JsonTools/JsonUtils.h>
 #include <Utils/HttpConstants.h>
 #include <Utils/Timer.h>
 #include <Core/Controller/Config.h>

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

@@ -113,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.5")
+ *   server_software                                     string             -          default("Phusion_Passenger/5.3.6")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

data/src/agent/Core/Controller/SendRequest.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.
@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 #include <Core/Controller.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 /*************************************************************************
  *

data/src/agent/Core/Controller/TurboCaching.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.
@@ -35,7 +35,7 @@
 #include <ServerKit/Context.h>
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/ResponseCache.h>
 
 namespace Passenger {

data/src/agent/Core/CoreMain.cpp

@@ -82,7 +82,7 @@
 #include <ServerKit/Server.h>
 #include <ServerKit/AcceptLoadBalancer.h>
 #include <AppTypeDetector/Detector.h>
-#include <MessageReadersWriters.h>
+#include <IOTools/MessageSerialization.h>
 #include <FileDescriptor.h>
 #include <ResourceLocator.h>
 #include <BackgroundEventLoop.cpp>
@@ -91,7 +91,7 @@
 #include <Exceptions.h>
 #include <Utils.h>
 #include <Utils/Timer.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/MessageIO.h>
 #include <Core/OptionParser.h>
 #include <Core/Controller.h>
 #include <Core/ApiServer.h>

data/src/agent/Core/OptionParser.h

@@ -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.
@@ -34,7 +34,7 @@
 #include <JsonTools/Autocast.h>
 #include <Utils.h>
 #include <Utils/OptionParsing.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 #include <jsoncpp/json.h>
 

data/src/agent/Core/ResponseCache.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.
@@ -34,8 +34,8 @@
 #include <ServerKit/http_parser.h>
 #include <ServerKit/CookieUtils.h>
 #include <StaticString.h>
-#include <Utils/DateParsing.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/DateParsing.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/agent/Core/SecurityUpdateChecker.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.
@@ -33,7 +33,7 @@
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>
 
-#include <Crypto.h>
+#include <SecurityKit/Crypto.h>
 #include <ResourceLocator.h>
 #include <Exceptions.h>
 #include <StaticString.h>

data/src/agent/Core/SpawningKit/Config.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.
@@ -299,6 +299,7 @@ public:
 	 * to the given log file.
 	 *
 	 * @hinted_parseable
+	 * @non_confidential
 	 * @pass_during_handshake
 	 */
 	StaticString logFile;

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

@@ -344,7 +344,7 @@ Passenger::SpawningKit::Config::getNonConfidentialFieldsToPassToApp() const {
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();
 	doc["environment_variables"] = "<SECRET>";
-	doc["log_file"] = "<SECRET>";
+	doc["log_file"] = logFile.toString();
 	if (!config.apiKey.empty()) {
 		doc["api_key"] = "<SECRET>";
 	}

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

@@ -37,7 +37,7 @@
 #include <RandomGenerator.h>
 #include <Exceptions.h>
 #include <WrapperRegistry/Registry.h>
-#include <Utils/JsonUtils.h>
+#include <JsonTools/JsonUtils.h>
 #include <ConfigKit/Store.h>
 
 namespace Passenger {

data/src/agent/Core/SpawningKit/DirectSpawner.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,7 @@
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
 #include <LveLoggingDecorator.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 
 #include <limits.h>  // for PTHREAD_STACK_MIN
@@ -164,7 +164,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/DummySpawner.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,7 +31,7 @@
 #include <vector>
 
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Spawner.h>
 #include <Core/SpawningKit/Exceptions.h>
 
@@ -89,7 +89,7 @@ public:
 
 		result.initialize(*context, &config);
 		result.pid = number;
-		result.dummy = true;
+		result.type = Result::DUMMY;
 		result.gupid = "gupid-" + toString(number);
 		result.spawnEndTime = result.spawnStartTime;
 		result.spawnEndTimeMonotonic = result.spawnStartTimeMonotonic;

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

@@ -35,7 +35,7 @@
 #include <Constants.h>
 #include <StaticString.h>
 #include <FileTools/FileManip.h>
-#include <Utils/Template.h>
+#include <StrIntTools/Template.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Exceptions.h>
 

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

@@ -36,8 +36,8 @@
 #include <LoggingKit/LoggingKit.h>
 #include <DataStructures/StringKeyTable.h>
 #include <ProcessManagement/Spawn.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemMetricsCollector.h>
+#include <SystemTools/SystemMetricsCollector.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Journey.h>
 

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

@@ -48,7 +48,7 @@ private:
 	SpawnerPtr tryCreateSmartSpawner(const AppPoolOptions &options) {
 		string dir = context->resourceLocator->getHelperScriptsDir();
 		vector<string> preloaderCommand;
-		if (options.appType == "rack") {
+		if (options.appType == "ruby" || options.appType == "rack") {
 			preloaderCommand.push_back(options.ruby);
 			preloaderCommand.push_back(dir + "/rack-preloader.rb");
 		} else {

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

@@ -42,7 +42,7 @@
 #include <FileDescriptor.h>
 #include <StaticString.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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

@@ -52,8 +52,8 @@
 #include <FileTools/PathManip.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Exceptions.h>
 #include <Core/SpawningKit/Handshake/BackgroundIOCapturer.h>
@@ -297,6 +297,7 @@ private:
 		result.stdoutAndErrFd = stdoutAndErrFd;
 		result.spawnEndTime = SystemTime::getUsec();
 		result.spawnEndTimeMonotonic = SystemTime::getMonotonicUsec();
+		setResultType(result);
 
 		if (socketIsNowPingable) {
 			assert(config->genericApp || config->findFreePort);
@@ -1674,6 +1675,16 @@ private:
 		return result;
 	}
 
+	void setResultType(Result &result) const {
+		if (config->genericApp) {
+			result.type = Result::GENERIC;
+		} else if (config->startsUsingWrapper) {
+			result.type = Result::AUTO_SUPPORTED;
+		} else {
+			result.type = Result::KURIA;
+		}
+	}
+
 public:
 	struct DebugSupport {
 		virtual ~DebugSupport() { }

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

@@ -56,10 +56,10 @@
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
 #include <SystemTools/UserDatabase.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/Timer.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Core/SpawningKit/Context.h>
 #include <Core/SpawningKit/Config.h>
 #include <Core/SpawningKit/Journey.h>

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

@@ -36,7 +36,7 @@
 
 #include <Exceptions.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

data/src/agent/Core/SpawningKit/Journey.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.
@@ -36,10 +36,9 @@
 
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
-#include <Utils/SystemTime.h>
-#include <Utils/JsonUtils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
+#include <JsonTools/JsonUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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

@@ -43,7 +43,7 @@
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace SpawningKit {

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"));
 		}