passenger 6.0.0 → 6.0.5

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -177,6 +177,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Whether to disable Phusion Passenger anonymous telemetry."),
+	AP_INIT_FLAG("PassengerDisableLogPrefix",
+		(FlagFunc) cmd_passenger_disable_log_prefix,
+		NULL,
+		RSRC_CONF,
+		"Disable prefixing log statements with PID and channel."),
 	AP_INIT_FLAG("PassengerDisableSecurityUpdateCheck",
 		(FlagFunc) cmd_passenger_disable_security_update_check,
 		NULL,
@@ -377,6 +382,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"The Phusion Passenger socket backlog."),
+	AP_INIT_TAKE1("PassengerSpawnDir",
+		(Take1Func) cmd_passenger_spawn_dir,
+		NULL,
+		RSRC_CONF,
+		"The directory for Phusion Passenger used during child spawning."),
 	AP_INIT_TAKE1("PassengerSpawnMethod",
 		(Take1Func) cmd_passenger_spawn_method,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -73,6 +73,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerDisableAnonymousTelemetry",
 		false);
 
+	addOptionsContainerStaticDefaultBool(
+		globalConfigContainer,
+		"PassengerDisableLogPrefix",
+		false);
+
 	addOptionsContainerStaticDefaultBool(
 		globalConfigContainer,
 		"PassengerDisableSecurityUpdateCheck",
@@ -123,6 +128,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerSocketBacklog",
 		DEFAULT_SOCKET_BACKLOG);
 
+	addOptionsContainerDynamicDefault(
+		globalConfigContainer,
+		"PassengerSpawnDir",
+		P_STATIC_STRING("Either $TMPDIR or /tmp"));
+
 	addOptionsContainerStaticDefaultInt(
 		globalConfigContainer,
 		"PassengerStatThrottleRate",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -334,6 +334,21 @@ cmd_passenger_disable_anonymous_telemetry(cmd_parms *cmd, void *pcfg, const char
 	return NULL;
 }
 
+static const char *
+cmd_passenger_disable_log_prefix(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.disableLogPrefixSourceFile = cmd->directive->filename;
+	serverConfig.disableLogPrefixSourceLine = cmd->directive->line_num;
+	serverConfig.disableLogPrefixExplicitlySet = true;
+	serverConfig.disableLogPrefix = arg != NULL;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -817,6 +832,21 @@ cmd_passenger_socket_backlog(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return setIntConfig(cmd, arg, serverConfig.socketBacklog, 0);
 }
 
+static const char *
+cmd_passenger_spawn_dir(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+	if (err != NULL) {
+		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
+			"WARNING: %s", err);
+	}
+
+	serverConfig.spawnDirSourceFile = cmd->directive->filename;
+	serverConfig.spawnDirSourceLine = cmd->directive->line_num;
+	serverConfig.spawnDirExplicitlySet = true;
+	serverConfig.spawnDir = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_start_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);

data/src/apache2_module/Hooks.cpp

@@ -1020,6 +1020,10 @@ private:
 			env = (apr_table_entry_t*) env_arr->elts;
 
 			for (i = 0; i < env_arr->nelts; ++i) {
+				if ((strcmp(env[i].key, "SCRIPT_NAME") == 0)
+				 || (strcmp(env[i].key, "PATH_INFO")   == 0)) {
+					continue;
+				}
 				envvarsData.append(env[i].key);
 				envvarsData.append("\0", 1);
 				if (env[i].val != NULL) {
@@ -1334,6 +1338,7 @@ public:
 		config["controller_socket_backlog"] = serverConfig.socketBacklog;
 		config["controller_file_buffered_channel_buffer_dir"] = nonEmptyString(serverConfig.dataBufferDir);
 		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
+		config["spawn_dir"] = nonEmptyString(serverConfig.spawnDir);
 		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
 		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
 		config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;
@@ -1354,6 +1359,7 @@ public:
 		config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
 		config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
 		config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
+		config["disable_log_prefix"] = serverConfig.disableLogPrefix;
 
 		if (!serverConfig.logFile.empty()) {
 			config["log_target"] = serverConfig.logFile.toString();

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -155,6 +155,15 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.disableAnonymousTelemetrySourceLine);
 		hierarchyMember["value"] = serverConfig.disableAnonymousTelemetry == Apache2Module::ENABLED;
 	}
+	if (serverConfig.disableLogPrefixExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerDisableLogPrefix",
+			sizeof("PassengerDisableLogPrefix") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.disableLogPrefixSourceFile,
+			serverConfig.disableLogPrefixSourceLine);
+		hierarchyMember["value"] = serverConfig.disableLogPrefix == Apache2Module::ENABLED;
+	}
 	if (serverConfig.disableSecurityUpdateCheckExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDisableSecurityUpdateCheck",
@@ -303,6 +312,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.socketBacklogSourceLine);
 		hierarchyMember["value"] = serverConfig.socketBacklog;
 	}
