passenger 6.0.0 → 6.0.5

data/dev/copy_boost_headers

@@ -71,6 +71,7 @@ ESSENTIALS = [
   "boost/foreach.hpp",
   "boost/none*",
   "boost/system/detail/error_code.ipp",
+  "boost/system/config.hpp",
   "boost/detail/reference_content.hpp",
   "boost/algorithm/string"
 ]

data/package.json

@@ -13,7 +13,7 @@
     "express": "^4.16.3",
     "extract-text-webpack-plugin": "^2.1.2",
     "jquery": "^3.2.1",
-    "mocha": "^1.15.1",
+    "mocha": "^6.0.2",
     "multer": "^1.3.0",
     "preact": "^8.1.0",
     "should": "^2.0.1",

data/passenger.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |s|
   s.summary = "A fast and robust web server and application server for Ruby, Python and Node.js"
   s.name = PhusionPassenger::PACKAGE_NAME
   s.version = PhusionPassenger::VERSION_STRING
-  s.rubyforge_project = "passenger"
   s.author = "Phusion - http://www.phusion.nl/"
   s.email = "software-signing@phusion.nl"
   s.require_paths = ["src/ruby_supportlib"]
   s.add_dependency 'rake', '>= 0.8.1'
   s.add_dependency 'rack'
+  s.add_dependency 'etc'
   s.files = Dir[*PhusionPassenger::Packaging::GLOB] -
     Dir[*PhusionPassenger::Packaging::EXCLUDE_GLOB]
   s.executables = PhusionPassenger::Packaging::USER_EXECUTABLES +

data/resources/templates/standalone/http.erb

@@ -27,11 +27,13 @@ passenger_user_switching off;
 <%= nginx_http_option(:python) %>
 <%= nginx_http_option(:nodejs) %>
 <%= nginx_http_option(:log_level) %>
+<%= nginx_http_option(:disable_log_prefix) %>
 <%= nginx_http_option(:max_pool_size) %>
 <%= nginx_http_option(:pool_idle_time) %>
 <%= nginx_http_option(:max_preloader_idle_time) %>
 <%= nginx_http_option(:turbocaching) %>
 <%= nginx_http_option(:instance_registry_dir) %>
+<%= nginx_http_option(:spawn_dir) %>
 <%= nginx_http_option(:disable_security_update_check) %>
 <%= nginx_http_option(:security_update_check_proxy) %>
 <%= nginx_http_option(:disable_anonymous_telemetry) %>

data/resources/templates/standalone/server.erb

@@ -48,6 +48,7 @@ passenger_enabled on;
 <%= nginx_option(app, :restart_dir) %>
 <%= nginx_option(app, :sticky_sessions) %>
 <%= nginx_option(app, :sticky_sessions_cookie_name) %>
+<%= nginx_option(app, :sticky_sessions_cookie_attributes) %>
 <%= nginx_option(app, :vary_turbocache_by_cookie) %>
 <%= nginx_option(app, :meteor_app_settings) %>
 <%= nginx_option(app, :load_shell_envvars) %>

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

