passenger 5.3.4 → 5.3.5

data/dev/configkit-schemas/index.json

@@ -293,7 +293,7 @@
          "type" : "unsigned integer"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.4",
+         "default_value" : "Phusion_Passenger/5.3.5",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -795,7 +795,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.4",
+         "default_value" : "Phusion_Passenger/5.3.5",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -826,6 +826,57 @@
          "has_default_value" : "static",
          "type" : "unsigned integer"
       },
+      "telemetry_collector_ca_certificate_path" : {
+         "type" : "string"
+      },
+      "telemetry_collector_debug_curl" : {
+         "default_value" : false,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
+      "telemetry_collector_disabled" : {
+         "default_value" : false,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
+      "telemetry_collector_final_run_timeout" : {
+         "default_value" : 5,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_first_interval" : {
+         "default_value" : 7200,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_interval" : {
+         "default_value" : 21600,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_interval_jitter" : {
+         "default_value" : 7200,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_proxy_url" : {
+         "type" : "string"
+      },
+      "telemetry_collector_timeout" : {
+         "default_value" : 180,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_url" : {
+         "default_value" : "https://anontelemetry.phusionpassenger.com/v1/collect.json",
+         "has_default_value" : "static",
+         "type" : "string"
+      },
+      "telemetry_collector_verify_server" : {
+         "default_value" : true,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
       "turbocaching" : {
          "default_value" : true,
          "has_default_value" : "static",
@@ -1517,7 +1568,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.3.4",
+         "default_value" : "Phusion_Passenger/5.3.5",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -1556,6 +1607,57 @@
          "has_default_value" : "static",
          "type" : "unsigned integer"
       },
+      "telemetry_collector_ca_certificate_path" : {
+         "type" : "string"
+      },
+      "telemetry_collector_debug_curl" : {
+         "default_value" : false,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
+      "telemetry_collector_disabled" : {
+         "default_value" : false,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
+      "telemetry_collector_final_run_timeout" : {
+         "default_value" : 5,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_first_interval" : {
+         "default_value" : 7200,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_interval" : {
+         "default_value" : 21600,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_interval_jitter" : {
+         "default_value" : 7200,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_proxy_url" : {
+         "type" : "string"
+      },
+      "telemetry_collector_timeout" : {
+         "default_value" : 180,
+         "has_default_value" : "static",
+         "type" : "unsigned integer"
+      },
+      "telemetry_collector_url" : {
+         "default_value" : "https://anontelemetry.phusionpassenger.com/v1/collect.json",
+         "has_default_value" : "static",
+         "type" : "string"
+      },
+      "telemetry_collector_verify_server" : {
+         "default_value" : true,
+         "has_default_value" : "static",
+         "type" : "boolean"
+      },
       "turbocaching" : {
          "default_value" : true,
          "has_default_value" : "static",

data/dev/show-latest-crashlog-dir

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# Finds the latest Passenger crash log directory and prints its path.
+# This tool is meant to make it easy to analyze local Passenger crash
+# logs during debugging sessions. Instead of searching for the crash
+# log directory path in the output and then copy-pasting that to the
+# terminal, one can simply invoke one shell command:
+#
+#   less $(./dev/show-latest-crashlog-dir)/backtrace.log
+#
+# This will open the latest crash log's backtrace.log in 'less'.
+
+def parse_path(path)
+  File.basename(path).split('.')[1].to_i
+end
+
+def main
+  dirs = Dir["/var/tmp/passenger-crash-log.*.*"].sort do |a, b|
+    parse_path(a) <=> parse_path(b)
+  end
+  if dirs.empty?
+    abort "No /var/tmp/passenger-crash-log.* directories found."
+  else
+    puts dirs.last
+  end
+end
+
+main

data/resources/templates/standalone/http.erb

@@ -34,6 +34,8 @@ passenger_user_switching off;
 <%= nginx_http_option(:instance_registry_dir) %>
 <%= nginx_http_option(:disable_security_update_check) %>
 <%= nginx_http_option(:security_update_check_proxy) %>
+<%= nginx_http_option(:disable_anonymous_telemetry) %>
+<%= nginx_http_option(:anonymous_telemetry_proxy) %>
 <%= nginx_http_option(:data_buffer_dir) %>
 <%= nginx_http_option(:core_file_descriptor_ulimit) %>
 <%= nginx_http_option(:admin_panel_url) %>

data/src/agent/Core/AdminPanelConnector.h

@@ -193,7 +193,7 @@ private:
 		args.push_back("system-properties");
 
 		int status = 0;
-		string output;
+		SubprocessOutput output;
 		try {
 			runInternalRubyTool(*resourceLocator, ruby, args, &status, &output);
 		} catch (const std::exception &e) {
@@ -206,7 +206,7 @@ private:
 
 		server.getIoService().post(boost::bind(
 			&AdminPanelConnector::onGetServerPropertiesDone, this,
-			conn, doc, output, status, string()
+			conn, doc, output.data, status, string()
 		));
 	}
 

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

@@ -86,10 +86,14 @@ public:
 		return spawningKitFactory->getContext();
 	}
 
-	ResourceLocator *getResourceLocator() const {
+	const ResourceLocator *getResourceLocator() const {
 		return getSpawningKitContext()->resourceLocator;
 	}
 
+	const WrapperRegistry::Registry *getWrapperRegistry() const {
+		return getSpawningKitContext()->wrapperRegistry;
+	}
+
 	const RandomGeneratorPtr &getRandomGenerator() const {
 		return getSpawningKitContext()->randomGenerator;
 	}

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

@@ -46,6 +46,7 @@
 #include <cassert>
 #include <SmallVector.h>
 #include <MemoryKit/palloc.h>
+#include <WrapperRegistry/Registry.h>
 #include <Hooks.h>
 #include <Utils.h>
 #include <Core/ApplicationPool/Common.h>
@@ -438,6 +439,7 @@ public:
 	Context *getContext() const;
 	psg_pool_t *getPallocPool() const;
 	const ResourceLocator &getResourceLocator() const;
+	const WrapperRegistry::Registry &getWrapperRegistry() const;
 
 	/****** Session management ******/
 

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

@@ -99,6 +99,11 @@ Group::getResourceLocator() const {
 	return *getPool()->getSpawningKitContext()->resourceLocator;
 }
 
+const WrapperRegistry::Registry &
+Group::getWrapperRegistry() const {
+	return *getPool()->getSpawningKitContext()->wrapperRegistry;
+}
+
 
 } // namespace ApplicationPool2
 } // namespace Passenger

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

@@ -53,7 +53,8 @@ Group::cleanupSpawner(boost::container::vector<Callback> &postLockActions) {
 
 bool
 Group::authorizeByUid(uid_t uid) const {
-	return uid == 0 || SpawningKit::prepareUserSwitching(options).uid == uid;
+	return uid == 0 || SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()).uid == uid;
 }
 
 bool

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

@@ -153,7 +153,7 @@ Group::addProcessToList(const ProcessPtr &process, ProcessList &destination) {
 		assert(process->isAlive());
 		process->enabled = Process::DETACHED;
 
-		if (!this->options.abortWebsocketsOnProcessShutdown && this->options.appType == P_STATIC_STRING("node")) {
+		if (!this->options.abortWebsocketsOnProcessShutdown && this->options.appType == P_STATIC_STRING("nodejs")) {
 			// When Passenger is not allowed to abort websockets the application needs a way to know graceful shutdown
 			// is in progress. The solution for the most common use (Node.js) is to send a SIGINT. This is the general
 			// termination signal for Node; later versions of pm2 also use it (with a 1.6 sec grace period, Passenger just waits)

data/src/agent/Core/ApplicationPool/Group/StateInspection.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.
@@ -162,14 +162,15 @@ Group::inspectXml(std::ostream &stream, bool includeSecrets) const {
 		P_BUG("Unknown 'lifeStatus' state " << lifeStatus);
 	}
 
-	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options));
+	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()));
 	stream << "<user>" << escapeForXml(usInfo.username) << "</user>";
 	stream << "<uid>" << usInfo.uid << "</uid>";
 	stream << "<group>" << escapeForXml(usInfo.groupname) << "</group>";
 	stream << "<gid>" << usInfo.gid << "</gid>";
 
 	stream << "<options>";
-	options.toXml(stream, getResourceLocator());
+	options.toXml(stream, getResourceLocator(), getWrapperRegistry());
 	stream << "</options>";
 
 	stream << "<processes>";
@@ -201,22 +202,14 @@ Group::inspectXml(std::ostream &stream, bool includeSecrets) const {
 void
 Group::inspectPropertiesInAdminPanelFormat(Json::Value &result) const {
 	result["path"] = absolutizePath(options.appRoot);
-	result["startup_file"] = absolutizePath(options.getStartupFile(), absolutizePath(options.appRoot));
-	result["start_command"] = options.getStartCommand(getResourceLocator());
-
-	if (options.appType == "rack") {
-		result["type"] = "ruby";
-	} else if (options.appType == "wsgi") {
-		result["type"] = "python";
-	} else if (options.appType == "node") {
-		result["type"] = "nodejs";
-	} else if (options.appType == "meteor") {
-		result["type"] = "meteor";
-	} else {
-		result["type"] = "generic";
-	}
-
-	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options));
+	result["startup_file"] = absolutizePath(options.getStartupFile(getWrapperRegistry()),
+		absolutizePath(options.appRoot));
+	result["start_command"] = options.getStartCommand(getResourceLocator(),
+		getWrapperRegistry());
+	result["type"] = getWrapperRegistry().lookup(options.appType).language.toString();
+
+	SpawningKit::UserSwitchingInfo usInfo(SpawningKit::prepareUserSwitching(options,
+		getWrapperRegistry()));
 	result["user"]["username"] = usInfo.username;
 	result["user"]["uid"] = (Json::Int) usInfo.uid;
 	result["group"]["groupname"] = usInfo.groupname;

data/src/agent/Core/ApplicationPool/Options.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.
@@ -30,7 +30,7 @@
 #include <vector>
 #include <utility>
 #include <boost/shared_array.hpp>
-#include <AppTypes.h>
+#include <WrapperRegistry/Registry.h>
 #include <DataStructures/HashedStaticString.h>
 #include <Constants.h>
 #include <ResourceLocator.h>
@@ -545,16 +545,16 @@ public:
 	 * the `elements` argument.
 	 */
 	void toVector(vector<string> &vec, const ResourceLocator &resourceLocator,
-		int fields = ALL_OPTIONS) const
+		const WrapperRegistry::Registry &wrapperRegistry, int fields = ALL_OPTIONS) const
 	{
 		if (fields & SPAWN_OPTIONS) {
 			appendKeyValue (vec, "app_root",           appRoot);
 			appendKeyValue (vec, "app_group_name",     getAppGroupName());
 			appendKeyValue (vec, "app_type",           appType);
 			appendKeyValue (vec, "app_log_file",       appLogFile);
-			appendKeyValue (vec, "start_command",      getStartCommand(resourceLocator));
-			appendKeyValue (vec, "startup_file",       absolutizePath(getStartupFile(), absolutizePath(appRoot)));
-			appendKeyValue (vec, "process_title",      getProcessTitle());
+			appendKeyValue (vec, "start_command",      getStartCommand(resourceLocator, wrapperRegistry));
+			appendKeyValue (vec, "startup_file",       absolutizePath(getStartupFile(wrapperRegistry), absolutizePath(appRoot)));
+			appendKeyValue (vec, "process_title",      getProcessTitle(wrapperRegistry));
 			appendKeyValue2(vec, "log_level",          logLevel);
 			appendKeyValue3(vec, "start_timeout",      startTimeout);
 			appendKeyValue (vec, "environment",        environment);
@@ -589,12 +589,12 @@ public:
 
 	template<typename Stream>
 	void toXml(Stream &stream, const ResourceLocator &resourceLocator,
-		int fields = ALL_OPTIONS) const
+		const WrapperRegistry::Registry &wrapperRegistry, int fields = ALL_OPTIONS) const
 	{
 		vector<string> args;
 		unsigned int i;
 
-		toVector(args, resourceLocator, fields);
+		toVector(args, resourceLocator, wrapperRegistry, fields);
 		for (i = 0; i < args.size(); i += 2) {
 			stream << "<" << args[i] << ">";
 			stream << escapeForXml(args[i + 1]);
@@ -614,43 +614,47 @@ public:
 		}
 	}
 
-	string getStartCommand(const ResourceLocator &resourceLocator) const {
-		if (appType == P_STATIC_STRING("rack")) {
-			return escapeShell(ruby) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/rack-loader.rb");
-		} else if (appType == P_STATIC_STRING("wsgi")) {
-			return escapeShell(python) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/wsgi-loader.py");
-		} else if (appType == P_STATIC_STRING("node")) {
-			return escapeShell(nodejs) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/node-loader.js");
-		} else if (appType == P_STATIC_STRING("meteor")) {
-			return escapeShell(ruby) + " "
-				+ escapeShell(resourceLocator.getHelperScriptsDir() + "/meteor-loader.rb");
+	string getStartCommand(const ResourceLocator &resourceLocator,
+		const WrapperRegistry::Registry &wrapperRegistry) const
+	{
+		const WrapperRegistry::Entry &entry = wrapperRegistry.lookup(appType);
+
+		string interpreter;
+		if (entry.language == P_STATIC_STRING("ruby")) {
+			interpreter = escapeShell(ruby);
+		} else if (entry.language == P_STATIC_STRING("python")) {
+			interpreter = escapeShell(python);
+		} else if (entry.language == P_STATIC_STRING("nodejs")) {
+			interpreter = escapeShell(nodejs);
+		} else if (entry.language == P_STATIC_STRING("meteor")) {
+			interpreter = escapeShell(ruby);
 		} else {
 			return startCommand;
 		}
+
+		return interpreter + " " + escapeShell(resourceLocator.getHelperScriptsDir()
+			+ "/" + entry.path);
 	}
 
-	StaticString getStartupFile() const {
+	StaticString getStartupFile(const WrapperRegistry::Registry &wrapperRegistry) const {
 		if (startupFile.empty()) {
-			const char *result = getAppTypeStartupFile(getAppType(appType));
-			if (result == NULL) {
-				return P_STATIC_STRING("");
+			const WrapperRegistry::Entry &entry = wrapperRegistry.lookup(appType);
+			if (entry.isNull() || entry.defaultStartupFiles.empty()) {
+				return StaticString();
 			} else {
-				return result;
+				return entry.defaultStartupFiles[0];
 			}
 		} else {
 			return startupFile;
 		}
 	}
 
-	StaticString getProcessTitle() const {
-		const char *result = getAppTypeProcessTitle(getAppType(appType));
-		if (result == NULL) {
-			return processTitle;
+	StaticString getProcessTitle(const WrapperRegistry::Registry &registry) const {
+		const WrapperRegistry::Entry &entry = registry.lookup(appType);
+		if (entry.isNull()) {
+			return entry.processTitle;
 		} else {
-			return result;
+			return StaticString();
 		}
 	}
 

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

@@ -52,7 +52,8 @@ Pool::getGroupRunUidAndGids(const StaticString &appGroupName) {
 	if (!groups.lookup(appGroupName.c_str(), &group)) {
 		throw RuntimeException("Could not find group: " + appGroupName);
 	} else {
-		SpawningKit::UserSwitchingInfo info = SpawningKit::prepareUserSwitching((*group)->options);
+		SpawningKit::UserSwitchingInfo info = SpawningKit::prepareUserSwitching((*group)->options,
+			*context->getWrapperRegistry());
 		return pair<uid_t, gid_t>(info.uid,info.gid);
 	}
 }