passenger 5.0.20 → 5.0.21

data/src/ruby_supportlib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

data/src/ruby_supportlib/phusion_passenger/utils/unseekable_socket.rb

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.0.20
+  version: 5.0.21
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -378,10 +378,6 @@ files:
 - src/apache2_module/SetHeaders.cpp
 - src/apache2_module/SetHeaders.cpp.erb
 - src/apache2_module/mod_passenger.c
-- src/cxx_supportlib/Account.h
-- src/cxx_supportlib/AccountsDatabase.h
-- src/cxx_supportlib/AgentsStarter.cpp
-- src/cxx_supportlib/AgentsStarter.h
 - src/cxx_supportlib/AppTypes.cpp
 - src/cxx_supportlib/AppTypes.h
 - src/cxx_supportlib/BackgroundEventLoop.cpp
@@ -479,6 +475,8 @@ files:
 - src/cxx_supportlib/Utils/Template.h
 - src/cxx_supportlib/Utils/Timer.h
 - src/cxx_supportlib/Utils/VariantMap.h
+- src/cxx_supportlib/WatchdogLauncher.cpp
+- src/cxx_supportlib/WatchdogLauncher.h
 - src/cxx_supportlib/oxt/Readme.txt
 - src/cxx_supportlib/oxt/backtrace.hpp
 - src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp
@@ -499,37 +497,6 @@ files:
 - src/cxx_supportlib/oxt/system_calls.hpp
 - src/cxx_supportlib/oxt/thread.hpp
 - src/cxx_supportlib/oxt/tracable_exception.hpp
-- src/cxx_supportlib/vendor-copy/libev/Changes
-- src/cxx_supportlib/vendor-copy/libev/LICENSE
-- src/cxx_supportlib/vendor-copy/libev/Makefile.am
-- src/cxx_supportlib/vendor-copy/libev/Makefile.in
-- src/cxx_supportlib/vendor-copy/libev/README
-- src/cxx_supportlib/vendor-copy/libev/aclocal.m4
-- src/cxx_supportlib/vendor-copy/libev/autogen.sh
-- src/cxx_supportlib/vendor-copy/libev/config.guess
-- src/cxx_supportlib/vendor-copy/libev/config.h.in
-- src/cxx_supportlib/vendor-copy/libev/config.sub
-- src/cxx_supportlib/vendor-copy/libev/configure
-- src/cxx_supportlib/vendor-copy/libev/configure.ac
-- src/cxx_supportlib/vendor-copy/libev/depcomp
-- src/cxx_supportlib/vendor-copy/libev/ev++.h
-- src/cxx_supportlib/vendor-copy/libev/ev.c
-- src/cxx_supportlib/vendor-copy/libev/ev.h
-- src/cxx_supportlib/vendor-copy/libev/ev_epoll.c
-- src/cxx_supportlib/vendor-copy/libev/ev_kqueue.c
-- src/cxx_supportlib/vendor-copy/libev/ev_poll.c
-- src/cxx_supportlib/vendor-copy/libev/ev_port.c
-- src/cxx_supportlib/vendor-copy/libev/ev_select.c
-- src/cxx_supportlib/vendor-copy/libev/ev_vars.h
-- src/cxx_supportlib/vendor-copy/libev/ev_win32.c
-- src/cxx_supportlib/vendor-copy/libev/ev_wrap.h
-- src/cxx_supportlib/vendor-copy/libev/event.c
-- src/cxx_supportlib/vendor-copy/libev/event.h
-- src/cxx_supportlib/vendor-copy/libev/install-sh
-- src/cxx_supportlib/vendor-copy/libev/libev.m4
-- src/cxx_supportlib/vendor-copy/libev/ltmain.sh
-- src/cxx_supportlib/vendor-copy/libev/missing
-- src/cxx_supportlib/vendor-copy/libev/mkinstalldirs
 - src/cxx_supportlib/vendor-copy/libuv/AUTHORS
 - src/cxx_supportlib/vendor-copy/libuv/ChangeLog
 - src/cxx_supportlib/vendor-copy/libuv/LICENSE