+	if (serverConfig.spawnDirExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerSpawnDir",
+			sizeof("PassengerSpawnDir") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.spawnDirSourceFile,
+			serverConfig.spawnDirSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.spawnDir.data(),
+			serverConfig.spawnDir.data() + serverConfig.spawnDir.size());
+	}
 	if (serverConfig.statThrottleRateExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerStatThrottleRate",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -62,6 +62,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	bool disableAnonymousTelemetry;
 
+	/*
+	 * Disable prefixing log statements with PID and channel.
+	 */
+	bool disableLogPrefix;
+
 	/*
 	 * Whether to disable the Phusion Passenger security update check & notification.
 	 */
@@ -192,6 +197,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString securityUpdateCheckProxy;
 
+	/*
+	 * The directory for Phusion Passenger used during child spawning.
+	 */
+	StaticString spawnDir;
+
 	/*
 	 * Prestart the given web applications during startup.
 	 */
@@ -199,6 +209,7 @@ struct AutoGeneratedServerConfig {
 
 
 	StaticString disableAnonymousTelemetrySourceFile;
+	StaticString disableLogPrefixSourceFile;
 	StaticString disableSecurityUpdateCheckSourceFile;
 	StaticString showVersionInHeaderSourceFile;
 	StaticString turbocachingSourceFile;
@@ -225,9 +236,11 @@ struct AutoGeneratedServerConfig {
 	StaticString logFileSourceFile;
 	StaticString rootSourceFile;
 	StaticString securityUpdateCheckProxySourceFile;
+	StaticString spawnDirSourceFile;
 	StaticString prestartURLsSourceFile;
 
 	unsigned int disableAnonymousTelemetrySourceLine;
+	unsigned int disableLogPrefixSourceLine;
 	unsigned int disableSecurityUpdateCheckSourceLine;
 	unsigned int showVersionInHeaderSourceLine;
 	unsigned int turbocachingSourceLine;
@@ -254,9 +267,11 @@ struct AutoGeneratedServerConfig {
 	unsigned int logFileSourceLine;
 	unsigned int rootSourceLine;
 	unsigned int securityUpdateCheckProxySourceLine;
+	unsigned int spawnDirSourceLine;
 	unsigned int prestartURLsSourceLine;
 
 	bool disableAnonymousTelemetryExplicitlySet: 1;
+	bool disableLogPrefixExplicitlySet: 1;
 	bool disableSecurityUpdateCheckExplicitlySet: 1;
 	bool showVersionInHeaderExplicitlySet: 1;
 	bool turbocachingExplicitlySet: 1;
@@ -283,11 +298,13 @@ struct AutoGeneratedServerConfig {
 	bool logFileExplicitlySet: 1;
 	bool rootExplicitlySet: 1;
 	bool securityUpdateCheckProxyExplicitlySet: 1;
+	bool spawnDirExplicitlySet: 1;
 	bool prestartURLsExplicitlySet: 1;
 
 
 	AutoGeneratedServerConfig() {
 		disableAnonymousTelemetry = false;
+		disableLogPrefix = false;
 		disableSecurityUpdateCheck = false;
 		showVersionInHeader = true;
 		turbocaching = true;
@@ -340,11 +357,15 @@ struct AutoGeneratedServerConfig {
 		/*
 		 * securityUpdateCheckProxy: default initialized
 		 */
+		/*
+		 * spawnDir: default initialized
+		 */
 		/*
 		 * prestartURLs: default initialized
 		 */
 
 		disableAnonymousTelemetrySourceLine = 0;
+		disableLogPrefixSourceLine = 0;
 		disableSecurityUpdateCheckSourceLine = 0;
 		showVersionInHeaderSourceLine = 0;
 		turbocachingSourceLine = 0;
@@ -371,9 +392,11 @@ struct AutoGeneratedServerConfig {
 		logFileSourceLine = 0;
 		rootSourceLine = 0;
 		securityUpdateCheckProxySourceLine = 0;
+		spawnDirSourceLine = 0;
 		prestartURLsSourceLine = 0;
 
 		disableAnonymousTelemetryExplicitlySet = false;
+		disableLogPrefixExplicitlySet = false;
 		disableSecurityUpdateCheckExplicitlySet = false;
 		showVersionInHeaderExplicitlySet = false;
 		turbocachingExplicitlySet = false;
@@ -400,6 +423,7 @@ struct AutoGeneratedServerConfig {
 		logFileExplicitlySet = false;
 		rootExplicitlySet = false;
 		securityUpdateCheckProxyExplicitlySet = false;
+		spawnDirExplicitlySet = false;
 		prestartURLsExplicitlySet = false;
 	}
 

data/src/cxx_supportlib/Constants.h

@@ -68,6 +68,7 @@
 #define DEFAULT_SPAWN_METHOD "smart"
 #define DEFAULT_START_TIMEOUT 90000
 #define DEFAULT_STAT_THROTTLE_RATE 10
+#define DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "SameSite=Lax; Secure;"
 #define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
 #define DEFAULT_WEB_APP_USER "nobody"
 #define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
@@ -81,7 +82,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.0"
+#define PASSENGER_VERSION "6.0.5"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/LoggingKit/Config.h

@@ -51,6 +51,7 @@ using namespace std;
  *
  *   app_output_log_level         string    -   default("notice")
  *   buffer_logs                  boolean   -   default(false)
+ *   disable_log_prefix           boolean   -   default(false)
  *   file_descriptor_log_target   any       -   -
  *   level                        string    -   default("notice")
  *   redirect_stderr              boolean   -   default(true)
@@ -88,6 +89,7 @@ struct ConfigRealization {
 	FdClosePolicy targetFdClosePolicy;
 	FdClosePolicy fileDescriptorLogTargetFdClosePolicy;
 	bool finalized;
+	bool disableLogPrefix;
 
 	ConfigRealization(const ConfigKit::Store &store);
 	~ConfigRealization();

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -409,16 +409,18 @@ realLogAppOutput(const HashedStaticString &groupName, int targetFd,
 	const char *pidStr, unsigned int pidStrLen,
 	const char *channelName, unsigned int channelNameLen,
 	const char *message, unsigned int messageLen, int appLogFile,
-	bool saveLog)
+	bool saveLog, bool prefixLogs)
 {
 	char *pos = buf;
 	char *end = buf + bufSize;
 
-	pos = appendData(pos, end, "App ");
-	pos = appendData(pos, end, pidStr, pidStrLen);
-	pos = appendData(pos, end, " ");
-	pos = appendData(pos, end, channelName, channelNameLen);
-	pos = appendData(pos, end, ": ");
+	if (prefixLogs) {
+		pos = appendData(pos, end, "App ");
+		pos = appendData(pos, end, pidStr, pidStrLen);
+		pos = appendData(pos, end, " ");
+		pos = appendData(pos, end, channelName, channelNameLen);
+		pos = appendData(pos, end, ": ");
+	}
 	pos = appendData(pos, end, message, messageLen);
 	pos = appendData(pos, end, "\n");
 
@@ -437,6 +439,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 {
 	int targetFd;
 	bool saveLog = false;
+	bool prefixLogs = true;
 
 	if (OXT_LIKELY(context != NULL)) {
 		const ConfigRealization *configRealization = context->getConfigRealization();
@@ -446,6 +449,7 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 
 		targetFd = configRealization->targetFd;
 		saveLog = configRealization->saveLog;
+		prefixLogs = !configRealization->disableLogPrefix;
 	} else {
 		targetFd = STDERR_FILENO;
 	}
@@ -476,14 +480,14 @@ logAppOutput(const HashedStaticString &groupName, pid_t pid, const StaticString
 			buf, sizeof(buf),
 			pidStr, pidStrLen,
 			channelName.data(), channelName.size(),
-			message, size, fd, saveLog);
+			message, size, fd, saveLog, prefixLogs);
 	} else {
 		DynamicBuffer buf(totalLen);
 		realLogAppOutput(groupName, targetFd,
 			buf.data, totalLen,
 			pidStr, pidStrLen,
 			channelName.data(), channelName.size(),
-			message, size, fd, saveLog);
+			message, size, fd, saveLog, prefixLogs);
 	}
 	if(fd > -1){close(fd);}
 }
@@ -778,6 +782,7 @@ Schema::Schema() {
 	add("redirect_stderr", BOOL_TYPE, OPTIONAL, true);
 	add("app_output_log_level", STRING_TYPE, OPTIONAL, DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME);
 	add("buffer_logs", BOOL_TYPE, OPTIONAL, false);
+	add("disable_log_prefix", BOOL_TYPE, OPTIONAL, false);
 
 	addValidator(boost::bind(validateLogLevel, "level",
 		boost::placeholders::_1, boost::placeholders::_2));
@@ -798,7 +803,8 @@ ConfigRealization::ConfigRealization(const ConfigKit::Store &store)
 	: level(parseLevel(store["level"].asString())),
 	  appOutputLogLevel(parseLevel(store["app_output_log_level"].asString())),
 	  saveLog(store["buffer_logs"].asBool()),
-	  finalized(false)
+	  finalized(false),
+	  disableLogPrefix(store["disable_log_prefix"].asBool())
 {
 	if (store["target"].isMember("stderr")) {
 		targetType = STDERR_TARGET;

data/src/cxx_supportlib/ServerKit/HttpChunkedBodyParser.h

@@ -112,7 +112,7 @@ private:
 	static int parseHexDigit(char ch) {
 		if (ch >= 'A' && ch <= 'F') {
 			return 10 + ch - 'A';
-		} else if (ch >= 'a' && ch <= 'z') {
+		} else if (ch >= 'a' && ch <= 'f') {
 			return 10 + ch - 'a';
 		} else {
 			return ch - '0';

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -10,19 +10,74 @@
 #ifndef _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
 #define _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
 
+#include <unistd.h>
 #include <boost/predef.h>
 #include <FileTools/FileManip.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 
 using namespace std;
 
 
+// adapted from https://github.com/systemd/systemd/blob/042ca/src/basic/virt.c
+// separate function to keep as similar to source as possible for easier updates
+inline bool
+_linuxAutoDetectInContainer() {
+	// https://github.com/moby/moby/issues/26102#issuecomment-253621560
+	if (fileExists("/.dockerenv")) {
+		return true;
+	}
+
+	if (fileExists("/proc/vz") && !fileExists("/proc/bc")) {
+		return true;
+	}
+
+	const char *env = getenv("container");
+	if (env != NULL) {
+		return (*env != '\0');
+	}
+
+	if (fileExists("/run/systemd/container")) {
+		string file = unsafeReadFile("/run/systemd/container");
+		return (file.length() > 0);
+	}
+
+	if (geteuid() == 0) {
+		if (fileExists("/proc/1/environ")) {
+			string file = unsafeReadFile("/proc/1/environ");
+			if (file.size() > 0) {
+				vector<string> v;
+				split(file,'\0', v);
+				for(vector<string>::iterator it = v.begin(); it != v.end(); ++it) {
+					if (startsWith(*it, "container=")) {
+						return true;
+					}
+				}
+			}
+		}
+
+		if (fileExists("/proc/1/sched")) {
+			string file = unsafeReadFile("/proc/1/sched");
+			if (file.length() > 0) {
+				const char t = file[0];
+				if (t == '\0') {
+					return false;
+				}
+
+				if (!startsWith(file, "(1,")) {
+					return true;
+				}
+			}
+		}
+	}
+	return false;
+}
+
 inline bool
 autoDetectInContainer() {
 	#if BOOST_OS_LINUX
-		// https://github.com/moby/moby/issues/26102#issuecomment-253621560
-		return fileExists("/.dockerenv");
+		return _linuxAutoDetectInContainer();
 	#else
 		return false;
 	#endif