passenger 5.1.7 → 5.1.8

data/src/cxx_supportlib/ConfigKit/SubComponentUtils.h

@@ -0,0 +1,59 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 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_CONFIG_KIT_SUB_COMPONENT_UTILS_H_
+#define _PASSENGER_CONFIG_KIT_SUB_COMPONENT_UTILS_H_
+
+#include <string>
+#include <vector>
+#include <stdexcept>
+
+#include <jsoncpp/json.h>
+#include <ConfigKit/Common.h>
+
+namespace Passenger {
+namespace ConfigKit {
+
+using namespace std;
+
+
+template<typename Component, typename Translator>
+inline void
+prepareConfigChangeForSubComponent(Component &component, const Translator &translator,
+	const Json::Value &updates, vector<ConfigKit::Error> &errors,
+	typename Component::ConfigChangeRequest &req)
+{
+	vector<Error> tempErrors;
+	component.prepareConfigChange(translator.translate(updates),
+		tempErrors, req);
+	tempErrors = translator.reverseTranslate(tempErrors);
+	errors.insert(errors.end(), tempErrors.begin(), tempErrors.end());
+}
+
+
+} // namespace ConfigKit
+} // namespace Passenger
+
+#endif /* _PASSENGER_CONFIG_KIT_SUB_COMPONENT_UTILS_H_ */

data/src/cxx_supportlib/ConfigKit/Utils.h

@@ -29,10 +29,9 @@
 #include <string>
 #include <vector>
 
-#include <jsoncpp/json.h>
-
 #include <ConfigKit/Common.h>
 #include <StaticString.h>
+#include <DataStructures/StringKeyTable.h>
 #include <Utils/FastStringStream.h>
 
 namespace Passenger {
@@ -43,72 +42,11 @@ using namespace std;
 class Error;
 
 
-template<typename Component, typename Translator>
-inline bool
-previewConfigUpdateSubComponent(Component &component,
-	const Json::Value &updates, const Translator &translator,
-	vector<Error> &errors)
-{
-	vector<Error> tempErrors;
-
-	component.previewConfigUpdate(translator.translate(updates),
-		tempErrors);
-	tempErrors = translator.reverseTranslate(tempErrors);
-	errors.insert(errors.end(), tempErrors.begin(), tempErrors.end());
-	return errors.empty();
-}
-
-template<typename Component, typename Translator>
-inline void
-configureSubComponent(Component &component,
-	const Json::Value &updates, const Translator &translator,
-	vector<ConfigKit::Error> &errors)
-{
-	vector<ConfigKit::Error> tempErrors;
-
-	component.configure(translator.translate(updates), tempErrors);
-	tempErrors = translator.reverseTranslate(tempErrors);
-	errors.insert(errors.end(), tempErrors.begin(), tempErrors.end());
-}
-
-template<typename Component>
-inline void
-callPreviewConfigUpdateAndCallback(Component *component, Json::Value updates,
-	ConfigKit::ConfigCallback callback)
-{
-	vector<ConfigKit::Error> errors;
-	Json::Value config = component->previewConfigUpdate(updates, errors);
-	callback(config, errors);
-}
-
-template<typename Component>
-inline void
-callConfigureAndCallback(Component *component, Json::Value updates,
-	ConfigKit::ConfigCallback callback)
-{
-	vector<ConfigKit::Error> errors;
-	if (component->configure(updates, errors)) {
-		callback(component->inspectConfig(), errors);
-	} else {
-		callback(Json::nullValue, errors);
-	}
-}
-
-template<typename Component>
-inline void
-callInspectConfigAndCallback(Component *component,
-	ConfigKit::InspectCallback callback)
-{
-	callback(component->inspectConfig());
-}
-
 inline StaticString
 getTypeString(Type type) {
 	switch (type) {
 	case STRING_TYPE:
 		return P_STATIC_STRING("string");
-	case PASSWORD_TYPE:
-		return P_STATIC_STRING("password");
 	case INT_TYPE:
 		return P_STATIC_STRING("integer");
 	case UINT_TYPE:
@@ -121,11 +59,34 @@ getTypeString(Type type) {
 		return P_STATIC_STRING("array");
 	case STRING_ARRAY_TYPE:
 		return P_STATIC_STRING("array of strings");
+	case OBJECT_TYPE:
+		return P_STATIC_STRING("object");
+	case ANY_TYPE:
+		return P_STATIC_STRING("any");
 	default:
 		return P_STATIC_STRING("unknown");
 	}
 }
 
+inline vector<ConfigKit::Error>
+deduplicateErrors(const vector<ConfigKit::Error> &errors) {
+	StringKeyTable<bool> messagesSeen;
+	vector<ConfigKit::Error>::const_iterator it, end = errors.end();
+	vector<ConfigKit::Error> result;
+
+	for (it = errors.begin(); it != end; it++) {
+		bool *tmp;
+		string message = it->getMessage();
+
+		if (!messagesSeen.lookup(message, &tmp)) {
+			messagesSeen.insert(message, true);
+			result.push_back(*it);
+		}
+	}
+
+	return result;
+}
+
 inline string
 toString(const vector<Error> &errors) {
 	FastStringStream<> stream;
@@ -141,7 +102,7 @@ toString(const vector<Error> &errors) {
 }
 
 
-} // ConfigKit
-} // Passenger
+} // namespace ConfigKit
+} // namespace Passenger
 
 #endif /* _PASSENGER_CONFIG_KIT_UTILS_H_ */

