passenger 6.0.4 → 6.0.9

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/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/Config.h

@@ -251,6 +251,17 @@ public:
 	 */
 	StaticString spawnMethod;
 
+	/**
+	 * The address that Passenger binds to in order to allow sending HTTP
+	 * requests to individual application processes.
+	 *
+	 * @hinted_parseable
+	 * @require_non_empty
+	 * @pass_during_handshake
+	 * @non_confidential
+	 */
+	StaticString bindAddress;
+
 	/**
 	 * The base URI on which the app runs. If the app is running on the
 	 * root URI, then this value must be "/".

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

@@ -51,6 +51,7 @@ Passenger::SpawningKit::Config::internStrings() {
 	totalSize += appType.size() + 1;
 	totalSize += appEnv.size() + 1;
 	totalSize += spawnMethod.size() + 1;
+	totalSize += bindAddress.size() + 1;
 	totalSize += baseURI.size() + 1;
 	totalSize += user.size() + 1;
 	totalSize += group.size() + 1;
@@ -90,6 +91,8 @@ Passenger::SpawningKit::Config::internStrings() {
 	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, spawnMethod);
 	pos = appendData(pos, end, "\0", 1);
+	pos = appendData(pos, end, bindAddress);
+	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, baseURI);
 	pos = appendData(pos, end, "\0", 1);
 	pos = appendData(pos, end, user);
@@ -147,6 +150,10 @@ Passenger::SpawningKit::Config::internStrings() {
 	spawnMethod = StaticString(pos, tmpSize);
 	pos += tmpSize + 1;
 
+	tmpSize = bindAddress.size();
+	bindAddress = StaticString(pos, tmpSize);
+	pos += tmpSize + 1;
+
 	tmpSize = baseURI.size();
 	baseURI = StaticString(pos, tmpSize);
 	pos += tmpSize + 1;
@@ -221,6 +228,10 @@ Passenger::SpawningKit::Config::validate(vector<StaticString> &errors) const {
 		ok = false;
 		errors.push_back(P_STATIC_STRING("spawn_method may not be empty"));
 	}
+	if (OXT_UNLIKELY(bindAddress.empty())) {
+		ok = false;
+		errors.push_back(P_STATIC_STRING("bind_address may not be empty"));
+	}
 	if (OXT_UNLIKELY(baseURI.empty())) {
 		ok = false;
 		errors.push_back(P_STATIC_STRING("base_uri may not be empty"));
@@ -287,6 +298,7 @@ Passenger::SpawningKit::Config::getConfidentialFieldsToPassToApp() const {
 	doc["app_type"] = appType.toString();
 	doc["app_env"] = appEnv.toString();
 	doc["spawn_method"] = spawnMethod.toString();
+	doc["bind_address"] = bindAddress.toString();
 	doc["base_uri"] = baseURI.toString();
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();
@@ -340,6 +352,7 @@ Passenger::SpawningKit::Config::getNonConfidentialFieldsToPassToApp() const {
 	doc["app_type"] = appType.toString();
 	doc["app_env"] = appEnv.toString();
 	doc["spawn_method"] = spawnMethod.toString();
+	doc["bind_address"] = bindAddress.toString();
 	doc["base_uri"] = baseURI.toString();
 	doc["user"] = user.toString();
 	doc["group"] = group.toString();

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

@@ -27,7 +27,7 @@
 #define _PASSENGER_SPAWNING_KIT_BACKGROUND_IO_CAPTURER_H_
 
 #include <boost/thread.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/foreach.hpp>
 #include <oxt/backtrace.hpp>

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

@@ -28,7 +28,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>

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

@@ -30,7 +30,7 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/thread.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/foreach.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>

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

@@ -28,7 +28,7 @@
 
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <string>
 #include <vector>

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

@@ -117,6 +117,7 @@ protected:
 		config->loadShellEnvvars = options.loadShellEnvvars;
 		config->startupFile = options.getStartupFile(*context->wrapperRegistry);
 		config->appType = options.appType;
+		config->processTitle = options.getProcessTitle(*context->wrapperRegistry);
 		config->appEnv = options.environment;
 		config->baseURI = options.baseURI;
 		config->environmentVariables = decodeEnvironmentVariables(
@@ -134,6 +135,7 @@ protected:
 		config->group = info.groupname;
 
 		extraArgs["spawn_method"] = options.spawnMethod.toString();
+		config->bindAddress = options.bindAddress;
 
 		/******************/
 		/******************/

data/src/agent/Core/TelemetryCollector.h

@@ -34,7 +34,7 @@
 #include <cassert>
 
 #include <boost/cstdint.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>
 

data/src/agent/Shared/ApiServerUtils.h

@@ -50,7 +50,7 @@
  */
 
 #include <boost/foreach.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/regex.hpp>
 #include <oxt/macros.hpp>
 #include <oxt/backtrace.hpp>

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -102,6 +102,8 @@ public:
 		memcpy(value, other.data(), SIZE);
 	}
 
+	ApiKey& operator=(const ApiKey &other) = default;
+
 	ApiKey(const ApiKey &other) {
 		memcpy(value, other.value, SIZE);
 	}

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