@@ -2844,6 +2811,37 @@ files:
 - src/cxx_supportlib/vendor-modified/jsoncpp/json-forwards.h
 - src/cxx_supportlib/vendor-modified/jsoncpp/json.h
 - src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp
+- src/cxx_supportlib/vendor-modified/libev/Changes
+- src/cxx_supportlib/vendor-modified/libev/LICENSE
+- src/cxx_supportlib/vendor-modified/libev/Makefile.am
+- src/cxx_supportlib/vendor-modified/libev/Makefile.in
+- src/cxx_supportlib/vendor-modified/libev/README
+- src/cxx_supportlib/vendor-modified/libev/aclocal.m4
+- src/cxx_supportlib/vendor-modified/libev/autogen.sh
+- src/cxx_supportlib/vendor-modified/libev/config.guess
+- src/cxx_supportlib/vendor-modified/libev/config.h.in
+- src/cxx_supportlib/vendor-modified/libev/config.sub
+- src/cxx_supportlib/vendor-modified/libev/configure
+- src/cxx_supportlib/vendor-modified/libev/configure.ac
+- src/cxx_supportlib/vendor-modified/libev/depcomp
+- src/cxx_supportlib/vendor-modified/libev/ev++.h
+- src/cxx_supportlib/vendor-modified/libev/ev.c
+- src/cxx_supportlib/vendor-modified/libev/ev.h
+- src/cxx_supportlib/vendor-modified/libev/ev_epoll.c
+- src/cxx_supportlib/vendor-modified/libev/ev_kqueue.c
+- src/cxx_supportlib/vendor-modified/libev/ev_poll.c
+- src/cxx_supportlib/vendor-modified/libev/ev_port.c
+- src/cxx_supportlib/vendor-modified/libev/ev_select.c
+- src/cxx_supportlib/vendor-modified/libev/ev_vars.h
+- src/cxx_supportlib/vendor-modified/libev/ev_win32.c
+- src/cxx_supportlib/vendor-modified/libev/ev_wrap.h
+- src/cxx_supportlib/vendor-modified/libev/event.c
+- src/cxx_supportlib/vendor-modified/libev/event.h
+- src/cxx_supportlib/vendor-modified/libev/install-sh
+- src/cxx_supportlib/vendor-modified/libev/libev.m4
+- src/cxx_supportlib/vendor-modified/libev/ltmain.sh
+- src/cxx_supportlib/vendor-modified/libev/missing
+- src/cxx_supportlib/vendor-modified/libev/mkinstalldirs
 - src/cxx_supportlib/vendor-modified/modp_b64.cpp
 - src/cxx_supportlib/vendor-modified/modp_b64.h
 - src/cxx_supportlib/vendor-modified/modp_b64_data.h
@@ -2934,6 +2932,7 @@ files:
 - src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/ruby.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/utilities.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/linux.rb
+- src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/ruby.rb
 - src/ruby_supportlib/phusion_passenger/platform_info/zlib.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJWBVgtAAoJECrHRaUKISqMRaUH/ifqMnFYPxS/1O49K5nb4gkb
-FcOkj3cz5RDAm2jtLifuwAVOmYb9XLyTsxcgc71qpfrJpC5e2O7Sufl7+ECMicdj
-EeyxxtwvQxUl0QbPxKrgYDga3ezDtPMiBf7vXNyafHxep8jppuQ3N67+eE9VjA/H
-S5/ZPqoQVqYZzKLEYUuB6eNrubCVKbTZcJXkx5ns9rs3QWsiZK/RNyuQdAanJNmM
-z8ZpOXjaIW6QKn9e1lQMmtzXWD3KTARzVa0XiV0srd2nNF/+olOa1vTN+dpO71tP
-RrjWwhrkjjdSnNmhJCLhU3b7sdsgtpHyzT99elyAxRmbEQEDlC74A727GRw+Hzc=
-=X4J3
+iQEcBAABAgAGBQJWKKTiAAoJECrHRaUKISqMekQH/1osYVyAJQ13IA9saa0qd7zw
+ebgUPfao2rL4HQIvguxxO1m03wlzeOj1Thwyayl3/3cAqT8+7hyuqzTXuE5Haw5C
+CnIZxaaFQDINNCWnR72jAsFzMgAMPw/E5i1dqj+qQg800EIw3A/ahEMWA12c0TSm
+cfYOcAffDUiwTqOIEjYvoP2bpMi5onyGBR4zvS8DmekPhPr6McvEQi7BhFDgPPnA
+ozkFns1HIhjizqMM9cG1BmpRxodc+iLhGriTpgfu508ETl5ZKJYJOhMomEawtJ8A
+k5sX2UEqsOIcw0tyibJ/XgF8Yd1ncPurZHrzYzO+jih105zOhCLKImawxxWmQhs=
+=wsRl
 -----END PGP SIGNATURE-----

