passenger 5.3.4 → 5.3.5

data/src/cxx_supportlib/ProcessManagement/Ruby.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.
@@ -28,6 +28,7 @@
 
 #include <string>
 #include <vector>
+#include <limits>
 #include <cstddef>
 
 namespace Passenger {
@@ -35,6 +36,7 @@ namespace Passenger {
 using namespace std;
 
 class ResourceLocator;
+struct SubprocessOutput;
 
 
 /**
@@ -48,12 +50,15 @@ class ResourceLocator;
  *               When unable to waitpid() the child process because of an ECHILD
  *               or ESRCH, this will be set to -1.
  * @param output The output of the child process will be stored here, if non-NULL.
+ * @param maxOutputSize The maximum number of output bytes to read. Only applicable if
+ *                      `output` is non-NULL.
  * @throws RuntimeException
  * @throws SystemException
  */
 void runInternalRubyTool(const ResourceLocator &resourceLocator,
 	const string &ruby, const vector<string> &args,
-	int *status = NULL, string *output = NULL);
+	int *status = NULL, SubprocessOutput *output = NULL,
+	size_t maxOutputSize = std::numeric_limits<size_t>::max());
 
 
 } // namespace Passenger

data/src/cxx_supportlib/ProcessManagement/Spawn.cpp

@@ -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.
@@ -33,6 +33,7 @@
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <string>
+#include <algorithm>
 #include <cerrno>
 
 #include <ProcessManagement/Spawn.h>