data/src/cxx_supportlib/ConfigKit/ValidationUtils.h

@@ -0,0 +1,69 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 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_CONFIG_KIT_VALIDATION_UTILS_H_
+#define _PASSENGER_CONFIG_KIT_VALIDATION_UTILS_H_
+
+#include <ConfigKit/Store.h>
+#include <string>
+#include <vector>
+
+namespace Passenger {
+namespace ConfigKit {
+
+using namespace std;
+
+
+inline void
+validateIntegrationMode(const Store &config, vector<Error> &errors) {
+	if (config["integration_mode"].isNull()) {
+		return;
+	}
+	string integrationMode = config["integration_mode"].asString();
+	if (integrationMode != "apache" && integrationMode != "nginx" && integrationMode != "standalone") {
+		errors.push_back(Error("'{{integration_mode}}' may only be one of 'apache', 'nginx', 'standalone'"));
+	}
+}
+
+inline void
+validateStandaloneEngine(const Store &config, vector<Error> &errors) {
+	if (config["integration_mode"].asString() != "standalone") {
+		return;
+	}
+	string standaloneEngine = config["standalone_engine"].asString();
+	if (standaloneEngine.empty()) {
+		errors.push_back(Error("'{{standalone_engine}}' is required when '{{integration_mode}}' is 'standalone'"));
+		return;
+	}
+	if (standaloneEngine != "nginx" && standaloneEngine != "builtin") {
+		errors.push_back(Error("'{{standalone_engine}}' is must be either 'nginx' or 'builtin'"));
+	}
+}
+
+
+} // namespace ConfigKit
+} // namespace Passenger
+
+#endif /* _PASSENGER_CONFIG_KIT_VALIDATION_UTILS_H_ */

data/src/cxx_supportlib/ConfigKit/VariantMapUtils.h

@@ -26,7 +26,7 @@
 #ifndef _PASSENGER_CONFIG_KIT_VARIANT_MAP_UTILS_H_
 #define _PASSENGER_CONFIG_KIT_VARIANT_MAP_UTILS_H_
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Exceptions.h>
 #include <ConfigKit/Schema.h>
 #include <Utils/StrIntUtils.h>
@@ -48,7 +48,7 @@ variantMapToJson(const Schema &schema, const VariantMap &options) {
 		if (options.has(key)) {
 			switch (entry.type) {
 			case STRING_TYPE:
-			case PASSWORD_TYPE:
+			case ANY_TYPE:
 				doc[key.toString()] = options.get(key);
 				break;
 			case INT_TYPE:
@@ -74,6 +74,9 @@ variantMapToJson(const Schema &schema, const VariantMap &options) {
 				doc[key.toString()] = subdoc;
 				break;
 			}
+			case OBJECT_TYPE:
+				// Not supported
+				break;
 			default:
 				P_BUG("Unknown type " + Passenger::toString((int) entry.type));
 				break;
@@ -87,7 +90,7 @@ variantMapToJson(const Schema &schema, const VariantMap &options) {
 }
 
 
-} // ConfigKit
-} // Passenger
+} // namespace ConfigKit
+} // namespace Passenger
 
 #endif /* _PASSENGER_CONFIG_KIT_VARIANT_MAP_UTILS_H_ */

data/src/cxx_supportlib/Constants.h

@@ -45,12 +45,15 @@
 #define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
 #define DEFAULT_ANALYTICS_LOG_USER "nobody"
 #define DEFAULT_APP_ENV "production"