data/src/cxx_supportlib/Account.h

@@ -1,171 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion
- *
- *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- *
- *  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_ACCOUNT_H_
-#define _PASSENGER_ACCOUNT_H_
-
-#include <string>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <StaticString.h>
-#include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
-
-namespace Passenger {
-
-using namespace boost;
-using namespace std;
-
-/*
- * SECURITY NOTES
- *
- * We want to avoid storing plain text passwords in memory, because attackers may be able
- * to read this process's memory, e.g. through core dumps or debuggers. So in this source
- * file, as well as in several others, we follow these guidelines:
- *
- * - Variables and arguments named userSuppliedPassword represent passwords
- *   supplied by a human, i.e. user input. These variables and arguments have the type
- *   'StaticString' instead of 'string', because we want to avoid accidentally copying
- *   the password values.
- * - Variables and arguments named passwordOrHash might also represent passwords. However,
- *   if it is a password, then it is guaranteed NOT to be supplied by a human, e.g. it's
- *   randomly generated. Therefore it's okay for passwordOrHash to be of type 'string'.
- * - If there is a need to copy the password for whatever reason, then it must be cleared
- *   with ZeroMemoryGuard as soon as possible. Do not use memset(), the code
- *   for ZeroMemoryGuard explains why.
- */
-
-class Account {
-public:
-	enum Rights {
-		ALL                       = ~0,
-		NONE                      = 0,
-
-		// Passenger core ApplicationPool rights.
-		CLEAR                     = 1 << 0,
-		DETACH                    = 1 << 1,
-		SET_PARAMETERS            = 1 << 2,
-		RESTART                   = 1 << 3,
-		INSPECT_BASIC_INFO        = 1 << 4,
-		INSPECT_SENSITIVE_INFO    = 1 << 5,
-
-		// Passenger core admin rights.
-		INSPECT_REQUESTS          = 1 << 8,
-		INSPECT_BACKTRACES        = 1 << 9,
-
-		// Other rights.
-		EXIT                      = 1 << 31
-	};
-
-private:
-	string username;
-	string passwordOrHash;
-	bool hashGiven;
-	Rights rights;
-
-public:
-	// Urgh, I can't use 'Rights' here as type because apparently bitwise
-	// ORing two enums results in an int type.
-
-	static Rights parseRightsString(const string &str, int defaultValue = NONE) {
-		vector<string> rights_vec;
-		vector<string>::const_iterator it;
-		int result = defaultValue;
-
-		split(str, ',', rights_vec);
-		for (it = rights_vec.begin(); it != rights_vec.end(); it++) {
-			if (*it == "all") {
-				result = ALL;
-			} else if (*it == "none") {
-				result = NONE;
-
-			} else if (*it == "clear") {
-				result |= CLEAR;
-			} else if (*it == "detach") {
-				result |= DETACH;
-			} else if (*it == "set_parameters") {
-				result |= SET_PARAMETERS;
-			} else if (*it == "inspect_basic_info") {
-				result |= INSPECT_BASIC_INFO;
-			} else if (*it == "inspect_sensitive_info") {
-				result |= INSPECT_SENSITIVE_INFO;
-
-			} else if (*it == "inspect_requests") {
-				result |= INSPECT_REQUESTS;
-			} else if (*it == "inspect_backtraces") {
-				result |= INSPECT_BACKTRACES;
-
-			} else if (*it == "exit") {
-				result |= EXIT;
-
-			} else if (*it != "") {
-				throw ArgumentException("Unknown right '" + *it + "'.");
-			}
-		}
-
-		return (Rights) result;
-	}
-
-	Account(const string &username, const string &passwordOrHash, bool hashGiven, int rights = ALL) {
-		this->username       = username;
-		this->passwordOrHash = passwordOrHash;
-		this->hashGiven      = hashGiven;
-		this->rights         = (Rights) rights;
-	}
-
-	bool checkPasswordOrHash(const StaticString &userSuppliedPassword) const {
-		if (hashGiven) {
-			return passwordOrHash == createHash(userSuppliedPassword);
-		} else {
-			return userSuppliedPassword == passwordOrHash;
-		}
-	}
-
-	bool hasRights(int rights) const {
-		return this->rights & rights;
-	}
-
-	void setRights(int rights) {
-		this->rights = (Rights) rights;
-	}
-
-	string getUsername() const {
-		return username;
-	}
-
-	string getRawPassword() const {
-		return passwordOrHash;
-	}
-
-	static string createHash(const StaticString &userSuppliedPassword) {
-		// TODO: use bcrypt or something
-		return userSuppliedPassword;
-	}
-};
-
-typedef boost::shared_ptr<Account> AccountPtr;
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_ACCOUNT_H_ */

data/src/cxx_supportlib/AccountsDatabase.h

@@ -1,125 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
- *
- *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
- *
- *  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_ACCOUNTS_DATABASE_H_
-#define _PASSENGER_ACCOUNTS_DATABASE_H_
-
-#include <string>
-#include <map>
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-#include <Account.h>
-#include <StaticString.h>
-
-/* This source file follows the security guidelines written in Account.h. */
-
-namespace Passenger {
-
-using namespace std;
-using namespace boost;
-
-class AccountsDatabase;
-typedef boost::shared_ptr<AccountsDatabase> AccountsDatabasePtr;
-
-
-class AccountsDatabase {
-private:
-	mutable boost::mutex lock;
-	map<string, AccountPtr> accounts;
-	unsigned int uniqueNumber;
-
-public:
-	AccountsDatabase() {
-		uniqueNumber = 0;
-	}
-
-	unsigned int size() const {
-		boost::lock_guard<boost::mutex> l(lock);
-		return (unsigned int) accounts.size();
-	}
-
-	vector<string> listUsernames() const {
-		map<string, AccountPtr>::const_iterator it;
-		vector<string> result;
-
-		for (it = accounts.begin(); it != accounts.end(); it++) {
-			result.push_back(it->second->getUsername());
-		}
-		return result;
-	}
-
-	AccountPtr add(const string &username, const string &passwordOrHash, bool hashGiven, int rights = Account::ALL) {
-		AccountPtr account(new Account(username, passwordOrHash, hashGiven, rights));
-		boost::lock_guard<boost::mutex> l(lock);
-		accounts[username] = account;
-		return account;
-	}
-
-	const AccountPtr get(const string &username) const {
-		boost::lock_guard<boost::mutex> l(lock);
-		map<string, AccountPtr>::const_iterator it = accounts.find(username);
-		if (it == accounts.end()) {
-			return AccountPtr();
-		} else {
-			return it->second;
-		}
-	}
-
-	AccountPtr authenticate(const string &username, const StaticString &userSuppliedPassword) const {
-		boost::lock_guard<boost::mutex> l(lock);
-		map<string, AccountPtr>::const_iterator it = accounts.find(username);
-		if (it == accounts.end()) {
-			return AccountPtr();
-		} else {
-			AccountPtr account = it->second;
-			if (account->checkPasswordOrHash(userSuppliedPassword)) {
-				return account;
-			} else {
-				return AccountPtr();
-			}
-		}
-	}
-
-	bool remove(const string &username) {
-		boost::lock_guard<boost::mutex> l(lock);
-		map<string, AccountPtr>::iterator it = accounts.find(username);
-		if (it == accounts.end()) {
-			return false;
-		} else {
-			accounts.erase(it);
-			return true;
-		}
-	}
-
-	unsigned int getUniqueNumber() {
-		boost::lock_guard<boost::mutex> l(lock);
-		unsigned int result = uniqueNumber;
-		uniqueNumber++;
-		return result;
-	}
-};
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_ACCOUNTS_DATABASE_H_ */