@@ -305,7 +305,7 @@ Group::detachedProcessesCheckerMain(GroupPtr self) {
 	while (true) {
 		assert(detachedProcessesCheckerActive);
 
-		if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
+		if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
 			UPDATE_TRACE_POINT();
 			P_DEBUG("Stopping detached processes checker");
 			detachedProcessesCheckerActive = false;

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

@@ -260,6 +260,7 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 	result["abort_websockets_on_process_shutdown"] = VAL(options.abortWebsocketsOnProcessShutdown);
 	result["force_max_concurrent_requests_per_process"] = VAL(options.forceMaxConcurrentRequestsPerProcess, -1);
 	result["restart_dir"] = NON_EMPTY_SVAL(options.restartDir);
+	result["sticky_sessions_cookie_attributes"] = SVAL(options.stickySessionsCookieAttributes, DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
 
 	if (!options.environmentVariables.empty()) {
 		DynamicBuffer envvarsData(options.environmentVariables.size() * 3 / 4);

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

@@ -115,6 +115,8 @@ private:
 		result.push_back(&options.hostName);
 		result.push_back(&options.uri);
 
+		result.push_back(&options.stickySessionsCookieAttributes);
+
 		return result;
 	}
 
@@ -353,6 +355,12 @@ public:
 	 */
 	bool abortWebsocketsOnProcessShutdown;
 
+	/**
+	 * The attributes to use for the sticky session cookie.
+	 * Values should validate against the regex: ([\w]+(=[\w]+)?; )*
+	 */
+	StaticString stickySessionsCookieAttributes;
+
 	/*-----------------*/
 
 
@@ -453,6 +461,7 @@ public:
 		  maxOutOfBandWorkInstances(1),
 		  maxRequestQueueSize(DEFAULT_MAX_REQUEST_QUEUE_SIZE),
 		  abortWebsocketsOnProcessShutdown(true),
+		  stickySessionsCookieAttributes(DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES, sizeof(DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES) - 1),
 
 		  stickySessionId(0),
 		  statThrottleRate(DEFAULT_STAT_THROTTLE_RATE),
@@ -582,6 +591,7 @@ public:
 			appendKeyValue3(vec, "max_processes",       maxProcesses);
 			appendKeyValue2(vec, "max_preloader_idle_time", maxPreloaderIdleTime);
 			appendKeyValue3(vec, "max_out_of_band_work_instances", maxOutOfBandWorkInstances);
+			appendKeyValue (vec, "sticky_sessions_cookie_attributes", stickySessionsCookieAttributes);
 		}
 
 		/*********************************/

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

@@ -55,7 +55,7 @@ Pool::garbageCollect(PoolPtr self) {
 		self->garbageCollectionCond.timed_wait(lock,
 			posix_time::seconds(5));
 	}
-	while (!this_thread::interruption_requested()) {
+	while (!boost::this_thread::interruption_requested()) {
 		try {
 			UPDATE_TRACE_POINT();
 			unsigned long long sleepTime = self->realGarbageCollect();

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

@@ -202,7 +202,7 @@ Pool::toXml(const ToXmlOptions &options, bool lock) const {
 		throw SecurityException("Operation unauthorized");
 	}
 
-	result << "<?xml version=\"1.0\" encoding=\"iso8859-1\" ?>\n";
+	result << "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n";
 	result << "<info version=\"3\">";
 
 	result << "<passenger_version>" << PASSENGER_VERSION << "</passenger_version>";

data/src/agent/Core/Config.h

@@ -135,9 +135,14 @@ using namespace std;
  *   default_sticky_sessions                                         boolean            -          default(false)
  *   default_sticky_sessions_cookie_name                             string             -          default("_passenger_route")
  *   default_user                                                    string             -          default("nobody")
+ *   disable_log_prefix                                              boolean            -          default(false)
  *   file_descriptor_log_target                                      any                -          -
  *   file_descriptor_ulimit                                          unsigned integer   -          default(0),read_only
  *   graceful_exit                                                   boolean            -          default(true)
+ *   hook_attached_process                                           string             -          read_only
+ *   hook_detached_process                                           string             -          read_only
+ *   hook_queue_full_error                                           string             -          read_only
+ *   hook_spawn_failed                                               string             -          read_only
  *   instance_dir                                                    string             -          read_only
  *   integration_mode                                                string             -          default("standalone")
  *   log_level                                                       string             -          default("notice")
@@ -157,12 +162,13 @@ 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.7")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.5")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only
  *   single_app_mode_app_type                                        string             -          read_only
  *   single_app_mode_startup_file                                    string             -          read_only
+ *   spawn_dir                                                       string             required   read_only
  *   standalone_engine                                               string             -          default
  *   stat_throttle_rate                                              unsigned integer   -          default(10)
  *   telemetry_collector_ca_certificate_path                         string             -          -
@@ -475,6 +481,7 @@ public:
 		overrideWithDynamicDefault("default_server_port", UINT_TYPE, OPTIONAL, getDefaultServerPort);
 
 		add("passenger_root", STRING_TYPE, REQUIRED | READ_ONLY);
+		add("spawn_dir", STRING_TYPE, REQUIRED | READ_ONLY);
 		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);
@@ -491,6 +498,11 @@ public:
 		add("controller_cpu_affine", BOOL_TYPE, OPTIONAL | READ_ONLY, false);
 		add("file_descriptor_ulimit", UINT_TYPE, OPTIONAL | READ_ONLY, 0);
 
+		add("hook_attached_process", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("hook_detached_process", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("hook_spawn_failed", STRING_TYPE, OPTIONAL | READ_ONLY);
+		add("hook_queue_full_error", STRING_TYPE, OPTIONAL | READ_ONLY);
+
 		addValidator(validateMultiAppMode);
 		addValidator(boost::bind(validateSingleAppMode, boost::placeholders::_1,
 			wrapperRegistry, boost::placeholders::_2));

data/src/agent/Core/Controller.h

@@ -123,6 +123,7 @@ private:
 	HashedStaticString PASSENGER_SHOW_VERSION_IN_HEADER;
 	HashedStaticString PASSENGER_STICKY_SESSIONS;
 	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_NAME;
+	HashedStaticString PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES;
 	HashedStaticString PASSENGER_REQUEST_OOB_WORK;
 	HashedStaticString REMOTE_ADDR;
 	HashedStaticString REMOTE_PORT;

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.7")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.5")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -154,6 +154,7 @@ private:
 		add("default_server_port", UINT_TYPE, REQUIRED);
 		add("default_sticky_sessions", BOOL_TYPE, OPTIONAL, false);
 		add("default_sticky_sessions_cookie_name", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_NAME);
+		add("default_sticky_sessions_cookie_attributes", STRING_TYPE, OPTIONAL, DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES);
 		add("server_software", STRING_TYPE, OPTIONAL, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 		add("vary_turbocache_by_cookie", STRING_TYPE, OPTIONAL);
 
@@ -419,6 +420,7 @@ public:
 	StaticString defaultServerPort;
 	StaticString serverSoftware;
 	StaticString defaultStickySessionsCookieName;
+	StaticString defaultStickySessionsCookieAttributes;
 	StaticString defaultVaryTurbocacheByCookie;
 
 	StaticString defaultFriendlyErrorPages;
@@ -451,6 +453,7 @@ public:
 		  defaultServerPort(psg_pstrdup(pool, config["default_server_port"].asString())),
 		  serverSoftware(psg_pstrdup(pool, config["server_software"].asString())),
 		  defaultStickySessionsCookieName(psg_pstrdup(pool, config["default_sticky_sessions_cookie_name"].asString())),
+		  defaultStickySessionsCookieAttributes(psg_pstrdup(pool, config["default_sticky_sessions_cookie_attributes"].asString())),
 		  defaultVaryTurbocacheByCookie(psg_pstrdup(pool, config["vary_turbocache_by_cookie"].asString())),
 
 		  defaultFriendlyErrorPages(psg_pstrdup(pool, config["default_friendly_error_pages"].asString())),

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

@@ -768,6 +768,19 @@ Controller::constructHeaderBuffersForResponse(Request *req, struct iovec *buffer
 		dataSize += baseURI.size();
 		INC_BUFFER_ITER(i);
 
+
+		StaticString stickyAttributes = req->options.stickySessionsCookieAttributes;
+		if (stickyAttributes.size() > 0) {
+			PUSH_STATIC_BUFFER("; ");
+			if (buffers != NULL) {
+				BEGIN_PUSH_NEXT_BUFFER();
+				buffers[i].iov_base = (void *) stickyAttributes.data();
+				buffers[i].iov_len  = stickyAttributes.size();
+			}
+			dataSize += stickyAttributes.size();
+			INC_BUFFER_ITER(i);
+		}
+
 		PUSH_STATIC_BUFFER("\r\n");
 	}
 

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

@@ -153,6 +153,7 @@ Controller::initializePoolOptions(Client *client, Request *req, RequestAnalysis
 
 			if (options != NULL) {
 				req->options = **options;
+				fillPoolOption(req, req->options.baseURI, "!~SCRIPT_NAME");
 			} else {
 				createNewPoolOptions(client, req, hAppGroupName);
 			}
@@ -202,6 +203,7 @@ Controller::fillPoolOptionsFromConfigCaches(Options &options,
 	options.loadShellEnvvars = requestConfig->defaultLoadShellEnvvars;
 	options.statThrottleRate = mainConfig.statThrottleRate;
 	options.maxRequests = requestConfig->defaultMaxRequests;
+	options.stickySessionsCookieAttributes = requestConfig->defaultStickySessionsCookieAttributes;
 
 	/******************************/
 }
@@ -377,6 +379,7 @@ Controller::createNewPoolOptions(Client *client, Request *req,
 	fillPoolOption(req, options.fileDescriptorUlimit, "!~PASSENGER_APP_FILE_DESCRIPTOR_ULIMIT");
 	fillPoolOption(req, options.raiseInternalError, "!~PASSENGER_RAISE_INTERNAL_ERROR");
 	fillPoolOption(req, options.lveMinUid, "!~PASSENGER_LVE_MIN_UID");
+	fillPoolOption(req, options.stickySessionsCookieAttributes, "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES");
 
 	// maxProcesses is configured per-application by the (Enterprise) maxInstances option (and thus passed
 	// via request headers). In OSS the max processes can also be configured, but on a global level

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

@@ -70,6 +70,7 @@ Controller::preinitialize() {
 	PASSENGER_SHOW_VERSION_IN_HEADER = "!~PASSENGER_SHOW_VERSION_IN_HEADER";
 	PASSENGER_STICKY_SESSIONS = "!~PASSENGER_STICKY_SESSIONS";
 	PASSENGER_STICKY_SESSIONS_COOKIE_NAME = "!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME";
+	PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES = "!~PASSENGER_STICKY_SESSIONS_COOKIE_ATTRIBUTES";
 	PASSENGER_REQUEST_OOB_WORK = "!~Request-OOB-Work";
 	REMOTE_ADDR = "!~REMOTE_ADDR";
 	REMOTE_PORT = "!~REMOTE_PORT";

data/src/agent/Core/CoreMain.cpp

@@ -714,6 +714,7 @@ initializeNonPrivilegedWorkingObjects() {
 	wo->spawningKitContext->randomGenerator = wo->randomGenerator;
 	wo->spawningKitContext->integrationMode = coreConfig->get("integration_mode").asString();
 	wo->spawningKitContext->instanceDir = coreConfig->get("instance_dir").asString();
+	wo->spawningKitContext->spawnDir = coreConfig->get("spawn_dir").asString();
 	if (!wo->spawningKitContext->instanceDir.empty()) {
 		wo->spawningKitContext->instanceDir = absolutizePath(
 			wo->spawningKitContext->instanceDir);
@@ -912,7 +913,7 @@ initializeAdminPanelConnector() {
 	TRACE_POINT();
 	WorkingObjects &wo = *workingObjects;
 
-	if (coreConfig->get("admin_panel_url").isNull()) {
+	if (coreConfig->get("admin_panel_url").empty()) {
 		return;
 	}
 

data/src/agent/Core/OptionParser.h

@@ -173,6 +173,9 @@ coreUsage() {
 	printf("      --sticky-sessions-cookie-name NAME\n");
 	printf("                            Cookie name to use for sticky sessions.\n");
 	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_NAME "\n");
+	printf("      --sticky-sessions-cookie-attributes 'NAME1=VALUE1; NAME2'\n");
+	printf("                            The attributes to use for the sticky session cookie.\n");
+	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "\n");
 	printf("      --vary-turbocache-by-cookie NAME\n");
 	printf("                            Vary the turbocache by the cookie of the given name\n");
 	printf("      --disable-turbocaching\n");

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

@@ -138,6 +138,7 @@ public:
 	RandomGeneratorPtr randomGenerator;
 	string integrationMode;
 	string instanceDir;
+	string spawnDir;
 	DebugSupport *debugSupport;
 	//UnionStation::ContextPtr unionStationContext;
 

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

@@ -202,6 +202,7 @@ private:
 				socketIsNowPingable = true;
 				finishState = FINISH_SUCCESS;
 				wakeupEventLoop();
+				break;
 			} else {
 				syscalls::usleep(50000);
 			}

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

@@ -123,7 +123,7 @@ private:
 
 	void createWorkDir() {
 		TRACE_POINT();
-		session.workDir.reset(new HandshakeWorkDir());
+		session.workDir.reset(new HandshakeWorkDir(context->spawnDir));
 
 		session.envDumpDir = session.workDir->getPath() + "/envdump";
 		makeDirTree(session.envDumpDir,

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

@@ -54,12 +54,15 @@ private:
 	string path;
 
 public:
-	HandshakeWorkDir() {
+	HandshakeWorkDir(const std::string& spawn_dir) {
 		char buf[PATH_MAX + 1];
 		char *pos = buf;
 		const char *end = buf + PATH_MAX;
 
-		pos = appendData(pos, end, getSystemTempDir());
+		if (spawn_dir.empty())
+			throw RuntimeException("spawn_dir is not set");
+		pos = appendData(pos, end, spawn_dir.c_str());
+
 		pos = appendData(pos, end, "/passenger.spawn.XXXXXXXXXX");
 		*pos = '\0';
 

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -415,9 +415,11 @@ doSleep(int sec) {
 
 static void
 maybeDeletePidFile() {
+	up_privilege();
 	if (pidFile != NULL) {
 		unlink(pidFile);
 	}
+	down_privilege();
 }
 
 static void

data/src/agent/Watchdog/Config.h

@@ -122,12 +122,17 @@ using namespace std;
  *   default_sticky_sessions                                                  boolean            -          default(false)
  *   default_sticky_sessions_cookie_name                                      string             -          default("_passenger_route")
  *   default_user                                                             string             -          default("nobody")
+ *   disable_log_prefix                                                       boolean            -          default(false)
  *   file_descriptor_log_target                                               any                -          -
  *   graceful_exit                                                            boolean            -          default(true)
  *   hook_after_watchdog_initialization                                       string             -          -
  *   hook_after_watchdog_shutdown                                             string             -          -
+ *   hook_attached_process                                                    string             -          read_only
  *   hook_before_watchdog_initialization                                      string             -          -
  *   hook_before_watchdog_shutdown                                            string             -          -
+ *   hook_detached_process                                                    string             -          read_only
+ *   hook_queue_full_error                                                    string             -          read_only
+ *   hook_spawn_failed                                                        string             -          read_only
  *   instance_registry_dir                                                    string             -          default,read_only
  *   integration_mode                                                         string             -          default("standalone")
  *   log_level                                                                string             -          default("notice")
@@ -146,13 +151,14 @@ 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.7")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.5")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
  *   single_app_mode_app_start_command                                        string             -          read_only
  *   single_app_mode_app_type                                                 string             -          read_only
  *   single_app_mode_startup_file                                             string             -          read_only
+ *   spawn_dir                                                                string             -          default,read_only
  *   standalone_engine                                                        string             -          default
  *   startup_report_file                                                      string             -          -
  *   stat_throttle_rate                                                       unsigned integer   -          default(10)
@@ -246,6 +252,10 @@ private:
 		return getSystemTempDir();
 	}
 
+	static Json::Value getDefaultSpawnDir(const ConfigKit::Store &store) {
+		return getSystemTempDir();
+	}
+
 	static void validateAddresses(const ConfigKit::Store &config, vector<ConfigKit::Error> &errors) {
 		typedef ConfigKit::Error Error;
 
@@ -258,6 +268,7 @@ private:
 	static Json::Value normalizePaths(const Json::Value &effectiveValues) {
 		Json::Value updates;
 		updates["instance_registry_dir"] = absolutizePath(effectiveValues["instance_registry_dir"].asString());
+		updates["spawn_dir"] = absolutizePath(effectiveValues["spawn_dir"].asString());
 		if (!effectiveValues["watchdog_pid_file"].isNull()) {
 			updates["watchdog_pid_file"] = absolutizePath(effectiveValues["watchdog_pid_file"].asString());
 		}
@@ -334,6 +345,8 @@ public:
 			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultUser);
 		addWithDynamicDefault("instance_registry_dir", STRING_TYPE,
 			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultInstanceRegistryDir);
+		addWithDynamicDefault("spawn_dir", STRING_TYPE,
+			OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultSpawnDir);
 
 		add("hook_before_watchdog_initialization", STRING_TYPE, OPTIONAL);
 		add("hook_after_watchdog_initialization", STRING_TYPE, OPTIONAL);

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -654,6 +654,9 @@ usage() {
 	printf("      --instance-registry-dir  Directory to register instance into.\n");
 	printf("                               Default: %s\n", getSystemTempDir());
 	printf("\n");
+	printf("      --spawn-dir              Directory for spawn handshakes.\n");
+	printf("                               Default: %s\n", getSystemTempDir());
+	printf("\n");
 	printf("      --no-user-switching     Disables user switching support [A]\n");
 	printf("      --default-user NAME     Default user to start apps as, when user\n");
 	printf("                              switching is enabled. Default: " DEFAULT_WEB_APP_USER "\n");
@@ -774,6 +777,9 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--instance-registry-dir")) {
 			updates["instance_registry_dir"] = argv[i + 1];
 			i += 2;
+		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--spawn-dir")) {
+			updates["spawn_dir"] = argv[i + 1];
+			i += 2;
 		} else if (p.isFlag(argv[i], '\0', "--no-user-switching")) {
 			updates["user_switching"] = false;
 			i++;
@@ -1111,6 +1117,7 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 
 	// check if path is safe
 	warnIfInstanceDirVulnerable(watchdogConfig->get("instance_registry_dir").asString());
+	warnIfInstanceDirVulnerable(watchdogConfig->get("spawn_dir").asString());
 
 	wo->instanceDir = boost::make_shared<InstanceDirectory>(instanceOptions,
 		watchdogConfig->get("instance_registry_dir").asString());