passenger 5.1.1 → 5.1.2

data/src/cxx_supportlib/Constants.h

@@ -80,7 +80,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.1.1"
+#define PASSENGER_VERSION "5.1.2"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
@@ -95,7 +95,7 @@
 #define SERVER_KIT_MAX_SERVER_ENDPOINTS 4
 #define SERVER_TOKEN_NAME "Phusion_Passenger"
 #define SHORT_PROGRAM_NAME "Passenger"
-#define SUPPORT_URL "https://www.phusionpassenger.com/documentation_and_support"
+#define SUPPORT_URL "https://www.phusionpassenger.com/support"
 #define USER_NAMESPACE_DIRNAME ".passenger"
 
 #endif /* _PASSENGER_CONSTANTS_H_ */

data/src/cxx_supportlib/Crypto.cpp

@@ -56,29 +56,15 @@ Crypto::~Crypto() {
 CFDictionaryRef Crypto::createQueryDict(const char *label) {
 	if (kSecClassIdentity != NULL) {
 		const size_t size = 5L;
-		CFTypeRef keys[size];
-		CFTypeRef values[size];
-		CFDictionaryRef queryDict;
-		CFStringRef cfLabel = CFStringCreateWithCString(NULL, label,
-														kCFStringEncodingUTF8);
-
-		/* Set up our search criteria and expected results: */
-		values[0] = kSecClassIdentity; /* we want a certificate and a key */
-		keys[0] = kSecClass;
-		values[1] = kCFBooleanTrue;    /* we need a reference */
-		keys[1] = kSecReturnRef;
-		values[2] = kSecMatchLimitOne; /* one is enough, thanks */
-		keys[2] = kSecMatchLimit;
-		/* identity searches need a SecPolicyRef in order to work */
-		values[3] = SecPolicyCreateSSL(false, NULL);
-		keys[3] = kSecMatchPolicy;
-		values[4] = cfLabel;
-		keys[4] = kSecMatchSubjectWholeString;
-		queryDict = CFDictionaryCreate(NULL, (const void **) keys,
-									   (const void **) values, size,
+		CFStringRef cfLabel = CFStringCreateWithCString(NULL, label, kCFStringEncodingUTF8);
+		SecPolicyRef policy = SecPolicyCreateSSL(false, NULL);
+		CFTypeRef keys[] = {kSecClass, kSecReturnRef, kSecMatchLimit, kSecMatchPolicy, kSecMatchSubjectWholeString};
+		CFTypeRef values[] = {kSecClassIdentity, kCFBooleanTrue, kSecMatchLimitOne, policy, cfLabel};
+
+		CFDictionaryRef queryDict = CFDictionaryCreate(NULL, keys, values, size,
 									   &kCFCopyStringDictionaryKeyCallBacks,
 									   &kCFTypeDictionaryValueCallBacks);
-		CFRelease(values[3]);
+		CFRelease(policy);
 		CFRelease(cfLabel);
 
 		return queryDict;
@@ -114,6 +100,9 @@ OSStatus Crypto::copyIdentityFromPKCS12File(const char *cPath,
 											const char *cPassword,
 											const char *cLabel) {
 	OSStatus status = errSecItemNotFound;
+	if (strlen(cPath) == 0) {
+		return errSecMissingValue;
+	}
 	CFURLRef url = CFURLCreateFromFileSystemRepresentation(NULL,
 														   (const UInt8 *) cPath, strlen(cPath), false);
 	CFStringRef password = cPassword ? CFStringCreateWithCString(NULL,
@@ -129,6 +118,9 @@ OSStatus Crypto::copyIdentityFromPKCS12File(const char *cPath,
 	}
 
 	SecAccessRef access = createAccess(cLabel);
+	if (access == NULL) {
+		return status;
+	}
 	CFTypeRef cKeys[] = {kSecImportExportPassphrase, kSecImportExportAccess};
 	CFTypeRef cValues[] = {password, access};
 	CFDictionaryRef options = CFDictionaryCreate(NULL, cKeys, cValues, 2L, NULL, NULL);
@@ -242,7 +234,7 @@ bool Crypto::generateRandomChars(unsigned char *rndChars, int rndLen) {
 											  CFSTR("Have you tried turning it off and on again?") };
 
 		CFErrorRef error = CFErrorCreateWithUserInfoKeysAndValues(NULL, kCFErrorDomainOSStatus, errNum, userInfoKeys, userInfoValues, numKeys);
-		logFreeErrorExtended("SecVerifyTransformCreate", error);
+		logFreeErrorExtended("generateRandomChars failed", error);
 		return false;
 	}
 	for (int i = 0; i < rndLen; i++) {

data/src/cxx_supportlib/Crypto.h

@@ -88,7 +88,6 @@ private:
 	OSStatus copyIdentityFromPKCS12File(const char *cPath, const char *cPassword, const char *cLabel);
 	CFDataRef genIV(size_t iv_size);
 	bool getKeyBytes(SecKeyRef cryptokey, void **target, size_t &len);
-	bool generateRandomChars(unsigned char *rndChars, int rndLen);
 	bool memoryBridge(CFDataRef input, void **target, size_t &len);
 	bool innerMemoryBridge(void *input, void **target, size_t len);
 #else
@@ -110,6 +109,7 @@ public:
 	 */
 	bool preAuthKey(const char *path, const char *passwd, const char *cLabel);
 	void killKey(const char *cLabel);
+	bool generateRandomChars(unsigned char *rndChars, int rndLen);
 #endif
 
 	/**

data/src/cxx_supportlib/Utils/DateParsing.h

@@ -84,7 +84,7 @@ parsedDateToTimestamp(struct tm &tm, int zone) {
 	// tmUsingLocalTZ now contains tm interpreted as being in our local timezone instead of the intended UTC
 	// Example: 10 UTC interpreted as 10 GMT+1 instead of 11 GMT+1
 
-#if !defined(sun) && !defined(__sun)
+#if !defined(sun) && !defined(__sun) && !defined(BOOST_OS_MACOS)
 	// tm_gmtoff = "seconds east of UTC", so the example 10 GMT+1 would now be corrected to (10+1) GMT+1
 	timeUsingLocalTZ += tm.tm_gmtoff;
 #else

data/src/helper-scripts/node-loader.js

@@ -28,7 +28,6 @@ module.paths.unshift(__dirname + "/../src/nodejs_supportlib");
 var EventEmitter = require('events').EventEmitter;
 var os = require('os');
 var fs = require('fs');
-var net = require('net');
 var http = require('http');
 var util = require('util');
 
@@ -86,28 +85,30 @@ var vm = require('vm');
 var orig_func = vm.runInThisContext;
 vm.runInThisContext = function() {
 	try {
-		var scriptPath = arguments['1'];
-		if (typeof scriptPath == 'object') {
-			scriptPath = scriptPath['filename'];
-		}
-		if (scriptPath.indexOf('meteorhacks_cluster') != -1) {
-			console.trace(badPackageError("Meteorhacks cluster package"));
-			return (function() {
-				Package['meteorhacks:cluster'] = {
-					Cluster: {
- 						_publicServices				: {},
-						_registeredServices			: {},
-						_discoveryBackends			: { mongodb: {} },
-						connect						: function(){return false;},
-						allowPublicAccess			: function(){return false;},
-						discoverConnection			: function(){return false;},
-						register					: function(){return false;},
-						_isPublicService			: function(){return false;},
-						registerDiscoveryBackend	: function(){return false;},
-						_blockCallAgain				: function(){return false;}
-					}
-				};
-			});
+		if (arguments.length > 1) {
+			var scriptPath = arguments['1'];
+			if (typeof scriptPath == 'object') {
+				scriptPath = scriptPath['filename'];
+			}
+			if (scriptPath.indexOf('meteorhacks_cluster') != -1) {
+				console.trace(badPackageError("Meteorhacks cluster package"));
+				return (function() {
+					Package['meteorhacks:cluster'] = {
+						Cluster: {
+							_publicServices				: {},
+							_registeredServices			: {},
+							_discoveryBackends			: { mongodb: {} },
+							connect						: function(){return false;},
+							allowPublicAccess			: function(){return false;},
+							discoverConnection			: function(){return false;},
+							register					: function(){return false;},
+							_isPublicService			: function(){return false;},
+							registerDiscoveryBackend	: function(){return false;},
+							_blockCallAgain				: function(){return false;}
+						}
+					};
+				});
+			}
 		}
 	} catch (e) {
 		meteorClusterErrCount++;
@@ -196,9 +197,9 @@ function setupEnvironment(options) {
 	var logLevel = passengerToWinstonLogLevel(PhusionPassenger.options.log_level);
 	var winston = require("vendor-copy/winston");
 	var logger = new (winston.Logger)({
-  		transports: [
-  			new (winston.transports.Console)({ level: logLevel, debugStdout: true })
-  		]
+			transports: [
+				new (winston.transports.Console)({ level: logLevel, debugStdout: true })
+			]
 	});
 
 	process.title = 'Passenger NodeApp: ' + options.app_root;
@@ -300,6 +301,38 @@ function addListenerAtBeginning(emitter, event, callback) {
 	}
 }
 
+function doListen(server, listenTries, callback) {
+	function errorHandler(error) {
+		if (error.errno == 'EADDRINUSE') {
+			if (listenTries == 100) {
+				server.emit('error', new Error(
+					'Phusion Passenger could not find suitable socket address to bind on'));
+			} else {
+				// Try again with another socket path.
+				listenTries++;
+				doListen(server, listenTries, callback);
+			}
+		} else {
+			server.emit('error', error);
+		}
+	}
+
+	var socketPath = PhusionPassenger.options.socket_path = generateServerSocketPath();
+	server.once('error', errorHandler);
+	server.originalListen(socketPath, function() {
+		server.removeListener('error', errorHandler);
+		doneListening(server, callback);
+		process.nextTick(finalizeStartup);
+	});
+}
+
+function doneListening(server, callback) {
+	if (callback) {
+		server.once('listening', callback);
+	}
+	server.emit('listening');
+}
+
 function installServer() {
 	var server = this;
 	if (!PhusionPassenger._appInstalled) {
@@ -319,39 +352,7 @@ function installServer() {
 		});
 
 		var listenTries = 0;
-		doListen(extractCallback(arguments));
-
-		function doListen(callback) {
-			function errorHandler(error) {
-				if (error.errno == 'EADDRINUSE') {
-					if (listenTries == 100) {
-						server.emit('error', new Error(
-							'Phusion Passenger could not find suitable socket address to bind on'));
-					} else {
-						// Try again with another socket path.
-						listenTries++;
-						doListen(callback);
-					}
-				} else {
-					server.emit('error', error);
-				}
-			}
-
-			var socketPath = PhusionPassenger.options.socket_path = generateServerSocketPath();
-			server.once('error', errorHandler);
-			server.originalListen(socketPath, function() {
-				server.removeListener('error', errorHandler);
-				doneListening(callback);
-				process.nextTick(finalizeStartup);
-			});
-		}
-
-		function doneListening(callback) {
-			if (callback) {
-				server.once('listening', callback);
-			}
-			server.emit('listening');
-		}
+		doListen(server, listenTries, extractCallback(arguments));
 
 		return server;
 	} else {

data/src/nodejs_supportlib/phusion_passenger/line_reader.js

@@ -62,7 +62,7 @@ function LineReader(stream) {
 	}
 
 	function onData(data) {
-		var index, line, callback;
+		var index, line;
 
 		if (self.buffer == undefined) {
 			// Already closed.
@@ -100,19 +100,19 @@ LineReader.prototype.close = function() {
 	this._pause();
 	this.buffer = undefined;
 	this.lines = undefined;
-}
+};
 
 LineReader.prototype.isClosed = function() {
 	return this.buffer === undefined;
-}
+};
 
 LineReader.prototype.endReached = function() {
 	return this.eof;
-}
+};
 
 LineReader.prototype.lineBufferIsFull = function() {
 	return this.lines.length > 0;
-}
+};
 
 LineReader.prototype.readLine = function(callback) {
 	if (this.lines.length > 0) {
@@ -128,7 +128,7 @@ LineReader.prototype.readLine = function(callback) {
 	} else {
 		this.callbacks.push(callback);
 	}
-}
+};
 
 LineReader.prototype._autoPauseOrResume = function() {
 	if (this.buffer != undefined) {
@@ -138,20 +138,20 @@ LineReader.prototype._autoPauseOrResume = function() {
 			this._resume();
 		}
 	}
-}
+};
 
 LineReader.prototype._pause = function() {
 	if (!this.paused) {
 		this.paused = true;
 		this.stream.pause();
 	}
-}
+};
 
 LineReader.prototype._resume = function() {
 	if (this.paused) {
 		this.paused = false;
 		this.stream.resume();
 	}
-}
+};
 
 exports.LineReader = LineReader;

data/src/nodejs_supportlib/phusion_passenger/log_express.js

@@ -67,11 +67,11 @@ exports.initPreLoad = function() {
 			}
 
 			return express.application.useOrig.apply(this, arguments);
-		}
+		};
 	} catch (e) {
 		log.error("Unable to instrument Express due to error: " + e);
 	}
-}
+};
 
 exports.initPostLoad = function() {
 	if (!express) {
@@ -86,7 +86,7 @@ exports.initPostLoad = function() {
 	} catch (e) {
 		log.error("Unable to instrument Express error flow due to error: " + e);
 	}
-}
+};
 
 function logRequest(req, res, next) {
 	log.verbose("==== Instrumentation [Express] ==== REQUEST [" + req.method + " " + req.url + "] attach");

data/src/nodejs_supportlib/phusion_passenger/log_mongodb.js

@@ -65,9 +65,8 @@ function instrumentCollectionMethod(origParent, functionName, newFn) {
 }
 
 function collectionFn(origArguments, databaseName, collectionName, functionName, originalFn) {
-	var friendlyName = databaseName + "." + collectionName + "." + functionName + "(..)";
 	var query = "";
-	for (i = 0; i < origArguments.length; i++) {
+	for (var i = 0; i < origArguments.length; i++) {
 		if (typeof(origArguments[i]) != 'function') { // mongoskin
 			query += (i > 0 ? "," : "") + JSON.stringify(origArguments[i]);
 		}
@@ -111,13 +110,13 @@ exports.initPreLoad = function() {
 	wrapRepairCLSMongoskinUtils(appRoot);
 
 	try {
-		for (i = 0; i < collectionMethods.length; i++) {
+		for (var i = 0; i < collectionMethods.length; i++) {
 			instrumentCollectionMethod(mongodb.Collection.prototype, collectionMethods[i], collectionFn);
 		}
 	} catch (e) {
 		log.error("Unable to instrument MongoDB due to error: " + e);
 	}
-}
+};
 
 function wrapRepairCLSMongo14() {
 	try {
@@ -139,7 +138,7 @@ function wrapRepairCLSMongo14() {
 			} else {
 				this._passenger_wrapped__executeQueryCommand.apply(this, arguments);
 			}
-		}
+		};
 
 		mongodb.Db.prototype._passenger_wrapped__executeInsertCommand = mongodb.Db.prototype._executeInsertCommand;
 		mongodb.Db.prototype._executeInsertCommand = function() {
@@ -154,7 +153,7 @@ function wrapRepairCLSMongo14() {
 			} else {
 				this._passenger_wrapped__executeInsertCommand.apply(this, arguments);
 			}
-		}
+		};
 		log.verbose("Using MongoDB 1.4.x continuation-local-storage workaround");
 	} catch (e) {
 		log.error("Not using MongoDB continuation-local-storage workaround: " + e);
@@ -185,10 +184,10 @@ function wrapRepairCLSMongoskinUtils(appRoot) {
 			skinClass.prototype.open = function(callback) {
 				// Finally we can bind the callback so that when the emitter calls it, the cls is mapped correctly.
 				return skinClass.prototype._passenger_wrapped_open.call(this, ustReporter.getCLSWrappedCallback(callback));
-			}
+			};
 
 			return skinClass;
-		}
+		};
 		log.verbose("Using mongoskin continuation-local-storage workaround");
 	} catch (e) {
 		log.error("Not using mongoskin continuation-local-storage workaround (probably an unsupported version): " + e);
@@ -199,5 +198,5 @@ exports.initPostLoad = function() {
 	//if (!mongodb) {
 	//	return;
 	//}
-}
+};
 

data/src/nodejs_supportlib/phusion_passenger/ustreporter.js

@@ -45,14 +45,14 @@ var appRoot;
  */
 exports.getPassengerLogger = function() {
 	return log;
-}
+};
 
 /**
  * @return the application root path, needed for instrumenting an application's node modules.
  */
 exports.getApplicationRoot = function() {
 	return appRoot;
-}
+};
 
 /**
  * @return timestamp in microseconds to be used as the start or end timestamp for timed logging (monotonic clock, not wall clock).
@@ -60,7 +60,7 @@ exports.getApplicationRoot = function() {
 exports.nowTimestamp = function() {
 	var secAndUsec = process.hrtime();
 	return Math.round((secAndUsec[0] * 1e6) + (secAndUsec[1] / 1e3));
-}
+};
 
 /**
  * All Activity logs will be dropped unless they are done after this method, from within an execution chain starting with the callback. So it is
@@ -102,28 +102,28 @@ exports.attachToRequest = function(request, response, callback) {
 	} catch (e) {
 		log.error("Dropping Union Station request log due to error:\n" + e.stack);
 	}
-}
+};
 
 /**
  * Log a timed block, described by activityName, with an optional message to display (e.g. in a mouseover).
  */
 exports.logTimedActivityGeneric = function(activityName, tBegin, tEnd, message) {
 	logTimedActivity(activityName, tBegin, tEnd, "generic", message ? { "message": message } : undefined);
-}
+};
 
 /**
  * Log a timed mongo database interaction block, described by activityName, with an optional query to display (e.g. in a mouseover).
  */
 exports.logTimedActivityMongo = function(activityName, tBegin, tEnd, query) {
 	logTimedActivity(activityName, tBegin, tEnd, "mongo", query ? { "query": query } : undefined);
-}
+};
 
 /**
  * Log a timed SQL database interaction block, described by activityName, with an optional query to display (e.g. in a mouseover).
  */
 exports.logTimedActivitySQL = function(activityName, tBegin, tEnd, query) {
 	logTimedActivity(activityName, tBegin, tEnd, "sql", query ? { "query": query } : undefined);
-}
+};
 
 /**
  * Internal, base for the public logTimedActivity...()
@@ -198,7 +198,7 @@ exports.logException = function(name, message, trace) {
 	} catch (e) {
 		log.error("Dropping Union Station exception log due to error:\n" + e.stack);
 	}
-}
+};
 
 /**
  * Get the current request transaction id necessary to append logs to it. This is normally done automatically, but some modules break automatic attachment
@@ -215,7 +215,7 @@ exports.getCurrentTxnId = getCurrentTxnId;
  */
 exports.getCLSWrappedCallback = function(origCallback) {
 	return reqNamespace.bind(origCallback);
-}
+};
 
 /**
  * For internal use. Called by Passenger loader, no need to call from anywhere else.
@@ -224,4 +224,4 @@ exports.init = function(logger, applicationRoot, ustLogger) {
 	log = logger;
 	appRoot = applicationRoot;
 	ustLog = ustLogger;
-}
+};