passenger 5.1.2 → 5.1.3

data/src/agent/Core/Controller/Implementation.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015 Phusion Holding B.V.
+ *  Copyright (c) 2015-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/InitRequest.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2016 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/InitializationAndShutdown.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/InternalUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/Miscellaneous.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/Request.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2016 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/SendRequest.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2016 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/StateInspectionAndConfiguration.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2016 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/Controller/TurboCaching.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/CoreMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -947,7 +947,7 @@ apiServerShutdownFinished(Core::ApiServer::ApiServer *server) {
  */
 static void
 waitForExitEvent() {
-	this_thread::disable_syscall_interruption dsi;
+	boost::this_thread::disable_syscall_interruption dsi;
 	WorkingObjects *wo = workingObjects;
 	fd_set fds;
 	int largestFd = -1;

data/src/agent/Core/OptionParser.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2016 Phusion Holding B.V.
+ *  Copyright (c) 2010-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/ResponseCache.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SecurityUpdateChecker.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2016 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -59,11 +59,6 @@ private:
 	string serverVersion;
 	CurlProxyInfo proxyInfo;
 	Crypto *crypto;
-#if BOOST_OS_MACOS
-	SecKeychainRef defaultKeychain;
-	SecKeychainRef keychain;
-	bool usingPassengerKeychain;
-#endif
 
 	void threadMain() {
 		TRACE_POINT();
@@ -227,8 +222,8 @@ private:
 		}
 
 #if BOOST_OS_MACOS
-		// if not using a private keychain, preauth the security update check key in the user's keychain (this is for libcurl's benefit because they don't bother to authorize themselves to use the keys they import)
-		if (!usingPassengerKeychain && !crypto->preAuthKey(clientCertPath.c_str(), CLIENT_CERT_PWD, CLIENT_CERT_LABEL)) {
+		// preauth the security update check key in the user's keychain (this is for libcurl's benefit because they don't bother to authorize themselves to use the keys they import)
+		if (!crypto->preAuthKey(clientCertPath.c_str(), CLIENT_CERT_PWD, CLIENT_CERT_LABEL)) {
 			return CURLE_SSL_CERTPROBLEM;
 		}
 		if (CURLE_OK != (code = curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, "P12"))) {
@@ -298,83 +293,6 @@ public:
 		checkIntervalSec = 0;
 #if BOOST_OS_MACOS
 		clientCertPath = locator.getResourcesDir() + "/update_check_client_cert.p12";
-		// Used to keep track of which approach we are using, false means we are preauthing the key in the running user's own keychain; true means we create a private keychain and set it as the default
-		usingPassengerKeychain = false;
-		defaultKeychain = NULL;
-		keychain = NULL;
-		OSStatus status = 0;
-		char pathName [PATH_MAX];
-		UInt32 length = PATH_MAX;
-		memset(pathName, 0, PATH_MAX);
-
-		status = SecKeychainCopyDefault(&defaultKeychain);
-		if (status) {
-			CFStringRef str = SecCopyErrorMessageString(status, NULL);
-			P_ERROR(string("Getting default keychain failed: ") +
-					CFStringGetCStringPtr(str, kCFStringEncodingUTF8) +
-					" Passenger will not attempt to create a private keychain.");
-			CFRelease(str);
-		} else {
-			status = SecKeychainGetPath(defaultKeychain, &length, pathName);
-			P_DEBUG(string("username is: ") + getProcessUsername());
-			if (status) {
-				CFStringRef str = SecCopyErrorMessageString(status, NULL);
-				P_ERROR(string("Checking default keychain path failed: ") +
-						CFStringGetCStringPtr(str, kCFStringEncodingUTF8) +
-						" Passenger may use system keychain.");
-				CFRelease(str);
-				pathName[0] = 0; // ensure the pathName compares cleanly
-			} else {
-				P_DEBUG(string("Old default keychain is: ") + pathName);
-			}
-		}
-		// we don't care so much about which user we are, what we care about is is they have their own keychain, if the default keychain is the system keychain, then we need to try and create our own to avoid permissions issues
-		if (strcmp(pathName, "/Library/Keychains/System.keychain") == 0) {
-			usingPassengerKeychain = true;
-			const uint size = 512;
-			uint8_t keychainPassword[size];
-			if (!crypto->generateRandomChars(keychainPassword, size)) {
-				P_CRITICAL("Creating password for Passenger default keychain failed.");
-				usingPassengerKeychain = false;
-			} else {
-				string keychainDir = instancePath;
-				if (instancePath.length() == 0) {
-					char currentPath[PATH_MAX];
-					if (!getcwd(currentPath, PATH_MAX)) {
-						P_ERROR(string("Failed to get cwd: ") + strerror(errno) + " Attempting to use relative path '.'");
-						keychainDir = ".";
-					} else {
-						keychainDir = string(currentPath);
-					}
-				}
-				// create keychain with long random password, then discard password after creation. We receive the keychain unlocked, and no-one else needs to access the keychain.
-				status = SecKeychainCreate((keychainDir + "/passenger.keychain").c_str(), size, keychainPassword, false, NULL, &keychain);
-				memset(keychainPassword, 0, size);
-				if (status) {
-					CFStringRef str = SecCopyErrorMessageString(status, NULL);
-					P_ERROR(string("Creating Passenger default keychain failed: ") +
-							CFStringGetCStringPtr(str, kCFStringEncodingUTF8) +
-							" Passenger may fail to access system keychain.");
-					CFRelease(str);
-					usingPassengerKeychain = false;
-				} else {
-					// set keychain as default so libcurl uses it.
-					status = SecKeychainSetDefault(keychain);
-					if (status) {
-						CFStringRef str = SecCopyErrorMessageString(status, NULL);
-						P_ERROR(string("Setting Passenger default keychain failed: ") +
-								CFStringGetCStringPtr(str, kCFStringEncodingUTF8) +
-								" Passenger may fail to access system keychain.");
-						CFRelease(str);
-						usingPassengerKeychain = false;
-					} else if (!crypto->preAuthKey(clientCertPath.c_str(), CLIENT_CERT_PWD, CLIENT_CERT_LABEL)) {
-						P_ERROR("Failed to preauthorize Passenger Client Cert, you may experience popups from the Keychain.");
-				 /* } else {
-						we have loaded the security update check key into the private keychain with the correct permissions, so libcurl should be able to use it. */
-					}
-				}
-			}
-		}
 #else
 		clientCertPath = locator.getResourcesDir() + "/update_check_client_cert.pem";
 #endif
@@ -400,32 +318,6 @@ public:
 		if (crypto) {
 			delete crypto;
 		}
-#if BOOST_OS_MACOS
-		// if using a private keychain, cleanup keychain on shutdown
-		if (usingPassengerKeychain) {
-			OSStatus status = 0;
-			if (defaultKeychain) {
-				status = SecKeychainSetDefault(defaultKeychain);
-				if (status) {
-					CFStringRef str = SecCopyErrorMessageString(status, NULL);
-					P_ERROR(string("Restoring default keychain failed: ") +
-							CFStringGetCStringPtr(str, kCFStringEncodingUTF8));
-					CFRelease(str);
-				}
-				CFRelease(defaultKeychain);
-			}
-			if (keychain) {
-				status = SecKeychainDelete(keychain);
-				if (status) {
-					CFStringRef str = SecCopyErrorMessageString(status, NULL);
-					P_ERROR(string("Deleting Passenger private keychain failed: ") +
-							CFStringGetCStringPtr(str, kCFStringEncodingUTF8));
-					CFRelease(str);
-				}
-				CFRelease(keychain);
-			}
-		}
-#endif
 	}
 
 	/**
@@ -658,10 +550,8 @@ public:
 		} while (0);
 
 #if BOOST_OS_MACOS
-		// if not using a private keychain remove the security update check key from the user's keychain so that if we are stopped/crash and are upgraded or reinstalled before restarting we don't have permission problems
-		if (!usingPassengerKeychain) {
-			crypto->killKey(CLIENT_CERT_LABEL);
-		}
+		// remove the security update check key from the user's keychain so that if we are stopped/crash and are upgraded or reinstalled before restarting we don't have permission problems
+		crypto->killKey(CLIENT_CERT_LABEL);
 #endif
 
 		if (signatureChars) {

data/src/agent/Core/SpawningKit/BackgroundIOCapturer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -66,14 +66,14 @@ private:
 
 	void capture() {
 		TRACE_POINT();
-		while (!this_thread::interruption_requested()) {
+		while (!boost::this_thread::interruption_requested()) {
 			char buf[1024 * 8];
 			ssize_t ret;
 
 			UPDATE_TRACE_POINT();
 			ret = syscalls::read(fd, buf, sizeof(buf));
 			int e = errno;
-			this_thread::disable_syscall_interruption dsi;
+			boost::this_thread::disable_syscall_interruption dsi;
 			if (ret == 0) {
 				break;
 			} else if (ret == -1) {
@@ -115,8 +115,8 @@ public:
 	~BackgroundIOCapturer() {
 		TRACE_POINT();
 		if (thr != NULL) {
-			this_thread::disable_interruption di;
-			this_thread::disable_syscall_interruption dsi;
+			boost::this_thread::disable_interruption di;
+			boost::this_thread::disable_syscall_interruption dsi;
 			thr->interrupt_and_join();
 			delete thr;
 			thr = NULL;
@@ -136,8 +136,8 @@ public:
 	string stop() {
 		TRACE_POINT();
 		assert(thr != NULL);
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		thr->interrupt_and_join();
 		delete thr;
 		thr = NULL;

data/src/agent/Core/SpawningKit/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/DirectSpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -28,6 +28,7 @@
 
 #include <Core/SpawningKit/Spawner.h>
 #include <Constants.h>
+#include <Logging.h>
 #include <LveLoggingDecorator.h>
 #include <limits.h>  // for PTHREAD_STACK_MIN
 #include <pthread.h>
@@ -101,7 +102,7 @@ private:
 	}
 
 	static void *detachProcessMain(void *arg) {
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_syscall_interruption dsi;
 		pid_t pid = (pid_t) (long) arg;
 		syscalls::waitpid(pid, NULL, 0);
 		return NULL;
@@ -126,7 +127,11 @@ private:
 		if (shouldLoadShellEnvvars(options, preparation)) {
 			command.push_back(preparation.userSwitching.shell);
 			command.push_back(preparation.userSwitching.shell);
-			command.push_back("-lc");
+			if (Passenger::getLogLevel() >= LVL_DEBUG3) {
+				command.push_back("-lxc");
+			} else {
+				command.push_back("-lc");
+			}
 			command.push_back("exec \"$@\"");
 			command.push_back("SpawnPreparerShell");
 		} else {
@@ -155,8 +160,8 @@ public:
 
 	virtual Result spawn(const Options &options) {
 		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		P_DEBUG("Spawning new process: appRoot=" << options.appRoot);
 		possiblyRaiseInternalError(options);
 
@@ -249,8 +254,8 @@ public:
 			UPDATE_TRACE_POINT();
 			Result result;
 			{
-				this_thread::restore_interruption ri(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
+				boost::this_thread::restore_interruption ri(di);
+				boost::this_thread::restore_syscall_interruption rsi(dsi);
 				result = negotiateSpawn(details);
 			}
 

data/src/agent/Core/SpawningKit/DummySpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/Factory.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/Options.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2015 Phusion Holding B.V.
+ *  Copyright (c) 2015-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/PipeWatcher.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2015 Phusion Holding B.V.
+ *  Copyright (c) 2012-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/Result.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.

data/src/agent/Core/SpawningKit/SmartSpawner.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2015 Phusion Holding B.V.
+ *  Copyright (c) 2011-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -29,6 +29,7 @@
 #include <Core/SpawningKit/Spawner.h>
 #include <Core/SpawningKit/PipeWatcher.h>
 #include <Constants.h>
+#include <Logging.h>
 #include <LveLoggingDecorator.h>
 
 #include <adhoc_lve.h>
@@ -105,7 +106,11 @@ private:
 		if (shouldLoadShellEnvvars(options, preparation)) {
 			command.push_back(preparation.userSwitching.shell);
 			command.push_back(preparation.userSwitching.shell);
-			command.push_back("-lc");
+			if (Passenger::getLogLevel() >= LVL_DEBUG3) {
+				command.push_back("-lxc");
+			} else {
+				command.push_back("-lc");
+			}
 			command.push_back("exec \"$@\"");
 			command.push_back("SpawnPreparerShell");
 		} else {
@@ -202,8 +207,8 @@ private:
 
 	void startPreloader() {
 		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 		assert(!preloaderStarted());
 		P_DEBUG("Spawning new preloader: appRoot=" << options.appRoot);
 		checkChrootDirectories(options);
@@ -292,8 +297,8 @@ private:
 			details.timeout = options.startTimeout * 1000;
 
 			{
-				this_thread::restore_interruption ri(di);
-				this_thread::restore_syscall_interruption rsi(dsi);
+				boost::this_thread::restore_interruption ri(di);
+				boost::this_thread::restore_syscall_interruption rsi(dsi);
 				socketAddress = negotiatePreloaderStartup(details);
 			}
 			this->adminSocket = adminSocket.second;
@@ -324,8 +329,8 @@ private:
 
 	void stopPreloader() {
 		TRACE_POINT();
-		this_thread::disable_interruption di;
-		this_thread::disable_syscall_interruption dsi;
+		boost::this_thread::disable_interruption di;
+		boost::this_thread::disable_syscall_interruption dsi;
 
 		if (!preloaderStarted()) {
 			return;