@@ -110,7 +111,7 @@ runCommand(const char **command, SubprocessInfo &info, bool wait, bool killSubpr
 
 void
 runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
-	string &output, bool killSubprocessOnInterruption,
+	SubprocessOutput &output, size_t maxSize, bool killSubprocessOnInterruption,
 	const boost::function<void ()> &afterFork,
 	const boost::function<void (const char **command, int errcode)> &onExecFail)
 {
@@ -140,15 +141,17 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 		e = errno;
 		throw SystemException("Cannot fork() a new process", e);
 	} else {
-		bool done = false;
+		size_t totalRead = 0;
 
+		output.eof = false;
 		p[1].close();
-		while (!done) {
+		while (totalRead < maxSize) {
 			char buf[1024 * 4];
 			ssize_t ret;
 
 			try {
-				ret = syscalls::read(p[0], buf, sizeof(buf));
+				ret = syscalls::read(p[0], buf,
+					std::min<size_t>(sizeof(buf), maxSize - totalRead));
 			} catch (const boost::thread_interrupted &) {
 				if (killSubprocessOnInterruption) {
 					boost::this_thread::disable_syscall_interruption dsi;
@@ -166,9 +169,13 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 				}
 				throw SystemException(string("Cannot read output from the '") +
 					command[0] + "' command", e);
+			} else if (ret == 0) {
+				output.eof = true;
+				break;
+			} else {
+				totalRead += ret;
+				output.data.append(buf, ret);
 			}
-			done = ret == 0;
-			output.append(buf, ret);
 		}
 		p[0].close();
 

data/src/cxx_supportlib/ProcessManagement/Spawn.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.
@@ -67,6 +67,24 @@ struct SubprocessInfo {
 		{ }
 };
 
+struct SubprocessOutput {
+	/**
+	 * The read subprocess output data.
+	 */
+	string data;
+
+	/**
+	 * Whether the entire file has been read. If false, then it
+	 * means there is more data than specified through the `maxSize`
+	 * parameter.
+	 */
+	bool eof;
+
+	SubprocessOutput()
+		: eof(false)
+		{ }
+};
+
 
 // See ProcessManagement/Utils.h for definition
 void printExecError(const char **command, int errcode);
@@ -132,6 +150,7 @@ void runCommand(const char **command, SubprocessInfo &info,
  *
  * @param command The argument array to pass to execvp(). Must be null-terminated.
  * @param info
+ * @param maxSize The maximum number of output bytes to read.
  * @param killSubprocessOnInterruption Whether to automatically kill the subprocess
  *   when this function is interrupted.
  * @param afterFork A function object to be called right after forking.
@@ -140,7 +159,7 @@ void runCommand(const char **command, SubprocessInfo &info,
  * @throws boost::thread_interrupted
  */
 void runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
-	string &output, bool killSubprocessOnInterruption = true,
+	SubprocessOutput &output, size_t maxSize, bool killSubprocessOnInterruption = true,
 	const boost::function<void ()> &afterFork = boost::function<void ()>(),
 	const boost::function<void (const char **command, int errcode)> &onExecFail = printExecError);
 

data/src/cxx_supportlib/ResourceLocator.h

@@ -170,7 +170,7 @@ public:
 		return buildSystemDir;
 	}
 
-	string findSupportBinary(const string &name) {
+	string findSupportBinary(const string &name) const {
 		string path = getSupportBinariesDir() + "/" + name;
 		bool found;
 		try {

data/src/cxx_supportlib/ServerKit/ClientRef.h

@@ -80,9 +80,13 @@ public:
 
 	explicit
 	ClientRef(BOOST_RV_REF(ClientRef) ref)
-		: client(ref.client)
+		: client(ref.client),
+		  file(ref.file),
+		  line(ref.line)
 	{
 		ref.client = NULL;
+		ref.file = NULL;
+		ref.line = 0;
 	}
 
 	~ClientRef() {
@@ -96,7 +100,7 @@ public:
 	}
 
 	ClientRef &operator=(BOOST_COPY_ASSIGN_REF(ClientRef) ref) {
-		if (client == ref.client) {
+		if (this != &ref) {
 			Client *oldClient = client;
 			const char *oldFile = file;
 			unsigned int oldLine = line;
@@ -114,11 +118,17 @@ public:
 	}
 
 	ClientRef &operator=(BOOST_RV_REF(ClientRef) ref) {
-		Client *oldClient = client;
-		client = ref.client;
-		ref.client = NULL;
-		if (oldClient != NULL) {
-			getServer(oldClient)->_unrefClient(oldClient, file, line);
+		if (this != &ref) {
+			Client *oldClient = client;
+			client = ref.client;
+			file = ref.file;
+			line = ref.line;
+			ref.client = NULL;
+			ref.file = NULL;
+			ref.line = 0;
+			if (oldClient != NULL) {
+				getServer(oldClient)->_unrefClient(oldClient, file, line);
+			}
 		}
 		return *this;
 	}

data/src/cxx_supportlib/ServerKit/HttpRequestRef.h

@@ -80,9 +80,13 @@ public:
 
 	explicit
 	HttpRequestRef(BOOST_RV_REF(HttpRequestRef) ref)
-		: request(ref.request)
+		: request(ref.request),
+		  file(ref.file),
+		  line(ref.line)
 	{
 		ref.request = NULL;
+		ref.file = NULL;
+		ref.line = 0;
 	}
 
 	~HttpRequestRef() {
@@ -96,7 +100,7 @@ public:
 	}
 
 	HttpRequestRef &operator=(BOOST_COPY_ASSIGN_REF(HttpRequestRef) ref) {
-		if (request == ref.request) {
+		if (this != &ref) {
 			Request *oldRequest = request;
 			const char *oldFile = file;
 			unsigned int oldLine = line;
@@ -114,11 +118,17 @@ public:
 	}
 
 	HttpRequestRef &operator=(BOOST_RV_REF(HttpRequestRef) ref) {
-		Request *oldRequest = request;
-		request = ref.request;
-		ref.request = NULL;
-		if (oldRequest != NULL) {
-			getServer(oldRequest)->_unrefRequest(oldRequest, file, line);
+		if (this != &ref) {
+			Request *oldRequest = request;
+			request = ref.request;
+			file = ref.file;
+			line = ref.line;
+			ref.request = NULL;
+			ref.file = NULL;
+			ref.line = 0;
+			if (oldRequest != NULL) {
+				getServer(oldRequest)->_unrefRequest(oldRequest, file, line);
+			}
 		}
 		return *this;
 	}

data/src/cxx_supportlib/Utils/IOUtils.cpp

@@ -1363,7 +1363,8 @@ readAll(int fd, size_t maxSize) {
 
 	while (result.size() < maxSize) {
 		do {
-			ret = read(fd, buf, sizeof(buf));
+			ret = read(fd, buf, std::min<size_t>(sizeof(buf),
+				maxSize - result.size()));
 		} while (ret == -1 && errno == EINTR);
 		if (ret == 0) {
 			eofReached = true;

data/src/cxx_supportlib/Utils/ProcessMetricsCollector.h

@@ -321,18 +321,21 @@ public:
 			NULL
 		};
 
-		string psOutput = this->psOutput;
-		if (psOutput.empty()) {
+		SubprocessOutput psOutput;
+		psOutput.data = this->psOutput;
+		if (psOutput.data.empty()) {
 			SubprocessInfo info;
-			runCommandAndCaptureOutput(command, info, psOutput, true, afterFork);
-			if (psOutput.empty()) {
+			runCommandAndCaptureOutput(command, info, psOutput,
+				1024 * 1024, true, afterFork);
+			if (psOutput.data.empty()) {
 				throw RuntimeException("The 'ps' command failed");
 			}
 		}
 		pidsArg.resize(0);
 		fmtArg.resize(0);
-		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(psOutput, pids);
-		psOutput.resize(0);
+		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(
+			psOutput.data, pids);
+		psOutput.data.resize(0);
 		if (canMeasureRealMemory) {
 			ProcessMetricMap::iterator it;
 			for (it = result.begin(); it != result.end(); it++) {

data/src/cxx_supportlib/WrapperRegistry/CBindings.cpp

@@ -0,0 +1,85 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#include <new>
+#include <exception>
+
+#include <WrapperRegistry/CBindings.h>
+#include <WrapperRegistry/Entry.h>
+#include <WrapperRegistry/Registry.h>
+
+using namespace Passenger;
+using namespace Passenger::WrapperRegistry;
+
+
+int
+psg_wrapper_registry_entry_is_null(const PsgWrapperRegistryEntry *entry) {
+	const Entry *cxxEntry = static_cast<const Entry *>(entry);
+	return (int) cxxEntry->isNull();
+}
+
+const char *
+psg_wrapper_registry_entry_get_language(const PsgWrapperRegistryEntry *entry, size_t *len) {
+	const Entry *cxxEntry = static_cast<const Entry *>(entry);
+	if (len != NULL) {
+		*len = cxxEntry->language.size();
+	}
+	return cxxEntry->language.data();
+}
+
+
+PsgWrapperRegistry *
+psg_wrapper_registry_new() {
+	try {
+		return static_cast<PsgWrapperRegistry *>(new Registry());
+	} catch (const std::bad_alloc &) {
+		return NULL;
+	}
+}
+
+void
+psg_wrapper_registry_free(PsgWrapperRegistry *registry) {
+	Registry *cxxRegistry = static_cast<Registry *>(registry);
+	delete cxxRegistry;
+}
+
+void
+psg_wrapper_registry_finalize(PsgWrapperRegistry *registry) {
+	Registry *cxxRegistry = static_cast<Registry *>(registry);
+	cxxRegistry->finalize();
+}
+
+const PsgWrapperRegistryEntry *
+psg_wrapper_registry_lookup(PsgWrapperRegistry *registry,
+	const char *name, size_t size)
+{
+	const Registry *cxxRegistry = static_cast<const Registry *>(registry);
+	if (size == (size_t) -1) {
+		size = strlen(name);
+	}
+	return static_cast<const PsgWrapperRegistryEntry *>(
+		&cxxRegistry->lookup(StaticString(name, size)));
+}

data/src/cxx_supportlib/WrapperRegistry/CBindings.h

@@ -0,0 +1,56 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_
+#define _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+
+typedef void PsgWrapperRegistryEntry;
+
+int psg_wrapper_registry_entry_is_null(const PsgWrapperRegistryEntry *entry);
+const char *psg_wrapper_registry_entry_get_language(const PsgWrapperRegistryEntry *entry, size_t *len);
+
+
+typedef void PsgWrapperRegistry;
+
+PsgWrapperRegistry *psg_wrapper_registry_new();
+void psg_wrapper_registry_free(PsgWrapperRegistry *registry);
+
+void psg_wrapper_registry_finalize(PsgWrapperRegistry *registry);
+const PsgWrapperRegistryEntry *psg_wrapper_registry_lookup(PsgWrapperRegistry *registry,
+	const char *name, size_t size);
+
+
+#ifdef __cplusplus
+	} // extern "C"
+#endif
+
+#endif /* _PASSENGER_WRAPPER_REGISTRY_CBINDINGS_H_ */

data/src/cxx_supportlib/WrapperRegistry/Entry.h

@@ -0,0 +1,112 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_
+#define _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_
+
+#include <boost/container/small_vector.hpp>
+#include <StaticString.h>
+
+namespace Passenger {
+namespace WrapperRegistry {
+
+using namespace std;
+
+
+struct Entry {
+	/**
+	 * A identifier-like name for this language. All-lowercase, no spaces.
+	 * Related to passenger_app_type.
+	 * Example: "ruby"
+	 */
+	StaticString language;
+
+	/**
+	 * A human-readable name for this language.
+	 * Example: "Ruby"
+	 */
+	StaticString languageDisplayName;
+
+	/**
+	 * Path to the wrapper to use. If `suppliedByThirdParty` is false, then
+	 * the path is considered relative to helperScriptsDir.
+	 */
+	StaticString path;
+
+	/**
+	 * The title that spawned processes for this language should assume.
+	 * Example: "Passenger RubyApp"
+	 */
+	StaticString processTitle;
+
+	/**
+	 * A default command for the interpreter of this language.
+	 * Will be looked up in $PATH.
+	 * Example: "ruby"
+	 */
+	StaticString defaultInterpreter;
+
+	/**
+	 * A list of startup file names that we should look for
+	 * in order to autodetect whether an app belongs to this
+	 * language. Any of these files are also considered to be
+	 * the entrypoint to the app.
+	 * Example: "config.ru", "index.js", "app.js"
+	 */
+	boost::container::small_vector<StaticString, 2> defaultStartupFiles;
+
+	bool suppliedByThirdParty;
+
+	Entry()
+		: suppliedByThirdParty(false)
+		{ }
+
+	// In C++98, `boost::container::small_vector` causes our default
+	// assignment operator to become `operator=(Entry &)`, which is
+	// incompatible with the Registry's usage of StringKeyTable.
+	// We fix this by writing out own assignment operator.
+	Entry &operator=(const Entry &other) {
+		if (this != &other) {
+			language = other.language;
+			languageDisplayName = other.languageDisplayName;
+			path = other.path;
+			processTitle = other.processTitle;
+			defaultInterpreter = other.defaultInterpreter;
+			defaultStartupFiles = other.defaultStartupFiles;
+			suppliedByThirdParty = other.suppliedByThirdParty;
+		}
+		return *this;
+	}
+
+	bool isNull() const {
+		return language.empty();
+	}
+};
+
+
+} // namespace WrapperRegistry
+} // namespace Passenger
+
+#endif /* _PASSENGER_WRAPPER_REGISTRY_WRAPPER_H_ */