@@ -103,6 +103,7 @@ using namespace std;
  *   daemonize                                                                boolean            -          default(false)
  *   default_abort_websockets_on_process_shutdown                             boolean            -          default(true)
  *   default_app_file_descriptor_ulimit                                       unsigned integer   -          -
+ *   default_bind_address                                                     string             -          default("127.0.0.1")
  *   default_environment                                                      string             -          default("production")
  *   default_force_max_concurrent_requests_per_process                        integer            -          default(-1)
  *   default_friendly_error_pages                                             string             -          default("auto")
@@ -120,6 +121,7 @@ using namespace std;
  *   default_server_port                                                      unsigned integer   -          default
  *   default_spawn_method                                                     string             -          default("smart")
  *   default_sticky_sessions                                                  boolean            -          default(false)
+ *   default_sticky_sessions_cookie_attributes                                string             -          default("SameSite=Lax; Secure;")
  *   default_sticky_sessions_cookie_name                                      string             -          default("_passenger_route")
  *   default_user                                                             string             -          default("nobody")
  *   disable_log_prefix                                                       boolean            -          default(false)
@@ -151,7 +153,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/6.0.4")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.9")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/InstanceDirToucher.cpp

@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <Shared/Fundamentals/Utils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -29,7 +29,7 @@
 #include <oxt/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <boost/function.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/foreach.hpp>
 #include <boost/enable_shared_from_this.hpp>

data/src/apache2_module/Config.cpp

@@ -183,7 +183,7 @@ static const char *
 cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return "this feature is only available in Phusion Passenger Enterprise. "
 		"You are currently running the open source Phusion Passenger Enterprise. "
-		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/enterprise";
+		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/features#premium-features";
 }
 
 static const char *

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -86,7 +86,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_anonymous_telemetry_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection."),
+		"Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection."),
 	AP_INIT_TAKE1("PassengerAppEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -141,17 +141,17 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take2Func) cmd_passenger_ctl,
 		NULL,
 		RSRC_CONF,
-		"Set advanced Phusion Passenger options."),
+		"Set advanced Phusion Passenger(R) options."),
 	AP_INIT_TAKE1("PassengerDataBufferDir",
 		(Take1Func) cmd_passenger_data_buffer_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory that Phusion Passenger data buffers should be stored into."),
+		"The directory that Phusion Passenger(R) data buffers should be stored into."),
 	AP_INIT_TAKE1("PassengerDebugLogFile",
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_FLAG("PassengerDebugger",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -161,22 +161,27 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_group,
 		NULL,
 		RSRC_CONF,
-		"The group that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The group that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("PassengerDefaultRuby",
 		(Take1Func) cmd_passenger_default_ruby,
 		NULL,
 		RSRC_CONF,
-		"Phusion Passenger's default Ruby interpreter to use."),
+		"Phusion Passenger(R)'s default Ruby interpreter to use."),
 	AP_INIT_TAKE1("PassengerDefaultUser",
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
+	AP_INIT_TAKE1("PassengerDirectInstanceRequestAddress",
+		(Take1Func) cmd_passenger_direct_instance_request_address,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"The address that Passenger binds to in order to allow sending HTTP requests to individual application processes."),
 	AP_INIT_FLAG("PassengerDisableAnonymousTelemetry",
 		(FlagFunc) cmd_passenger_disable_anonymous_telemetry,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable Phusion Passenger anonymous telemetry."),
+		"Whether to disable Phusion Passenger(R) anonymous telemetry."),
 	AP_INIT_FLAG("PassengerDisableLogPrefix",
 		(FlagFunc) cmd_passenger_disable_log_prefix,
 		NULL,
@@ -186,7 +191,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_disable_security_update_check,
 		NULL,
 		RSRC_CONF,
-		"Whether to disable the Phusion Passenger security update check & notification."),
+		"Whether to disable the Phusion Passenger(R) security update check & notification."),
 	AP_INIT_TAKE1("PassengerDumpConfigManifest",
 		(Take1Func) cmd_passenger_dump_config_manifest,
 		NULL,
@@ -196,7 +201,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_enabled,
 		NULL,
 		RSRC_CONF | ACCESS_CONF | OR_ALL,
-		"Enable or disable Phusion Passenger."),
+		"Enable or disable Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerErrorOverride",
 		(FlagFunc) cmd_passenger_error_override,
 		NULL,