+#define DEFAULT_APP_OUTPUT_LOG_LEVEL 3
+#define DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME "notice"
 #define DEFAULT_APP_THREAD_COUNT 1
 #define DEFAULT_CONCURRENCY_MODEL "process"
 #define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
 #define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
 #define DEFAULT_INTEGRATION_MODE "standalone"
 #define DEFAULT_LOG_LEVEL 3
+#define DEFAULT_LOG_LEVEL_NAME "notice"
 #define DEFAULT_LVE_MIN_UID 500
 #define DEFAULT_MAX_POOL_SIZE 6
 #define DEFAULT_MAX_PRELOADER_IDLE_TIME 300
@@ -80,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.1.7"
+#define PASSENGER_VERSION "5.1.8"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/Crypto.cpp

@@ -26,7 +26,7 @@
 
 #include <Crypto.h>
 #include <modp_b64.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <string>
 #include <Utils/SystemTime.h>
 #include <Utils/StrIntUtils.h>

data/src/cxx_supportlib/DataStructures/StringKeyTable.h

@@ -27,7 +27,14 @@
 #define _PASSENGER_DATA_STRUCTURES_STRING_KEY_TABLE_H_
 
 #include <boost/move/move.hpp>
+#include <boost/config.hpp>
 #include <boost/cstdint.hpp>
+// for std::swap()
+#if __cplusplus >= 201103L
+	#include <utility>
+#else
+	#include <algorithm>
+#endif
 #include <limits>
 #include <cstring>
 #include <cassert>
@@ -245,7 +252,7 @@ private:
 	}
 
 	template<typename ValueType, typename LocalMoveSupport>
-	void realInsert(const HashedStaticString &key, ValueType val, bool overwrite) {
+	Cell *realInsert(const HashedStaticString &key, ValueType val, bool overwrite) {
 		assert(!key.empty());
 		assert(key.size() <= MAX_KEY_LENGTH);
 		assert(m_population < MAX_ITEMS);
@@ -271,18 +278,20 @@ private:
 					cell->hash = key.hash();
 					copyOrMoveValue(val, cell->value, LocalMoveSupport());
 					nonEmptyIndex = cell - &m_cells[0];
-					return;
+					return cell;
 				} else if (compareKeys(cellKey, cell->keyLength, key)) {
 					// Cell matches.
 					if (overwrite) {
 						copyOrMoveValue(val, cell->value, LocalMoveSupport());
 					}
-					return;
+					return cell;
 				} else {
 					cell = SKT_CIRCULAR_NEXT(cell);
 				}
 			}
 		}
+
+		return NULL; // Never reached
 	}
 
 public:
@@ -430,12 +439,12 @@ public:
 		}
 	}
 
