passenger 6.0.22 → 6.0.24

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

@@ -28,7 +28,6 @@
 
 #include <string>
 #include <vector>
-#include <algorithm>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/container/vector.hpp>
@@ -54,6 +53,10 @@
 #include <Core/SpawningKit/Result.h>
 #include <Shared/ApplicationPoolApiKey.h>
 
+namespace tut {
+	template<class Data> class test_object;
+}
+
 namespace Passenger {
 namespace ApplicationPool2 {
 
@@ -100,6 +103,9 @@ typedef boost::container::vector<ProcessPtr> ProcessList;
  */
 class Process {
 public:
+	friend class Group;
+	template<class Data> friend class tut::test_object;
+
 	static const unsigned int MAX_SOCKETS_ACCEPTING_HTTP_REQUESTS = 3;
 
 private:
@@ -337,9 +343,14 @@ private:
 	}
 
 	void destroySelf() const {
+		Context *context = getContext();
+		Process *storagePointer = const_cast<Process *>(this);
 		this->~Process();
-		LockGuard l(getContext()->memoryManagementSyncher);
-		getContext()->processObjectPool.free(const_cast<Process *>(this));
+
+		LockGuard l(context->memoryManagementSyncher);
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->processObjectPool.free(storagePointer);
 	}
 
 
@@ -384,6 +395,10 @@ public:
 
 	/** Last time when a session was opened for this Process. */
 	unsigned long long lastUsed;
+    /** Which generation of app processes this one belongs to,
+        inherited from the app group, incremented when a restart
+		is initiated*/
+	const unsigned int generation;
 	/** Number of sessions currently open.
 	 * @invariant session >= 0
 	 */
@@ -446,8 +461,7 @@ public:
 	/** Collected by Pool::collectAnalytics(). */
 	ProcessMetrics metrics;
 
-
-	Process(const BasicGroupInfo *groupInfo, const Json::Value &args)
+	Process(const BasicGroupInfo *groupInfo, const unsigned int gen, const Json::Value &args)
 		: info(this, groupInfo, args),
 		  socketsAcceptingHttpRequestsCount(0),
 		  spawnerCreationTime(getJsonUint64Field(args, "spawner_creation_time")),
@@ -458,6 +472,7 @@ public:
 		  refcount(1),
 		  index(-1),
 		  lastUsed(spawnEndTime),
+		  generation(gen),
 		  sessions(0),
 		  processed(0),
 		  lifeStatus(ALIVE),
@@ -471,7 +486,7 @@ public:
 		indexSocketsAcceptingHttpRequests();
 	}
 
-	Process(const BasicGroupInfo *groupInfo, const SpawningKit::Result &skResult,
+	Process(const BasicGroupInfo *groupInfo, const unsigned int gen, const SpawningKit::Result &skResult,
 		const Json::Value &args)
 		: info(this, groupInfo, skResult),
 		  socketsAcceptingHttpRequestsCount(0),
@@ -483,6 +498,7 @@ public:
 		  refcount(1),
 		  index(-1),
 		  lastUsed(spawnEndTime),
+		  generation(gen),
 		  sessions(0),
 		  processed(0),
 		  lifeStatus(ALIVE),

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

@@ -109,9 +109,14 @@ private:
 	}
 
 	void destroySelf() const {
+		Context *context = this->context;
+		Session *storagePointer = const_cast<Session *>(this);
 		this->~Session();
+
 		LockGuard l(context->memoryManagementSyncher);
-		context->sessionObjectPool.free(const_cast<Session *>(this));
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->sessionObjectPool.free(storagePointer);
 	}
 
 public:

data/src/agent/Core/Config.h

@@ -118,6 +118,7 @@ using namespace std;
  *   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_custom_error_page                                       string             -          default("")
  *   default_environment                                             string             -          default("production")
  *   default_force_max_concurrent_requests_per_process               integer            -          default(-1)
  *   default_friendly_error_pages                                    string             -          default("auto")
@@ -166,13 +167,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/6.0.22")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.24")
  *   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
+ *   spawn_dir                                                       string             -          default,read_only
  *   standalone_engine                                               string             -          default
  *   stat_throttle_rate                                              unsigned integer   -          default(10)
  *   telemetry_collector_ca_certificate_path                         string             -          -
@@ -239,6 +240,10 @@ private:
 		return 80;
 	}
 
+	static Json::Value getDefaultSpawnDir(const ConfigKit::Store &store) {
+		return getSystemTempDir();
+	}
+
 	static Json::Value getDefaultThreads(const ConfigKit::Store &store) {
 		return Json::UInt(boost::thread::hardware_concurrency());
 	}
@@ -487,7 +492,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);
+		addWithDynamicDefault("spawn_dir", STRING_TYPE, OPTIONAL | READ_ONLY | CACHE_DEFAULT_VALUE, getDefaultSpawnDir);
 		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);

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

