passenger 5.1.10 → 5.1.11

data/src/cxx_supportlib/Utils.h

@@ -321,73 +321,6 @@ string getHostName();
  */
 string getSignalName(int sig);
 
-/**
- * Resets the current process's signal handler disposition and signal mask
- * to default values. One should call this every time one forks a child process;
- * non-default signal masks/handler dispositions can cause all kinds of weird quirks,
- * like waitpid() malfunctioning on OS X.
- *
- * This function is async-signal safe.
- */
-void resetSignalHandlersAndMask();
-
-/**
- * Disables malloc() debugging facilities on OS X.
- */
-void disableMallocDebugging();
-
-/**
- * Like system(), but properly resets the signal handler mask,
- * disables malloc debugging and closes file descriptors > 2.
- * _command_ must be null-terminated.
- */
-int runShellCommand(const StaticString &command);
-
-/**
- * Run a command and capture its stdout output. This function
- * does not care whether the command fails.
- *
- * @param command The argument to pass to execvp().
- * @param status The status of the child process will be stored here, if non-NULL.
- *               When unable to waitpid() the child process because of an ECHILD
- *               or ESRCH, this will be set to -1.
- * @throws SystemException
- */
-string runCommandAndCaptureOutput(const char **command, int *status = NULL);
-
-/**
- * Async-signal safe way to fork().
- *
- * On Linux, the fork() glibc wrapper grabs a ptmalloc lock, so
- * if malloc causes a segfault then we can't fork.
- * http://sourceware.org/bugzilla/show_bug.cgi?id=4737
- *
- * OS X apparently does something similar, except they use a
- * spinlock so it results in 100% CPU. See _cthread_fork_prepare()
- * at http://www.opensource.apple.com/source/Libc/Libc-166/threads.subproj/cthreads.c
- * However, since POSIX in OS X is implemented on top of a Mach layer,
- * calling asyncFork() can mess up the state of the Mach layer, causing
- * some POSIX functions to mysteriously fail. See
- * https://code.google.com/p/phusion-passenger/issues/detail?id=1094
- * You should therefore not use asyncFork() unless you're in a signal
- * handler.
- */
-pid_t asyncFork();
-
-/**
- * Close all file descriptors that are higher than <em>lastToKeepOpen</em>.
- *
- * If you set `asyncSignalSafe` to true, then this function becomes fully async-signal,
- * through the use of asyncFork() instead of fork(). However, read the documentation
- * for asyncFork() to learn about its caveats.
- *
- * Also, regardless of whether `asyncSignalSafe` is true or not, this function is not
- * *thread* safe. Make sure there are no other threads running that might open file
- * descriptors, otherwise some file descriptors might not be closed even though they
- * should be.
- */
-void closeAllFileDescriptors(int lastToKeepOpen, bool asyncSignalSafe = false);
-
 /**
  * A no-op, but usually set as a breakpoint in gdb. See CONTRIBUTING.md.
  */
@@ -396,4 +329,3 @@ void breakpoint();
 } // namespace Passenger
 
 #endif /* _PASSENGER_UTILS_H_ */
-

data/src/cxx_supportlib/Utils/AsyncSignalSafeUtils.h

