passenger 5.1.12 → 5.2.0

data/src/cxx_supportlib/Utils.h

@@ -43,7 +43,6 @@
 #include <unistd.h>
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/LargeFiles.h>
 
 namespace Passenger {
 
@@ -53,24 +52,8 @@ using namespace boost;
 #define foreach         BOOST_FOREACH
 #define reverse_foreach BOOST_REVERSE_FOREACH
 
-static const uid_t USER_NOT_GIVEN = (uid_t) -1;
-static const gid_t GROUP_NOT_GIVEN = (gid_t) -1;
-
-class CachedFileStat;
 class ResourceLocator;
 
-/** Enumeration which indicates what kind of file a file is. */
-typedef enum {
-	/** The file doesn't exist. */
-	FT_NONEXISTANT,
-	/** A regular file or a symlink to a regular file. */
-	FT_REGULAR,
-	/** A directory. */
-	FT_DIRECTORY,
-	/** Something else, e.g. a pipe or a socket. */
-	FT_OTHER
-} FileType;
-
 /**
  * Convenience shortcut for creating a <tt>shared_ptr</tt>.
  * Instead of:
@@ -94,114 +77,6 @@ ptr(T *pointer) {
 	return boost::shared_ptr<T>(pointer);
 }
 
-/**
- * Check whether the specified file exists.
- *
- * @param filename The filename to check.
- * @param cstat A CachedFileStat object, if you want to use cached statting.
- * @param cstatMutex A mutex for locking cstat while this function uses it.
- *                   Makes this function thread-safe. May be NULL.
- * @param throttleRate A throttle rate for cstat. Only applicable if cstat is not NULL.
- * @return Whether the file exists.
- * @throws FileSystemException Unable to check because of a filesystem error.
- * @throws TimeRetrievalException
- * @throws boost::thread_interrupted
- * @ingroup Support
- */
-bool fileExists(const StaticString &filename, CachedFileStat *cstat = 0,
-                boost::mutex *cstatMutex = NULL, unsigned int throttleRate = 0);
-
-/**
- * Check whether 'filename' exists and what kind of file it is.
- *
- * @param filename The filename to check. It MUST be NULL-terminated.
- * @param cstat A CachedFileStat object, if you want to use cached statting.
- * @param cstatMutex A mutex for locking cstat while this function uses it.
- *                   Makes this function thread-safe. May be NULL.
- * @param throttleRate A throttle rate for cstat. Only applicable if cstat is not NULL.
- * @return The file type.
- * @throws FileSystemException Unable to check because of a filesystem error.
- * @throws TimeRetrievalException
- * @throws boost::thread_interrupted
- * @ingroup Support
- */
-FileType getFileType(const StaticString &filename, CachedFileStat *cstat = 0,
-                     boost::mutex *cstatMutex = NULL, unsigned int throttleRate = 0);
-
-/**
- * Create the given file with the given contents, permissions and ownership.
- * This function does not leave behind junk files: if the ownership cannot be set
- * or if not all data can be written then then the file will be deleted.
- *
- * @param filename The file to create.
- * @param contents The contents to write to the file.
- * @param permissions The desired file permissions.
- * @param owner The desired file owner. Specify USER_NOT_GIVEN if you want to use the current
- *              process's owner as the file owner.
- * @param group The desired file group. Specify GROUP_NOT_GIVEN if you want to use the current
- *              process's group as the file group.
- * @param overwrite Whether to overwrite the file if it exists. If set to false
- *                  and the file exists then nothing will happen.
- * @throws FileSystemException Something went wrong.
- * @ingroup Support
- */
-void createFile(const string &filename, const StaticString &contents,
-                mode_t permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH,
-                uid_t owner = USER_NOT_GIVEN, gid_t group = GROUP_NOT_GIVEN,
-                bool overwrite = true,
-                const char *callerFile = NULL, unsigned int callerLine = 0);
-
-/**
- * Returns a canonical version of the specified path. All symbolic links
- * and relative path elements are resolved.
- *
- * @throws FileSystemException Something went wrong.
- * @ingroup Support
- */
-string canonicalizePath(const string &path);
-
-/**
- * If <em>path</em> refers to a symlink, then this function resolves the
- * symlink for 1 level. That is, if the symlink points to another symlink,
- * then the other symlink will not be resolved. The resolved path is returned.
- *
- * If the symlink doesn't point to an absolute path, then this function will
- * prepend <em>path</em>'s directory to the result.
- *
- * If <em>path</em> doesn't refer to a symlink then this method will return
- * <em>path</em>.
- *
- * <em>path</em> MUST be null-terminated!
- *
- * @throws FileSystemException Something went wrong.
- * @ingroup Support
- */
-string resolveSymlink(const StaticString &path);
-
-/**
- * Given a path, extracts its directory name. 'path' does not
- * have to be NULL terminated.
- *
- * @ingroup Support
- */
-string extractDirName(const StaticString &path);
-
-/**
- * Given a path, extracts its directory name. This version does not use
- * any dynamically allocated storage and does not require `path` to be
- * NULL-terminated. It returns a StaticString that points either to static
- * storage, or to a substring of `path`.
- */
-StaticString extractDirNameStatic(const StaticString &path);
-
-/**
- * Given a path, extracts its base name.
- * <em>path</em> MUST be null-terminated!
- *
- * @ingroup Support
- */
-string extractBaseName(const StaticString &path);
-
 /**
  * Escape the given raw string into an XML value.
  *
@@ -254,14 +129,6 @@ gid_t lookupGid(const string &groupName);
  */
 mode_t parseModeString(const StaticString &mode);
 
-/**
- * Turns the given path into an absolute path. Unlike realpath(), this function does
- * not resolve symlinks.
- *
- * @throws SystemException
- */
-string absolutizePath(const StaticString &path, const StaticString &workingDir = StaticString());
-
 /**
  * Return the path name for the directory in which the system stores general
  * temporary files. This is usually "/tmp", but might be something else depending
@@ -272,31 +139,6 @@ string absolutizePath(const StaticString &path, const StaticString &workingDir =
  */
 const char *getSystemTempDir();
 
-/**
- * Create the directory at the given path, creating intermediate directories
- * if necessary. The created directories' permissions are exactly as specified
- * by the 'mode' parameter (i.e. the umask will be ignored). You can specify
- * this directory's owner and group through the 'owner' and 'group' parameters.
- * A value of USER_NOT_GIVEN for 'owner' and/or GROUP_NOT_GIVEN 'group' means
- * that the owner/group should not be changed.
- *
- * If 'path' already exists, then nothing will happen.
- *
- * @param mode A mode string, as supported by parseModeString().
- * @throws FileSystemException Something went wrong.
- * @throws InvalidModeStringException The mode string cannot be parsed.
- */
-void makeDirTree(const string &path, const StaticString &mode = "u=rwx,g=,o=",
-	uid_t owner = USER_NOT_GIVEN, gid_t group = GROUP_NOT_GIVEN);
-
-/**
- * Remove an entire directory tree recursively. If the directory doesn't exist then this
- * function does nothing.
- *
- * @throws RuntimeException Something went wrong.
- */
-void removeDirTree(const string &path);
-
 void prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	const vector<string> &prestartURLs);
 