@@ -23,6 +23,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#include "DataStructures/LString.h"
 #include <Core/Controller.h>
 #include <Core/SpawningKit/ErrorRenderer.h>
 
@@ -351,8 +352,17 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 	Request *req = *r;
 	SpawningKit::ErrorRenderer renderer(*appPool->getSpawningKitContext());
 	string data;
+	const LString *path = customErrorPageEnabled(req);
 
-	if (friendlyErrorPagesEnabled(req)) {
+	if (!psg_lstr_cmp(path, StaticString(""))) {
+		try {
+			data = renderer.renderCustom(StaticString(path->start->data, path->size));
+		} catch (const SystemException &e2) {
+			SKC_ERROR(client, "Cannot render an error page: " << e2.what() <<
+				"\n" << e2.backtrace());
+			data = "<h2>Internal server error</h2>";
+		}
+	} else if (friendlyErrorPagesEnabled(req)) {
 		try {
 			data = renderer.renderWithDetails(e);
 		} catch (const SystemException &e2) {
@@ -373,6 +383,19 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), statusCode);
 }
 
+const LString*
+Controller::customErrorPageEnabled(Request *req) {
+	const StaticString name = "!~PASSENGER_CUSTOM_ERROR_PAGE";
+	LString* customErrorPagePath = req->secureHeaders.lookup(name);
+    if (customErrorPagePath != NULL && customErrorPagePath->size > 0) {
+        return psg_lstr_make_contiguous(customErrorPagePath, req->pool);
+    } else {
+        customErrorPagePath = (LString *) psg_palloc(req->pool, sizeof(LString));
+        psg_lstr_init(customErrorPagePath);
+		return customErrorPagePath;
+    }
+}
+
 bool
 Controller::friendlyErrorPagesEnabled(Request *req) {
 	bool defaultValue;

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

@@ -88,6 +88,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   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_custom_error_page                           string             -          default("")
  *   default_environment                                 string             -          default("production")
  *   default_force_max_concurrent_requests_per_process   integer            -          default(-1)
  *   default_friendly_error_pages                        string             -          default("auto")
@@ -116,7 +117,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/6.0.22")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.24")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -161,6 +162,7 @@ private:
 		add("server_software", STRING_TYPE, OPTIONAL, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 		add("vary_turbocache_by_cookie", STRING_TYPE, OPTIONAL);
 
+		add("default_custom_error_page", STRING_TYPE, OPTIONAL, "");
 		add("default_friendly_error_pages", STRING_TYPE, OPTIONAL, "auto");
 		add("default_environment", STRING_TYPE, OPTIONAL, DEFAULT_APP_ENV);
 		add("default_spawn_method", STRING_TYPE, OPTIONAL, DEFAULT_SPAWN_METHOD);
@@ -428,6 +430,7 @@ public:
 	StaticString defaultStickySessionsCookieAttributes;
 	StaticString defaultVaryTurbocacheByCookie;
 
+	StaticString defaultCustomErrorPage;
 	StaticString defaultFriendlyErrorPages;
 	StaticString defaultEnvironment;
 	StaticString defaultSpawnMethod;
@@ -463,6 +466,7 @@ public:
 		  defaultStickySessionsCookieAttributes(psg_pstrdup(pool, config["default_sticky_sessions_cookie_attributes"].asString())),
 		  defaultVaryTurbocacheByCookie(psg_pstrdup(pool, config["vary_turbocache_by_cookie"].asString())),
 
+		  defaultCustomErrorPage(psg_pstrdup(pool, config["default_custom_error_page"].asString())),
 		  defaultFriendlyErrorPages(psg_pstrdup(pool, config["default_friendly_error_pages"].asString())),
 		  defaultEnvironment(psg_pstrdup(pool, config["default_environment"].asString())),
 		  defaultSpawnMethod(psg_pstrdup(pool, config["default_spawn_method"].asString())),

data/src/agent/Core/Controller.h

@@ -216,6 +216,7 @@ private:
 		const ExceptionPtr &e);
 	void endRequestWithErrorResponse(Client **c, Request **r,
 		const SpawningKit::SpawnException &e, int statusCode);
+	const LString* customErrorPageEnabled(Request *req);
 	bool friendlyErrorPagesEnabled(Request *req);
 
 

data/src/agent/Core/CoreMain.cpp

@@ -85,7 +85,6 @@
 #include <AppTypeDetector/Detector.h>
 #include <IOTools/MessageSerialization.h>
 #include <FileDescriptor.h>
-#include <ResourceLocator.h>
 #include <BackgroundEventLoop.cpp>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathSecurityCheck.h>