@@ -0,0 +1,187 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2017 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_ASYNC_SIGNAL_SAFE_UTILS_H_
+#define _PASSENGER_ASYNC_SIGNAL_SAFE_UTILS_H_
+
+#include <cstdio>
+#include <cerrno>
+#include <unistd.h>
+
+// We reimplement libc and some of our own utility functions here
+// in an async signal-safe manner.
+
+namespace Passenger {
+namespace AsyncSignalSafeUtils {
+
+using namespace std;
+
+
+inline size_t
+strlen(const char *str) {
+	size_t size = 0;
+	while (*str != '\0') {
+		str++;
+		size++;
+	}
+	return size;
+}
+
+// Just like the normal memcpy(), dest and src may not overlap.
+inline void *
+memcpy(void *dest, const void *src, size_t n) {
+	for (size_t i = 0; i < n; i++) {
+		((char *) dest)[i] = ((const char *) src)[i];
+	}
+	return dest;
+}
+
+// In an async-signal-safe environment, there's nothing we can do if we fail to
+// write to stderr, so we ignore its return value and we ignore compiler
+// warnings about ignoring that.
+inline void
+writeNoWarn(int fd, const void *buf, size_t n) {
+	ssize_t ret = ::write(fd, buf, n);
+	(void) ret;
+}
+
+inline void
+printError(const char *message, size_t len = (size_t) -1) {
+	if (len == (size_t) -1) {
+		len = strlen(message);
+	}
+	writeNoWarn(STDERR_FILENO, message, len);
+}
+
+inline void
+reverseString(char *str, size_t len) {
+	char *p1, *p2;
+	if (len > 0 && *str == '\0') {
+		return;
+	}
+	for (p1 = str, p2 = str + len - 1; p2 > p1; ++p1, --p2) {
+		*p1 ^= *p2;
+		*p2 ^= *p1;
+		*p1 ^= *p2;
+	}
+}
+
+/**
+ * Convert the given integer to some other radix, placing
+ * the result into the given output buffer. The output buffer
+ * will be NULL terminated. Supported radices are 2-36.
+ *
+ * @param outputSize The size of the output buffer, including space for
+ *                   the terminating NULL.
+ * @return The size of the created string excluding terminating NULL,
+ *         or 0 if the output buffer is not large enough.
+ */
+template<typename IntegerType, int radix>
+size_t
+integerToOtherBase(IntegerType value, char *output, size_t outputSize) {
+	static const char chars[] = {
+		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+		'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+		'u', 'v', 'w', 'x', 'y', 'z'
+	};
+	IntegerType remainder = value;
+	unsigned int size = 0;
+
+	do {
+		output[size] = chars[remainder % radix];
+		remainder = remainder / radix;
+		size++;
+	} while (remainder != 0 && size < outputSize - 1);
+
+	if (remainder == 0) {
+		reverseString(output, size);
+		output[size] = '\0';
+		return size;
+	} else {
+		return 0;
+	}
+}
+
+inline char *
+appendData(char *pos, const char *end, const char *data, size_t size = (size_t) -1) {
+	size_t maxToCopy;
+	if (size == (size_t) -1) {
+		size = strlen(data);
+	}
+	if (size_t(end - pos) < size) {
+		maxToCopy = end - pos;
+	} else {
+		maxToCopy = size;
+	}
+	memcpy(pos, data, maxToCopy);
+	return pos + size;
+}
+
+template<typename IntegerType, int radix>
+inline char *
+appendInteger(char *pos, const char *end, IntegerType value) {
+	return pos + integerToOtherBase<IntegerType, radix>(value, pos, end - pos);
+}
+
+/**
+ * Like `strerror()`, but only supports a limited number of errno codes.
+ * If the errno code is not supported then it returns `defaultResult`.
+ */
+inline const char *
+limitedStrerror(int e, const char *defaultResult = "Unknown error") {
+	switch (e) {
+	case E2BIG:
+		return "Argument list too long";
+	case EACCES:
+		return "Permission denied";
+	case EFAULT:
+		return "Bad address";
+	case EIO:
+		return "Input/output error";
+	case ELOOP:
+		return "Too many levels of symbolic links";
+	case ENAMETOOLONG:
+		return "File name too long";
+	case ENOENT:
+		return "No such file or directory";
+	case ENOEXEC:
+		return "Exec format error";
+	case ENOMEM:
+		return "Cannot allocate memory";
+	case ENOTDIR:
+		return "Not a directory";
+	case ETXTBSY:
+		return "Text file busy";
+	default:
+		return defaultResult;
+	}
+}
+
+
+} // namespace AsyncSignalSafeUtils
+} // namespace Passenger
+
+#endif /* _PASSENGER_ASYNC_SIGNAL_SAFE_UTILS_H_ */

data/src/cxx_supportlib/Utils/ProcessMetricsCollector.h

@@ -60,7 +60,7 @@
 
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils.h>
+#include <ProcessManagement/Spawn.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/IOUtils.h>
 #include <Utils/StringScanning.h>