data/src/cxx_supportlib/Utils/Curl.h

@@ -59,6 +59,7 @@
 #include <boost/config.hpp>
 #include <boost/foreach.hpp>
 #include <Exceptions.h>
+#include <FileTools/FileManip.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
 

data/src/cxx_supportlib/Utils/ProcessMetricsCollector.h

@@ -61,6 +61,7 @@
 #include <StaticString.h>
 #include <Exceptions.h>
 #include <ProcessManagement/Spawn.h>
+#include <FileTools/FileManip.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/IOUtils.h>
 #include <Utils/StringScanning.h>

data/src/cxx_supportlib/Utils/StrIntUtilsNoStrictAliasing.cpp

@@ -26,6 +26,7 @@
 
 #include <boost/cstdint.hpp>
 #include <cstddef>
+#include <oxt/macros.hpp>
 #include <Utils/StrIntUtils.h>
 
 namespace Passenger {
@@ -37,6 +38,7 @@ using namespace std;
 // in order to gain more performance.
 
 #if defined(__x86_64__) || defined(__x86__)
+OXT_NO_SANITIZE("undefined")
 void
 convertLowerCase(const unsigned char * restrict data,
 	unsigned char * restrict output,

data/src/cxx_supportlib/Utils/VariantMap.h

@@ -33,6 +33,7 @@
 #include <set>
 #include <vector>
 #include <string>
+#include <jsoncpp/json.h>
 #include <modp_b64.h>
 #include <Exceptions.h>
 #include <Utils/StrIntUtils.h>
@@ -363,6 +364,17 @@ public:
 		return result;
 	}
 
+	double getDouble(const string &name, bool required = true,
+		double defaultValue = 0) const
+	{
+		double result = defaultValue;
+		const string *str;
+		if (lookup(name, required, &str)) {
+			result = atof(str->c_str());
+		}
+		return result;
+	}
+
 	pid_t getPid(const string &name, bool required = true, pid_t defaultValue = 0) const {
 		pid_t result = defaultValue;
 		const string *str;
@@ -411,6 +423,25 @@ public:
 		return result;
 	}
 
+	Json::Value getJsonObject(const string &name, bool required = true,
+		const Json::Value &defaultValue = Json::Value()) const
+	{
+		Json::Value result = defaultValue;
+		const string *str;
+		if (lookup(name, required, &str)) {
+			result.clear();
+			Json::Reader reader;
+			if (!reader.parse(*str, result)) {
+				throw RuntimeException("Cannot parse '" + name + "' key as JSON data: "
+					+ reader.getFormattedErrorMessages());
+			}
+			if (!result.isObject()) {
+				throw RuntimeException("'" + name + "' is valid JSON but is not an object");
+			}
+		}
+		return result;
+	}
+
 	bool erase(const string &name) {
 		return store.erase(name) != 0;
 	}

data/src/cxx_supportlib/WatchdogLauncher.cpp

@@ -35,82 +35,7 @@ using namespace std;
 using namespace boost;
 using namespace oxt;
 
-
-PsgVariantMap *
-psg_variant_map_new() {
-	return (PsgVariantMap *) new Passenger::VariantMap();
-}
-
-char *
-psg_variant_map_get_optional(PsgVariantMap *m,
-	const char *name)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	string result = vm->get(name, false, "");
-	if (result.empty()) {
-		return (char *) NULL;
-	}
-	return strdup(result.c_str());
-}
-
-void
-psg_variant_map_set(PsgVariantMap *m,
-	const char *name,
-	const char *value,
-	unsigned int value_len)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	vm->set(name, string(value, value_len));
-}
-
-void
-psg_variant_map_set2(PsgVariantMap *m,
-	const char *name,
-	unsigned int name_len,
-	const char *value,
-	unsigned int value_len)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	vm->set(string(name, name_len), string(value, value_len));
-}
-
-void
-psg_variant_map_set_int(PsgVariantMap *m,
-	const char *name,
-	int value)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	vm->setInt(name, value);
-}
-
-void
-psg_variant_map_set_bool(PsgVariantMap *m,
-	const char *name,
-	int value)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	vm->setBool(name, value);
-}
-
-void
-psg_variant_map_set_strset(PsgVariantMap *m,
-	const char *name,
-	const char **strs,
-	unsigned int count)
-{
-	Passenger::VariantMap *vm = (Passenger::VariantMap *) m;
-	std::set<string> the_set;
-
-	for (unsigned int i = 0; i < count; i++) {
-		the_set.insert(strs[i]);
-	}
-	vm->setStrSet(name, the_set);
-}
-
-void
-psg_variant_map_free(PsgVariantMap *m) {
-	delete (Passenger::VariantMap *) m;
-}
+extern "C" {
 
 
 PsgWatchdogLauncher *
@@ -121,7 +46,7 @@ psg_watchdog_launcher_new(PsgIntegrationMode mode, char **error_message) {
 int
 psg_watchdog_launcher_start(PsgWatchdogLauncher *l,
 	const char *passengerRoot,
-	PsgVariantMap *extraParams,
+	PsgJsonValue *extraConfig,
 	const PsgAfterForkCallback afterFork,
 	void *callbackArgument,
 	char **errorMessage)
@@ -132,10 +57,10 @@ psg_watchdog_launcher_start(PsgWatchdogLauncher *l,
 		boost::function<void ()> afterForkFunctionObject;
 
 		if (afterFork != NULL) {
-			afterForkFunctionObject = boost::bind(afterFork, callbackArgument, extraParams);
+			afterForkFunctionObject = boost::bind(afterFork, callbackArgument, extraConfig);
 		}
 		launcher->start(passengerRoot,
-			*((Passenger::VariantMap *) extraParams),
+			*static_cast<Passenger::Json::Value *>(extraConfig),
 			afterForkFunctionObject);
 		return 1;
 	} catch (const Passenger::SystemException &e) {
@@ -193,3 +118,6 @@ psg_watchdog_launcher_free(PsgWatchdogLauncher *l) {
 	Passenger::WatchdogLauncher *launcher = (Passenger::WatchdogLauncher *) l;
 	delete launcher;
 }
+
+
+} // extern "C"

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
+#include "JsonTools/CBindings.h"
 
 #ifdef __cplusplus
 	extern "C" {
@@ -41,38 +42,14 @@ typedef enum {
 } PsgIntegrationMode;
 
 typedef void PsgWatchdogLauncher;
-typedef void PsgVariantMap;
 typedef void (*PsgAfterForkCallback)(void *, void *);
 
-PsgVariantMap *psg_variant_map_new();
-char *psg_variant_map_get_optional(PsgVariantMap *m,
-	const char *name);
-void psg_variant_map_set(PsgVariantMap *m,
-	const char *name,
-	const char *value,
-	unsigned int value_len);
-void psg_variant_map_set2(PsgVariantMap *m,
-	const char *name,
-	unsigned int name_len,
-	const char *value,
-	unsigned int value_len);
-void psg_variant_map_set_int(PsgVariantMap *m,
-	const char *name,
-	int value);
-void psg_variant_map_set_bool(PsgVariantMap *m,
-	const char *name,
-	int value);
-void psg_variant_map_set_strset(PsgVariantMap *m,
-	const char *name,
-	const char **strs,
-	unsigned int count);
-void psg_variant_map_free(PsgVariantMap *m);
 
 PsgWatchdogLauncher *psg_watchdog_launcher_new(PsgIntegrationMode mode,
 	char **error_message);
 int psg_watchdog_launcher_start(PsgWatchdogLauncher *launcher,
 	const char *passengerRoot,
-	PsgVariantMap *params,
+	PsgJsonValue *config,
 	const PsgAfterForkCallback afterFork,
 	void *callbackArgument,
 	char **errorMessage);
@@ -99,6 +76,8 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 
 #include <signal.h>
 
+#include <jsoncpp/json.h>
+
 #include <Constants.h>
 #include <FileDescriptor.h>
 #include <MessageClient.h>
@@ -112,7 +91,6 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 #include <Utils/MessageIO.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/VariantMap.h>
 #include <Utils/ClassUtils.h>
 
 namespace Passenger {
@@ -333,7 +311,7 @@ public:
 	 * @throws RuntimeException Something went wrong.
 	 */
 	void start(const string &passengerRoot,
-		const VariantMap &extraParams = VariantMap(),
+		const Json::Value &extraConfig = Json::Value(),
 		const boost::function<void ()> &afterFork = boost::function<void ()>())
 	{
 		TRACE_POINT();
@@ -350,20 +328,16 @@ public:
 		SocketPair fds;
 		int e;
 		pid_t pid;
+		Json::Value::const_iterator it;
+
+		Json::Value config;
+		config["web_server_control_process_pid"] = getpid();
+		config["integration_mode"] = getIntegrationModeString();
+		config["passenger_root"] = passengerRoot;
+		config["log_level"] = (int) LoggingKit::getLevel();
 
-		VariantMap params;
-		params
-			.setPid ("web_server_control_process_pid",  getpid())
-			.set    ("web_server_passenger_version", PASSENGER_VERSION)
-			.set    ("integration_mode", getIntegrationModeString())
-			.set    ("passenger_root",  passengerRoot)
-			.setInt ("log_level",       (int) LoggingKit::getLevel());
-		extraParams.addTo(params);
-
-		if (!params.getBool("user_switching", false, true)
-		 && !params.has("user"))
-		{
-			params.set("user", params.get("default_user", false, PASSENGER_DEFAULT_USER));
+		for (it = extraConfig.begin(); it != extraConfig.end(); it++) {
+			config[it.name()] = *it;
 		}
 
 		fds = createUnixSocketPair(__FILE__, __LINE__);
@@ -440,7 +414,7 @@ public:
 			 * reading the arguments. We'll notice that later.
 			 */
 			try {
-				params.writeToFd(feedbackFd);
+				writeScalarMessage(feedbackFd, config.toStyledString());
 			} catch (const SystemException &e) {
 				if (e.code() != EPIPE && e.code() != ECONNRESET) {
 					inspectWatchdogCrashReason(pid);
@@ -473,24 +447,47 @@ public:
 			}
 
 			if (args[0] == "Agents information") {
-				if ((args.size() - 1) % 2 != 0) {
-					throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog "
-						"because it sent an invalid startup information report (the number "
-						"of items is not an even number)");
+				UPDATE_TRACE_POINT();
+
+				if (args.size() != 1) {
+					throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog: "
+						"it belongs to an incompatible version of " SHORT_PROGRAM_NAME
+						". Please fully upgrade " SHORT_PROGRAM_NAME ".");
+				}
+
+				string jsonData;
+				try {
+					result = readScalarMessage(feedbackFd, jsonData);
+				} catch (const SystemException &ex) {
+					if (ex.code() == ECONNRESET) {
+						inspectWatchdogCrashReason(pid);
+					} else {
+						killProcessGroupAndWait(&pid, 5000);
+						guard.clear();
+						throw SystemException("Unable to start the " PROGRAM_NAME " watchdog: "
+							"unable to read its startup information report",
+							ex.code());
+					}
+				}
+				if (!result) {
+					UPDATE_TRACE_POINT();
+					inspectWatchdogCrashReason(pid);
 				}
 
-				VariantMap info;
-				for (unsigned i = 1; i < args.size(); i += 2) {
-					const string &key = args[i];
-					const string &value = args[i + 1];
-					info.set(key, value);
+				Json::Value doc;
+				Json::Reader reader;
+				if (!reader.parse(jsonData, doc)) {
+					throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog: "
+						"unable to parse its startup information report as valid JSON: "
+						+ reader.getFormattedErrorMessages() + "\n"
+						"Raw data: \"" + cEscapeString(jsonData) + "\"");
 				}
 
 				mPid               = pid;
 				this->feedbackFd   = feedbackFd;
-				mCoreAddress       = info.get("core_address");
-				mCorePassword      = info.get("core_password");
-				mInstanceDir       = info.get("instance_dir");
+				mCoreAddress       = doc["core_address"].asString();
+				mCorePassword      = doc["core_password"].asString();
+				mInstanceDir       = doc["instance_dir"].asString();
 				guard.clear();
 			} else if (args[0] == "Watchdog startup error") {
 				killProcessGroupAndWait(&pid, 5000);