@@ -145,7 +144,6 @@ namespace Core {
 
 		boost::mutex configSyncher;
 
-		ResourceLocator resourceLocator;
 		RandomGeneratorPtr randomGenerator;
 		SpawningKit::Context::Schema spawningKitContextSchema;
 		SpawningKit::ContextPtr spawningKitContext;
@@ -697,8 +695,6 @@ initializeNonPrivilegedWorkingObjects() {
 
 	setenv("SERVER_SOFTWARE", coreConfig->get("server_software").asCString(), 1);
 
-	wo->resourceLocator = ResourceLocator(coreConfig->get("passenger_root").asString());
-
 	wo->randomGenerator = boost::make_shared<RandomGenerator>();
 	// Check whether /dev/urandom is actually random.
 	// https://code.google.com/p/phusion-passenger/issues/detail?id=516
@@ -710,7 +706,7 @@ initializeNonPrivilegedWorkingObjects() {
 	UPDATE_TRACE_POINT();
 	wo->spawningKitContext = boost::make_shared<SpawningKit::Context>(
 		wo->spawningKitContextSchema);
-	wo->spawningKitContext->resourceLocator = &wo->resourceLocator;
+	wo->spawningKitContext->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	wo->spawningKitContext->wrapperRegistry = coreWrapperRegistry;
 	wo->spawningKitContext->randomGenerator = wo->randomGenerator;
 	wo->spawningKitContext->integrationMode = coreConfig->get("integration_mode").asString();
@@ -772,7 +768,7 @@ initializeNonPrivilegedWorkingObjects() {
 			&coreSchema->controllerSingleAppMode.schema,
 			&wo->singleAppModeConfig,
 			coreSchema->controllerSingleAppMode.translator);
-		two.controller->resourceLocator = &wo->resourceLocator;
+		two.controller->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 		two.controller->wrapperRegistry = coreWrapperRegistry;
 		two.controller->appPool = wo->appPool;
 		two.controller->shutdownFinishCallback = controllerShutdownFinished;
@@ -877,7 +873,7 @@ initializeSecurityUpdateChecker() {
 		config,
 		coreSchema->securityUpdateChecker.translator);
 	workingObjects->securityUpdateChecker = checker;
-	checker->resourceLocator = &workingObjects->resourceLocator;
+	checker->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	checker->initialize();
 	checker->start();
 }
@@ -927,7 +923,7 @@ initializeAdminPanelConnector() {
 	AdminPanelConnector *connector = new Core::AdminPanelConnector(
 		coreSchema->adminPanelConnector.schema, config,
 		coreSchema->adminPanelConnector.translator);
-	connector->resourceLocator = &wo.resourceLocator;
+	connector->resourceLocator = Agent::Fundamentals::context->resourceLocator;
 	connector->appPool = wo.appPool;
 	connector->configGetter = inspectConfig;
 	for (unsigned int i = 0; i < wo.threadWorkingObjects.size(); i++) {
@@ -956,7 +952,7 @@ prestartWebApps() {
 	}
 
 	boost::function<void ()> func = boost::bind(prestartWebApps,
-		wo->resourceLocator,
+		*Agent::Fundamentals::context->resourceLocator,
 		coreConfig->get("default_ruby").asString(),
 		prestartURLs
 	);
@@ -983,7 +979,7 @@ warnIfPassengerRootVulnerable() {
 		return; // Passenger is not root, so no escalation.
 	}
 
-	string root = workingObjects->resourceLocator.getInstallSpec();
+	string root = Agent::Fundamentals::context->resourceLocator->getInstallSpec();
 	vector<string> errors, checkErrors;
 	if (isPathProbablySecureForRootUse(root, errors, checkErrors)) {
 		if (!checkErrors.empty()) {
@@ -1400,13 +1396,10 @@ parseOptions(int argc, const char *argv[], ConfigKit::Store &config) {
 		}
 	}
 
-	if (!updates.empty()) {
-		vector<ConfigKit::Error> errors;
-		if (!config.update(updates, errors)) {
-			P_BUG("Unable to set initial configuration: " <<
-				ConfigKit::toString(errors) << "\n"
-				"Raw initial configuration: " << updates.toStyledString());
-		}
+	vector<ConfigKit::Error> errors;
+	if (!config.update(updates, errors)) {
+		P_ERROR("*** Error in options: " << ConfigKit::toString(errors));
+		std::exit(1);
 	}
 }
 

data/src/agent/Core/OptionParser.h

@@ -339,6 +339,9 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isFlag(argv[i], '\0', "--multi-app")) {
 		updates["multi_app"] = true;
 		i++;
+	} else if (p.isFlag(argv[i], '\0', "--custom-error-page")) {
+		updates["custom_error_page"] = argv[i + 1];
+		i+=2;
 	} else if (p.isFlag(argv[i], '\0', "--force-friendly-error-pages")) {
 		updates["default_friendly_error_pages"] = true;
 		i++;

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

@@ -33,6 +33,7 @@
 #include <jsoncpp/json.h>
 
 #include <Constants.h>
+#include <DataStructures/LString.h>
 #include <StaticString.h>
 #include <FileTools/FileManip.h>
 #include <StrIntTools/Template.h>
@@ -108,6 +109,10 @@ public:
 
 		return Template::apply(unsafeReadFile(htmlFile), params);
 	}
+
+	string renderCustom(const StaticString &htmlFile) const {
+		return unsafeReadFile(htmlFile);
+	}
 };
 
 

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

@@ -30,9 +30,7 @@
 #include <boost/thread.hpp>
 #include <boost/scoped_array.hpp>
 #include <string>
-#include <vector>
-#include <stdexcept>
-#include <algorithm>
+#include <exception>
 #include <utility>
 #include <cerrno>
 #include <cstddef>
@@ -45,7 +43,6 @@
 #include <pwd.h>
 #include <grp.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include <jsoncpp/json.h>
 
@@ -350,55 +347,6 @@ private:
 		}
 	}
 
-	#if 0
-	void inferApplicationInfo() const {
-		TRACE_POINT();
-		session.result.codeRevision = readFromRevisionFile();
-		if (session.result.codeRevision.empty()) {
-			session.result.codeRevision = inferCodeRevisionFromCapistranoSymlink();
-		}
-	}
-
-	string readFromRevisionFile() const {
-		TRACE_POINT();
-		string filename = config->appRoot + "/REVISION";
-		try {
-			if (fileExists(filename)) {
-				return strip(readAll(filename));
-			}
-		} catch (const SystemException &e) {
-			P_WARN("Cannot access " << filename << ": " << e.what());
-		}
-		return string();
-	}
-
-	string inferCodeRevisionFromCapistranoSymlink() const {
-		TRACE_POINT();
-		if (extractBaseName(config->appRoot) == "current") {
-			string appRoot = config->appRoot.toString(); // null terminate string
-			char buf[PATH_MAX + 1];
-			ssize_t ret;
-
-			do {
-				ret = readlink(appRoot.c_str(), buf, PATH_MAX);
-			} while (ret == -1 && errno == EINTR);
-			if (ret == -1) {
-				if (errno == EINVAL) {
-					return string();
-				} else {
-					int e = errno;
-					P_WARN("Cannot read symlink " << appRoot << ": " << strerror(e));
-				}
-			}
-
-			buf[ret] = '\0';
-			return extractBaseName(buf);
-		} else {
-			return string();
-		}
-	}
-	#endif
-
 	void findFreePortOrSocketFile() {
 		TRACE_POINT();
 		session.expectedStartPort = findFreePort();

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

@@ -89,6 +89,9 @@ struct HandshakeSession {
 		{ }
 
 	~HandshakeSession() {
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
+
 		if (workDirFd != -1) {
 			safelyClose(workDirFd, true);
 		}

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

@@ -31,11 +31,12 @@
 #include <cerrno>
 
 #include <sys/types.h>
-#include <limits.h>
+#include <limits.h> // IWYU pragma: keep; for PATH_MAX
 #include <unistd.h>
 
 #include <Exceptions.h>
 #include <Utils.h>
+#include <FileTools/FileManip.h>
 #include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
@@ -78,6 +79,8 @@ public:
 
 	~HandshakeWorkDir() {
 		if (!path.empty()) {
+			boost::this_thread::disable_interruption di;
+			boost::this_thread::disable_syscall_interruption dsi;
 			removeDirTree(path);
 		}
 	}
@@ -108,7 +111,7 @@ public:
 		// dropping root privileges).
 		boost::this_thread::disable_interruption di;
 		boost::this_thread::disable_syscall_interruption dsi;
-		syscalls::chown(path.c_str(), uid, gid);
+		oxt::syscalls::chown(path.c_str(), uid, gid);
 	}
 };
 

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

@@ -33,12 +33,12 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <stdexcept>
+#include <exception>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <signal.h>
+#include <signal.h> // IWYU pragma: keep; for signal constants
 #include <unistd.h>
 #include <cstring>
 #include <cassert>
@@ -66,6 +66,10 @@
 #include <Core/SpawningKit/Handshake/Perform.h>
 #include <Core/SpawningKit/Handshake/BackgroundIOCapturer.h>
 
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Options.h>
+#endif
+
 namespace Passenger {
 namespace SpawningKit {
 

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

@@ -38,6 +38,10 @@
 #include <Core/SpawningKit/Result.h>
 #include <Core/SpawningKit/UserSwitchingRules.h>
 
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Options.h>
+#endif
+
 namespace Passenger {
 namespace SpawningKit {