@@ -206,7 +211,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_file_descriptor_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger file descriptor log file."),
+		"The Phusion Passenger(R) file descriptor log file."),
 	AP_INIT_TAKE1("PassengerFlyWith",
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
@@ -236,7 +241,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_instance_registry_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory to register the Phusion Passenger instance to."),
+		"The directory to register the Phusion Passenger(R) instance to."),
 	AP_INIT_FLAG("PassengerLoadShellEnvvars",
 		(FlagFunc) cmd_passenger_load_shell_envvars,
 		NULL,
@@ -246,12 +251,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_log_file,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log file."),
+		"The Phusion Passenger(R) log file."),
 	AP_INIT_TAKE1("PassengerLogLevel",
 		(Take1Func) cmd_passenger_log_level,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger log verbosity."),
+		"The Phusion Passenger(R) log verbosity."),
 	AP_INIT_TAKE1("PassengerLveMinUid",
 		(Take1Func) cmd_passenger_lve_min_uid,
 		NULL,
@@ -261,7 +266,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The maximum number of instances for the current application that Phusion Passenger may spawn."),
+		"The maximum number of instances for the current application that Phusion Passenger(R) may spawn."),
 	AP_INIT_TAKE1("PassengerMaxInstancesPerApp",
 		(Take1Func) cmd_passenger_max_instances_per_app,
 		NULL,
@@ -346,12 +351,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_response_buffer_high_watermark,
 		NULL,
 		RSRC_CONF,
-		"The maximum size of the Phusion Passenger response buffer."),
+		"The maximum size of the Phusion Passenger(R) response buffer."),
 	AP_INIT_TAKE1("PassengerRestartDir",
 		(Take1Func) cmd_passenger_restart_dir,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The directory in which Phusion Passenger should look for restart.txt."),
+		"The directory in which Phusion Passenger(R) should look for restart.txt."),
 	AP_INIT_FLAG("PassengerRollingRestarts",
 		(FlagFunc) cmd_passenger_enterprise_only,
 		NULL,
@@ -361,7 +366,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_root,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger root folder."),
+		"The Phusion Passenger(R) root folder."),
 	AP_INIT_TAKE1("PassengerRuby",
 		(Take1Func) cmd_passenger_ruby,
 		NULL,
@@ -371,22 +376,22 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_security_update_check_proxy,
 		NULL,
 		RSRC_CONF,
-		"Use specified HTTP/SOCKS proxy for the Phusion Passenger security update check."),
+		"Use specified HTTP/SOCKS proxy for the Phusion Passenger(R) security update check."),
 	AP_INIT_FLAG("PassengerShowVersionInHeader",
 		(FlagFunc) cmd_passenger_show_version_in_header,
 		NULL,
 		RSRC_CONF,
-		"Whether to show the Phusion Passenger version number in the X-Powered-By header."),
+		"Whether to show the Phusion Passenger(R) version number in the X-Powered-By header."),
 	AP_INIT_TAKE1("PassengerSocketBacklog",
 		(Take1Func) cmd_passenger_socket_backlog,
 		NULL,
 		RSRC_CONF,
-		"The Phusion Passenger socket backlog."),
+		"The Phusion Passenger(R) socket backlog."),
 	AP_INIT_TAKE1("PassengerSpawnDir",
 		(Take1Func) cmd_passenger_spawn_dir,
 		NULL,
 		RSRC_CONF,
-		"The directory for Phusion Passenger used during child spawning."),
+		"The directory for Phusion Passenger(R) used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,
@@ -412,6 +417,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF | ACCESS_CONF | OR_ALL,
 		"Whether to enable sticky sessions."),
+	AP_INIT_TAKE1("PassengerStickySessionsCookieAttributes",
+		(Take1Func) cmd_passenger_sticky_sessions_cookie_attributes,
+		NULL,
+		RSRC_CONF | ACCESS_CONF | OR_ALL,
+		"The attributes to use for the sticky session cookie."),
 	AP_INIT_TAKE1("PassengerStickySessionsCookieName",
 		(Take1Func) cmd_passenger_sticky_sessions_cookie_name,
 		NULL,
@@ -421,12 +431,12 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_enterprise_only,
 		NULL,
 		RSRC_CONF | ACCESS_CONF,
-		"The number of threads that Phusion Passenger should spawn per application."),
+		"The number of threads that Phusion Passenger(R) should spawn per application."),
 	AP_INIT_FLAG("PassengerTurbocaching",
 		(FlagFunc) cmd_passenger_turbocaching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable turbocaching in Phusion Passenger."),
+		"Whether to enable turbocaching in Phusion Passenger(R)."),
 	AP_INIT_FLAG("PassengerUseGlobalQueue",
 		(FlagFunc) cmd_passenger_use_global_queue,
 		NULL,
@@ -441,7 +451,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("RackBaseURI",
 		(Take1Func) cmd_passenger_base_uri,
 		NULL,
@@ -471,7 +481,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(Take1Func) cmd_passenger_default_user,
 		NULL,
 		RSRC_CONF,
-		"The user that Phusion Passenger applications must run as when user switching fails or is disabled."),
+		"The user that Phusion Passenger(R) applications must run as when user switching fails or is disabled."),
 	AP_INIT_TAKE1("RailsEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,
@@ -516,7 +526,7 @@ extern "C" const command_rec passenger_commands[] = {
 		(FlagFunc) cmd_passenger_user_switching,
 		NULL,
 		RSRC_CONF,
-		"Whether to enable user switching support in Phusion Passenger."),
+		"Whether to enable user switching support in Phusion Passenger(R)."),
 	AP_INIT_TAKE1("UnionStationFilter",
 		(Take1Func) cmd_union_station_filter,
 		NULL,