-	void insert(const HashedStaticString &key, const T &val, bool overwrite = true) {
-		realInsert<const T &, SKT_DisableMoveSupport>(key, val, overwrite);
+	Cell *insert(const HashedStaticString &key, const T &val, bool overwrite = true) {
+		return realInsert<const T &, SKT_DisableMoveSupport>(key, val, overwrite);
 	}
 
-	void insertByMoving(const HashedStaticString &key, BOOST_RV_REF(T) val, bool overwrite = true) {
-		realInsert<BOOST_RV_REF(T), SKT_EnableMoveSupport>(key, boost::move(val), overwrite);
+	Cell *insertByMoving(const HashedStaticString &key, BOOST_RV_REF(T) val, bool overwrite = true) {
+		return realInsert<BOOST_RV_REF(T), SKT_EnableMoveSupport>(key, boost::move(val), overwrite);
 	}
 
 	void erase(Cell *cell) {
@@ -528,6 +537,16 @@ public:
 		return m_population == 0;
 	}
 
+	void swap(StringKeyTable<T, MoveSupport> &other) BOOST_NOEXCEPT_OR_NOTHROW {
+		std::swap(m_cells, other.m_cells);
+		std::swap(m_arraySize, other.m_arraySize);
+		std::swap(m_population, other.m_population);
+		std::swap(nonEmptyIndex, other.nonEmptyIndex);
+		std::swap(m_storage, other.m_storage);
+		std::swap(m_storageSize, other.m_storageSize);
+		std::swap(m_storageUsed, other.m_storageUsed);
+	}
+
 
 	friend class Iterator;
 	class Iterator {

data/src/cxx_supportlib/FileDescriptor.h

@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <cerrno>
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Exceptions.h>
 
 namespace Passenger {

data/src/cxx_supportlib/Hooks.h

@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <Utils.h>
 #include <Utils/StrIntUtils.h>
 #include <Utils/VariantMap.h>

data/src/cxx_supportlib/LoggingKit/Assert.h

@@ -0,0 +1,130 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 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_LOGGING_KIT_ASSERT_H_
+#define _PASSENGER_LOGGING_KIT_ASSERT_H_
+
+#include <oxt/backtrace.hpp>
+#include <cstddef>
+#include <cstdlib>
+
+#include <LoggingKit/Logging.h>
+#include <Utils/FastStringStream.h>
+
+namespace Passenger {
+namespace LoggingKit {
+
+
+struct AssertionFailureInfo {
+	const char *filename;
+	const char *function; // May be NULL.
+	const char *expression;
+	unsigned int line;
+
+	AssertionFailureInfo()
+		: filename(NULL),
+		  function(NULL),
+		  expression(NULL),
+		  line(0)
+		{ }
+};
+
+// If assert() or similar fails, we attempt to store its information here.
+extern AssertionFailureInfo lastAssertionFailure;
+
+
+/*
+ * The P_BUG family of macros allow you to print a [BUG] error message
+ * and abort with a stack trace.
+ *
+ * P_BUG(expr)
+ *     Prints the given expression and aborts.
+ *
+ * P_BUG_WITH_FORMATTER_CODE(varname, code)
+ *     Same effect as P_BUG, but it allows more fine-grained control over the behavior.
+ *     This macro declares the internal string stream object with a name defined by `varname`,
+ *     and evaluates the `code`. The given code is supposed to use `<<` calls to append
+ *     add text into the stream.
+ *     When the code is done evaluating, this macro prints the string stream and aborts.
+ *
+ * P_BUG_UTP(expr)
+ * P_BUG_UTP_WITH_FORMATTER_CODE(varname, code)
+ *     Like P_BUG/P_BUG_WITH_FORMATTER_CODE, but instead of allocating a `TRACE_POINT()`
+ *     (which may conflict if the calling function already has one defined), it calls
+ *     `UPDATE_TRACE_POINT()` instead.
+ */
+
+/** Print a [BUG] error message and abort with a stack trace. */
+#define P_BUG_WITH_FORMATTER_CODE(varname, code) \
+	do { \
+		TRACE_POINT(); \
+		const char *_exprStr; \
+		Passenger::FastStringStream<> varname; \
+		code \
+		_exprStr = Passenger::LoggingKit::_strdupFastStringStream(varname); \
+		Passenger::LoggingKit::lastAssertionFailure.filename = __FILE__; \
+		Passenger::LoggingKit::lastAssertionFailure.line = __LINE__; \
+		Passenger::LoggingKit::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
+		Passenger::LoggingKit::lastAssertionFailure.expression = _exprStr; \
+		P_CRITICAL("[BUG] " << _exprStr); \
+		abort(); \
+	} while (false)
+
+#define P_BUG_UTP_WITH_FORMATTER_CODE(varname, code) \
+	do { \
+		UPDATE_TRACE_POINT(); \
+		const char *_exprStr; \
+		Passenger::FastStringStream<> varname; \
+		code \
+		_exprStr = Passenger::LoggingKit::_strdupFastStringStream(varname); \
+		Passenger::LoggingKit::lastAssertionFailure.filename = __FILE__; \
+		Passenger::LoggingKit::lastAssertionFailure.line = __LINE__; \
+		Passenger::LoggingKit::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
+		Passenger::LoggingKit::lastAssertionFailure.expression = _exprStr; \
+		P_CRITICAL("[BUG] " << _exprStr); \
+		abort(); \
+	} while (false)
+
+#define P_BUG(expr) P_BUG_WITH_FORMATTER_CODE( _sstream , _sstream << expr; )
+#define P_BUG_UTP(expr) P_BUG_UTP_WITH_FORMATTER_CODE( _sstream , _sstream << expr; )
+
+
+/**
+ * Asserts whether the actual value equals the expected value.
+ * If not, it prints a message that prints how the two values differ
+ * and aborts.
+ */
+#define P_ASSERT_EQ(value, expected) \
+	do { \
+		if (OXT_UNLIKELY(value != expected)) { \
+			P_BUG("Expected " << #value << " to be " << expected << ", got " << value); \
+		} \
+	} while (false)
+
+
+} // namespace LoggingKit
+} // namespace Passenger
+
+#endif /* _PASSENGER_LOGGING_KIT_ASSERT_H_ */