@@ -249,6 +249,17 @@ private:
 		return result;
 	}
 
+	static void afterFork() {
+		// Make ps nicer, we want to have as little impact on the rest
+		// of the system as possible while collecting the metrics.
+		int prio = getpriority(PRIO_PROCESS, getpid());
+		prio++;
+		if (prio > 20) {
+			prio = 20;
+		}
+		setpriority(PRIO_PROCESS, getpid(), prio);
+	}
+
 public:
 	ProcessMetricsCollector() {
 		#ifdef __APPLE__
@@ -311,7 +322,8 @@ public:
 
 		string psOutput = this->psOutput;
 		if (psOutput.empty()) {
-			psOutput = runCommandAndCaptureOutput(command);
+			SubprocessInfo info;
+			runCommandAndCaptureOutput(command, info, psOutput, true, afterFork);
 			if (psOutput.empty()) {
 				throw RuntimeException("The 'ps' command failed");
 			}

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -106,6 +106,7 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 #include <ResourceLocator.h>
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
+#include <ProcessManagement/Utils.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/MessageIO.h>
@@ -148,15 +149,6 @@ class WatchdogLauncher {
 	P_RO_PROPERTY_CONST_REF(private, string, CoreAddress);
 	P_RO_PROPERTY_CONST_REF(private, string, CorePassword);
 
-	/**
-	 * The address on which the Passenger UstRouter listens, and the
-	 * corresponding password.
-	 *
-	 * Only valid when `getPid() != 0`.
-	 */
-	P_RO_PROPERTY_CONST_REF(private, string, UstRouterAddress);
-	P_RO_PROPERTY_CONST_REF(private, string, UstRouterPassword);
-
 	/**
 	 * The path to the instance directory that the Watchdog has created.
 	 *
@@ -396,7 +388,7 @@ public:
 
 			// Make sure the feedback fd is 3 and close all file descriptors
 			// except stdin, stdout, stderr and 3.
-			syscalls::close(fds[0]);
+			close(fds[0]);
 			installFeedbackFd(fds[1]);
 			closeAllFileDescriptors(FEEDBACK_FD);
 
@@ -498,8 +490,6 @@ public:
 				mCoreAddress       = info.get("core_address");
 				mCorePassword      = info.get("core_password");
 				mInstanceDir       = info.get("instance_dir");
-				mUstRouterAddress  = info.get("ust_router_address");
-				mUstRouterPassword = info.get("ust_router_password");
 				guard.clear();
 			} else if (args[0] == "Watchdog startup error") {
 				killProcessGroupAndWait(&pid, 5000);

data/src/cxx_supportlib/oxt/dynamic_thread_group.hpp

@@ -210,7 +210,7 @@ public:
 		unsigned int i = 0;
 
 		// We make a copy so that the handles aren't destroyed prematurely.
-		threads.reserve(nthreads);
+		threads.resize(nthreads);
 		thread_handles_copy = thread_handles;
 		for (it = thread_handles.begin(); it != thread_handles.end(); it++, i++) {
 			handle = *it;
@@ -235,7 +235,7 @@ public:
 		unsigned int i = 0;
 
 		// We make a copy so that the handles aren't destroyed prematurely.
-		threads.reserve(nthreads);
+		threads.resize(nthreads);
 		thread_handles_copy = thread_handles;
 		for (it = thread_handles.begin(); it != thread_handles.end(); it++, i++) {
 			handle = *it;

data/src/cxx_supportlib/vendor-modified/jsoncpp/json-forwards.h

@@ -231,6 +231,7 @@ license you like.
 
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
+namespace Passenger {
 namespace Json {
 typedef int Int;
 typedef unsigned int UInt;
@@ -265,6 +266,7 @@ typedef UInt64 LargestUInt;
 #define JSONCPP_ISTREAM       std::istream
 #endif // if JSONCPP_USING_SECURE_MEMORY
 } // end namespace Json
+} // end namespace Passenger
 
 #endif // JSON_CONFIG_H_INCLUDED
 
@@ -293,6 +295,7 @@ typedef UInt64 LargestUInt;
 #include "config.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
+namespace Passenger {
 namespace Json {
 
 // writer.h
@@ -316,6 +319,7 @@ class ValueIterator;
 class ValueConstIterator;
 
 } // namespace Json
+} // namespace Passenger
 
 #endif // JSON_FORWARDS_H_INCLUDED
 

data/src/cxx_supportlib/vendor-modified/jsoncpp/json.h

@@ -264,6 +264,7 @@ license you like.
 
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
+namespace Passenger {
 namespace Json {
 typedef int Int;
 typedef unsigned int UInt;
@@ -298,6 +299,7 @@ typedef UInt64 LargestUInt;
 #define JSONCPP_ISTREAM       std::istream
 #endif // if JSONCPP_USING_SECURE_MEMORY
 } // end namespace Json
+} // end namespace Passenger
 
 #endif // JSON_CONFIG_H_INCLUDED
 
@@ -326,6 +328,7 @@ typedef UInt64 LargestUInt;
 #include "config.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
 
+namespace Passenger {
 namespace Json {
 
 // writer.h
@@ -349,6 +352,7 @@ class ValueIterator;
 class ValueConstIterator;
 
 } // namespace Json
+} // namespace Passenger
 
 #endif // JSON_FORWARDS_H_INCLUDED
 
@@ -379,6 +383,7 @@ class ValueConstIterator;
 
 #pragma pack(push, 8)
 
+namespace Passenger {
 namespace Json {
 
 /** \brief Configuration passed to reader and writer.
@@ -422,6 +427,7 @@ public:
 };
 
 } // namespace Json
+} // namespace Passenger
 
 #pragma pack(pop)
 
@@ -488,6 +494,7 @@ public:
 
 /** \brief JSON (JavaScript Object Notation).
  */
+namespace Passenger {
 namespace Json {
 
 /** Base class for all exceptions we throw.
@@ -1295,12 +1302,13 @@ public:
 };
 
 } // namespace Json
+} // namespace Passenger
 
 
 namespace std {
 /// Specialize std::swap() for Json::Value.
 template<>
-inline void swap(Json::Value& a, Json::Value& b) { a.swap(b); }
+inline void swap(Passenger::Json::Value& a, Passenger::Json::Value& b) { a.swap(b); }
 }
 
 #pragma pack(pop)
@@ -1351,6 +1359,7 @@ inline void swap(Json::Value& a, Json::Value& b) { a.swap(b); }
 
 #pragma pack(push, 8)
 
+namespace Passenger {
 namespace Json {
 
 /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
@@ -1610,6 +1619,7 @@ public:
 
 Usage:
 \code
+  using namespace Passenger;
   using namespace Json;
   CharReaderBuilder builder;
   builder["collectComments"] = false;
@@ -1724,6 +1734,7 @@ bool JSON_API parseFromStream(
 JSON_API JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM&, Value&);
 
 } // namespace Json
+} // namespace Passenger
 
 #pragma pack(pop)
 
@@ -1770,6 +1781,7 @@ JSON_API JSONCPP_ISTREAM& operator>>(JSONCPP_ISTREAM&, Value&);
 
 #pragma pack(push, 8)
 
+namespace Passenger {
 namespace Json {
 
 class Value;
@@ -1778,6 +1790,7 @@ class Value;
 
 Usage:
 \code
+  using namespace Passenger;
   using namespace Json;
   void writeToStdout(StreamWriter::Factory const& factory, Value const& value) {
     std::unique_ptr<StreamWriter> const writer(
@@ -1823,6 +1836,7 @@ JSONCPP_STRING JSON_API writeString(StreamWriter::Factory const& factory, Value
 
 Usage:
 \code
+  using namespace Passenger;
   using namespace Json;
   Value value = ...;
   StreamWriterBuilder builder;
@@ -2073,6 +2087,7 @@ JSONCPP_STRING JSON_API valueToQuotedString(const char* value);
 JSON_API JSONCPP_OSTREAM& operator<<(JSONCPP_OSTREAM&, const Value& root);
 
 } // namespace Json
+} // namespace Passenger
 
 #pragma pack(pop)