passenger 5.1.12 → 5.2.0

data/src/cxx_supportlib/ServerKit/FileBufferedChannel.h

@@ -43,6 +43,7 @@
 #include <deque>
 #include <LoggingKit/LoggingKit.h>
 #include <ServerKit/Context.h>
+#include <ServerKit/Config.h>
 #include <ServerKit/Errors.h>
 #include <ServerKit/Channel.h>
 #include <Utils/JsonUtils.h>
@@ -1370,7 +1371,7 @@ public:
 
 	FileBufferedChannel(Context *context)
 		: Channel(context),
-		  config(&context->defaultFileBufferedChannelConfig),
+		  config(&context->config.fileBufferedChannelConfig),
 		  mode(IN_MEMORY_MODE),
 		  readerState(RS_INACTIVE),
 		  nbuffers(0),
@@ -1394,7 +1395,7 @@ public:
 	void setContext(Context *context) {
 		Channel::setContext(context);
 		if (config == NULL) {
-			config = &context->defaultFileBufferedChannelConfig;
+			config = &context->config.fileBufferedChannelConfig;
 		}
 	}
 

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -71,8 +71,8 @@ private:
 				if (header->key.size == 2) {
 					// Security password. Check whether it hasn't been
 					// given before and whether it is correct.
-					if (ctx->secureModePassword.empty()
-					 || psg_lstr_cmp(&header->val, ctx->secureModePassword))
+					if (ctx->config.secureModePassword.empty()
+					 || psg_lstr_cmp(&header->val, ctx->config.secureModePassword))
 					{
 						state->secureMode = true;
 						return true;

data/src/cxx_supportlib/ServerKit/HttpServer.h

@@ -60,6 +60,19 @@ extern const char DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE[];
 extern const unsigned int DEFAULT_INTERNAL_SERVER_ERROR_RESPONSE_SIZE;
 
 
+/*
+ * BEGIN ConfigKit schema: Passenger::ServerKit::HttpServerSchema
+ * (do not edit: following text is automatically generated
+ * by 'rake configkit_schemas_inline_comments')
+ *
+ *   accept_burst_count           unsigned integer   -   default(32)
+ *   client_freelist_limit        unsigned integer   -   default(0)
+ *   min_spare_clients            unsigned integer   -   default(0)
+ *   request_freelist_limit       unsigned integer   -   default(1024)
+ *   start_reading_after_accept   boolean            -   default(true)
+ *
+ * END
+ */
 class HttpServerSchema: public BaseServerSchema {
 private:
 	void initialize() {
@@ -975,8 +988,9 @@ protected:
 
 public:
 	HttpServer(Context *context, const HttpServerSchema &schema,
-		const Json::Value &initialConfig = Json::Value())
-		: ParentClass(context, schema, initialConfig),
+		const Json::Value &initialConfig = Json::Value(),
+		const ConfigKit::Translator &translator = ConfigKit::DummyTranslator())
+		: ParentClass(context, schema, initialConfig, translator),
 		  freeRequestCount(0),
 		  totalRequestsBegun(0),
 		  lastTotalRequestsBegun(0),

data/src/cxx_supportlib/ServerKit/Server.h

@@ -149,6 +149,18 @@ using namespace oxt;
 	SKC_TRACE_FROM_STATIC(server, client, 3, "Event: " eventName)
 
 
+/*
+ * BEGIN ConfigKit schema: Passenger::ServerKit::BaseServerSchema
+ * (do not edit: following text is automatically generated
+ * by 'rake configkit_schemas_inline_comments')
+ *
+ *   accept_burst_count           unsigned integer   -   default(32)
+ *   client_freelist_limit        unsigned integer   -   default(0)
+ *   min_spare_clients            unsigned integer   -   default(0)
+ *   start_reading_after_accept   boolean            -   default(true)
+ *
+ * END
+ */
 class BaseServerSchema: public ConfigKit::Schema {
 private:
 	void initialize() {
@@ -299,6 +311,22 @@ private:
 
 	/***** Private methods *****/
 
+	void preinitialize(Context *context) {
+		STAILQ_INIT(&freeClients);
+		TAILQ_INIT(&activeClients);
+		TAILQ_INIT(&disconnectedClients);
+
+		acceptResumptionWatcher.set(context->libev->getLoop());
+		acceptResumptionWatcher.set<
+			BaseServer<DerivedServer, Client>,
+			&BaseServer<DerivedServer, Client>::onAcceptResumeTimeout>(this);
+
+		statisticsUpdateWatcher.set(context->libev->getLoop());
+		statisticsUpdateWatcher.set<
+			BaseServer<DerivedServer, Client>,
+			&BaseServer<DerivedServer, Client>::onStatisticsUpdateTimeout>(this);
+	}
+
 	static void _onAcceptable(EV_P_ ev_io *io, int revents) {
 		static_cast<BaseServer *>(io->data)->onAcceptable(io, revents);
 	}
@@ -703,8 +731,9 @@ public:
 	/***** Public methods *****/
 
 	BaseServer(Context *context, const BaseServerSchema &schema,
-		const Json::Value &initialConfig = Json::Value())
-		: config(schema, initialConfig),
+		const Json::Value &initialConfig = Json::Value(),
+		const ConfigKit::Translator &translator = ConfigKit::DummyTranslator())
+		: config(schema, initialConfig, translator),
 		  configRlz(config),
 		  shutdownFinishCallback(NULL),
 		  serverState(ACTIVE),
@@ -723,19 +752,7 @@ public:
 		  nEndpoints(0),
 		  accept4Available(true)
 	{
-		STAILQ_INIT(&freeClients);
-		TAILQ_INIT(&activeClients);
-		TAILQ_INIT(&disconnectedClients);
-
-		acceptResumptionWatcher.set(context->libev->getLoop());
-		acceptResumptionWatcher.set<
-			BaseServer<DerivedServer, Client>,
-			&BaseServer<DerivedServer, Client>::onAcceptResumeTimeout>(this);
-
-		statisticsUpdateWatcher.set(context->libev->getLoop());
-		statisticsUpdateWatcher.set<
-			BaseServer<DerivedServer, Client>,
-			&BaseServer<DerivedServer, Client>::onStatisticsUpdateTimeout>(this);
+		preinitialize(context);
 	}
 
 	virtual ~BaseServer() {

data/src/cxx_supportlib/Utils.cpp

@@ -59,7 +59,6 @@
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/CachedFileStat.hpp>
 #include <Utils/StrIntUtils.h>
 #include <Utils/IOUtils.h>
 
@@ -75,274 +74,6 @@
 
 namespace Passenger {
 
-namespace {
-	/**
-	 * Given a filename, FileGuard will unlink the file in its destructor, unless
-	 * commit() was called. Used in file operation functions that don't want to
-	 * leave behind half-finished files after error conditions.
-	 */
-	struct FileGuard {
-		string filename;
-		bool committed;
-
-		FileGuard(const string &filename) {
-			this->filename = filename;
-			committed = false;
-		}
-
-		~FileGuard() {
-			if (!committed) {
-				int ret;
-				do {
-					ret = unlink(filename.c_str());
-				} while (ret == -1 && errno == EINTR);
-			}
-		}
-
-		void commit() {
-			committed = true;
-		}
-	};
-}
-
-bool
-fileExists(const StaticString &filename, CachedFileStat *cstat, boost::mutex *cstatMutex,
-	unsigned int throttleRate)
-{
-	return getFileType(filename, cstat, cstatMutex, throttleRate) == FT_REGULAR;
-}
-
-FileType
-getFileType(const StaticString &filename, CachedFileStat *cstat, boost::mutex *cstatMutex,
-	unsigned int throttleRate)
-{
-	struct stat buf;
-	int ret;
-
-	if (cstat != NULL) {
-		boost::unique_lock<boost::mutex> l;
-		if (cstatMutex != NULL) {
-			l = boost::unique_lock<boost::mutex>(*cstatMutex);
-		}
-		ret = cstat->stat(filename, &buf, throttleRate);
-	} else {
-		ret = stat(filename.c_str(), &buf);
-	}
-	if (ret == 0) {
-		if (S_ISREG(buf.st_mode)) {
-			return FT_REGULAR;
-		} else if (S_ISDIR(buf.st_mode)) {
-			return FT_DIRECTORY;
-		} else {
-			return FT_OTHER;
-		}
-	} else {
-		if (errno == ENOENT) {
-			return FT_NONEXISTANT;
-		} else {
-			int e = errno;
-			string message("Cannot stat '");
-			message.append(filename);
-			message.append("'");
-			throw FileSystemException(message, e, filename);
-		}
-	}
-}
-
-void
-createFile(const string &filename, const StaticString &contents, mode_t permissions, uid_t owner,
-	gid_t group, bool overwrite, const char *callerFile, unsigned int callerLine)
-{
-	FileDescriptor fd;
-	int ret, e, options;
-
-	options = O_WRONLY | O_CREAT | O_TRUNC;
-	if (!overwrite) {
-		options |= O_EXCL;
-	}
-	do {
-		fd.assign(open(filename.c_str(), options, permissions),
-			(callerFile == NULL) ? __FILE__ : callerFile,
-			(callerLine == 0) ? __LINE__ : callerLine);
-	} while (fd == -1 && errno == EINTR);
-	if (fd != -1) {
-		FileGuard guard(filename);
-
-		// The file permission may not be as expected because of the active
-		// umask, so fchmod() it here to ensure correct permissions.
-		do {
-			ret = fchmod(fd, permissions);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			e = errno;
-			throw FileSystemException("Cannot set permissions on " + filename,
-				e, filename);
-		}
-
-		if (owner != USER_NOT_GIVEN && group != GROUP_NOT_GIVEN) {
-			if (owner == USER_NOT_GIVEN) {
-				owner = (uid_t) -1; // Don't let fchown change file owner.
-			}
-			if (group == GROUP_NOT_GIVEN) {
-				group = (gid_t) -1; // Don't let fchown change file group.
-			}
-			do {
-				ret = fchown(fd, owner, group);
-			} while (ret == -1 && errno == EINTR);
-			if (ret == -1) {
-				e = errno;
-				throw FileSystemException("Cannot set ownership for " + filename,
-					e, filename);
-			}
-		}
-
-		try {
-			writeExact(fd, contents);
-			fd.close();
-		} catch (const SystemException &e) {
-			throw FileSystemException("Cannot write to file " + filename,
-				e.code(), filename);
-		}
-		guard.commit();
-	} else {
-		e = errno;
-		if (overwrite || e != EEXIST) {
-			throw FileSystemException("Cannot create file " + filename,
-				e, filename);
-		}
-	}
-}
-
-string
-canonicalizePath(const string &path) {
-	#ifdef __GLIBC__
-		// We're using a GNU extension here. See the 'BUGS'
-		// section of the realpath(3) Linux manpage for
-		// rationale.
-		char *tmp = realpath(path.c_str(), NULL);
-		if (tmp == NULL) {
-			int e = errno;
-			string message;
-
-			message = "Cannot resolve the path '";
-			message.append(path);
-			message.append("'");
-			throw FileSystemException(message, e, path);
-		} else {
-			string result(tmp);
-			free(tmp);
-			return result;
-		}
-	#else
-		char tmp[PATH_MAX];
-		if (realpath(path.c_str(), tmp) == NULL) {
-			int e = errno;
-			string message;
-
-			message = "Cannot resolve the path '";
-			message.append(path);
-			message.append("'");
-			throw FileSystemException(message, e, path);
-		} else {
-			return tmp;
-		}
-	#endif
-}
-
-string
-resolveSymlink(const StaticString &path) {
-	char buf[PATH_MAX];
-	ssize_t size;
-
-	size = readlink(path.c_str(), buf, sizeof(buf) - 1);
-	if (size == -1) {
-		if (errno == EINVAL) {
-			return path;
-		} else {
-			int e = errno;
-			string message = "Cannot resolve possible symlink '";
-			message.append(path.c_str(), path.size());
-			message.append("'");
-			throw FileSystemException(message, e, path);
-		}
-	} else {
-		buf[size] = '\0';
-		if (buf[0] == '\0') {
-			string message = "The file '";
-			message.append(path.c_str(), path.size());
-			message.append("' is a symlink, and it refers to an empty filename. This is not allowed.");
-			throw FileSystemException(message, ENOENT, path);
-		} else if (buf[0] == '/') {
-			// Symlink points to an absolute path.
-			return buf;
-		} else {
-			return extractDirName(path) + "/" + buf;
-		}
-	}
-}
-
-string
-extractDirName(const StaticString &path) {
-	DynamicBuffer pathCopy(path.size() + 1);
-	memcpy(pathCopy.data, path.data(), path.size());
-	pathCopy.data[path.size()] = '\0';
-	return string(dirname(pathCopy.data));
-}
-
-StaticString
-extractDirNameStatic(const StaticString &path) {
-	if (path.empty()) {
-		return StaticString(".", 1);
-	}
-
-	const char *data = path.data();
-	const char *end = path.data() + path.size();
-
-	// Ignore trailing '/' characters.
-	while (end > data && end[-1] == '/') {
-		end--;
-	}
-	if (end == data) {
-		// Apparently the entire path consists of slashes.
-		return StaticString("/", 1);
-	}
-
-	// Find last '/'.
-	end--;
-	while (end > data && *end != '/') {
-		end--;
-	}
-	if (end == data) {
-		if (*data == '/') {
-			// '/' found, but it's the first character in the path.
-			return StaticString("/", 1);
-		} else {
-			// No '/' found in path.
-			return StaticString(".", 1);
-		}
-	} else {
-		// '/' found and it's not the first character in path.
-		// 'end' points to that '/' character.
-		// Skip to first non-'/' character.
-		while (end >= data && *end == '/') {
-			end--;
-		}
-		if (end < data) {
-			// The entire path consists of '/' characters.
-			return StaticString("/", 1);
-		} else {
-			return StaticString(data, end - data + 1);
-		}
-	}
-}
-
-string
-extractBaseName(const StaticString &path) {
-	char *path_copy = strdup(path.c_str());
-	string result_string = basename(path_copy);
-	free(path_copy);
-	return result_string;
-}
 
 string
 escapeForXml(const StaticString &input) {
@@ -569,66 +300,6 @@ parseModeString(const StaticString &mode) {
 	return modeBits;
 }
 
-string
-absolutizePath(const StaticString &path, const StaticString &workingDir) {
-	vector<string> components;
-	if (!startsWith(path, "/")) {
-		if (workingDir.empty()) {
-			char buffer[PATH_MAX];
-			if (getcwd(buffer, sizeof(buffer)) == NULL) {
-				int e = errno;
-				throw SystemException("Unable to query current working directory", e);
-			}
-			split(buffer + 1, '/', components);
-		} else {
-			string absoluteWorkingDir = absolutizePath(workingDir);
-			split(StaticString(absoluteWorkingDir.data() + 1, absoluteWorkingDir.size() - 1),
-				'/', components);
-		}
-	}
-
-	const char *begin = path.data();
-	const char *end = path.data() + path.size();
-
-	// Skip leading slashes.
-	while (begin < end && *begin == '/') {
-		begin++;
-	}
-
-	while (begin < end) {
-		const char *next = (const char *) memchr(begin, '/', end - begin);
-		if (next == NULL) {
-			next = end;
-		}
-
-		StaticString component(begin, next - begin);
-		if (component == "..") {
-			if (!components.empty()) {
-				components.pop_back();
-			}
-		} else if (component != ".") {
-			components.push_back(component);
-		}
-
-		// Skip slashes until beginning of next path component.
-		begin = next + 1;
-		while (begin < end && *begin == '/') {
-			begin++;
-		}
-	}
-
-	string result;
-	vector<string>::const_iterator c_it, c_end = components.end();
-	for (c_it = components.begin(); c_it != c_end; c_it++) {
-		result.append("/");
-		result.append(*c_it);
-	}
-	if (result.empty()) {
-		result = "/";
-	}
-	return result;
-}
-
 const char *
 getSystemTempDir() {
 	const char *temp_dir = getenv("TMPDIR");
@@ -638,118 +309,6 @@ getSystemTempDir() {
 	return temp_dir;
 }
 
-void
-makeDirTree(const string &path, const StaticString &mode, uid_t owner, gid_t group) {
-	struct stat buf;
-	vector<string> paths;
-	vector<string>::reverse_iterator rit;
-	string current = path;
-	mode_t modeBits;
-	int ret;
-
-	if (stat(path.c_str(), &buf) == 0) {
-		return;
-	}
-
-	modeBits = parseModeString(mode);
-
-	/* Create a list of parent paths that don't exist. For example, given
-	 * path == "/a/b/c/d/e" and that only /a exists, the list will become
-	 * as follows:
-	 *
-	 * /a/b/c/d
-	 * /a/b/c
-	 * /a/b
-	 */
-	while (current != "/" && current != "." && getFileType(current) == FT_NONEXISTANT) {
-		paths.push_back(current);
-		current = extractDirName(current);
-	}
-
-	/* Now traverse the list in reverse order and create directories that don't exist. */
-	for (rit = paths.rbegin(); rit != paths.rend(); rit++) {
-		current = *rit;
-
-		do {
-			ret = mkdir(current.c_str(), modeBits);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			if (errno == EEXIST) {
-				// Ignore error and don't chmod/chown.
-				continue;
-			} else {
-				int e = errno;
-				throw FileSystemException("Cannot create directory '" + current + "'",
-					e, current);
-			}
-		}
-
-		/* Chmod in order to override the umask. */
-		do {
-			ret = chmod(current.c_str(), modeBits);
-		} while (ret == -1 && errno == EINTR);
-
-		if (owner != USER_NOT_GIVEN && group != GROUP_NOT_GIVEN) {
-			if (owner == USER_NOT_GIVEN) {
-				owner = (uid_t) -1; // Don't let chown change file owner.
-			}
-			if (group == GROUP_NOT_GIVEN) {
-				group = (gid_t) -1; // Don't let chown change file group.
-			}
-			do {
-				ret = chown(current.c_str(), owner, group);
-			} while (ret == -1 && errno == EINTR);
-			if (ret == -1) {
-				char message[1024];
-				int e = errno;
-
-				snprintf(message, sizeof(message) - 1,
-					"Cannot change the directory '%s' its UID to %lld and GID to %lld",
-					current.c_str(), (long long) owner, (long long) group);
-				message[sizeof(message) - 1] = '\0';
-				throw FileSystemException(message, e, path);
-			}
-		}
-	}
-}
-
-static void
-redirectStderrToDevNull() {
-	int devnull = open("/dev/null", O_RDONLY);
-	if (devnull > 2) {
-		dup2(devnull, 2);
-		close(devnull);
-	}
-}
-
-void
-removeDirTree(const string &path) {
-	{
-		const char *command[] = {
-			"chmod",
-			"-R",
-			"u+rwx",
-			path.c_str(),
-			NULL
-		};
-		SubprocessInfo info;
-		runCommand(command, info, true, true, redirectStderrToDevNull);
-	}
-	{
-		const char *command[] = {
-			"rm",
-			"-rf",
-			path.c_str(),
-			NULL
-		};
-		SubprocessInfo info;
-		runCommand(command, info, true, true, redirectStderrToDevNull);
-		if (info.status != 0 && info.status != -2) {
-			throw RuntimeException("Cannot remove directory '" + path + "'");
-		}
-	}
-}
-
 void
 prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	const vector<string> &prestartURLs)