passenger 4.0.59 → 4.0.60

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzI2ZWQ1ZDBjY2U4YjFjODA4NDJlYjBkYzQxMGVjZGYwMTJmYzE0Zg==
+    NDViZjk3NjY1ZTI4ZTlkMjc1MDkwYTQ4OTM2MmMyYTU1MjExMDRiZA==
   data.tar.gz: !binary |-
-    ZDBhN2M3MTM1OThmNmRkNGIwN2Q2OTQ0NDI0ZDYzZjdiYjBjNDdjYw==
+    ZjljYmQwOTc4YjY2OWNkNGE2NTY2NjZkMmMzNTA1MWY3NDMzOTk4Mg==
 SHA512:
   metadata.gz: !binary |-
-    MDQ0ZWE2NWFkYjhhYmZmOGRlOTczYzMzNWI2ZGU1MDUwNTRkOTFiNWYyYjFj
-    NjJiNTUzMGZkNGJjYjJjNDdjY2Q5NTcyMDc4MTkyYTM2MWU1ZDlkYzE2NTQ1
-    ZWZkMDg2NmZhMTNiN2JjZTM3NzBmMmFkZjUyMGY5ZTBmZDJjNmU=
+    MjZmMDcyYWM4MzZmNTNkZmEwOWFjNTJhNDk1ZGZkYjI0MmU4NzUzYWE5NGM4
+    NzIyOWQyZTQwYmEyOTg1NzMwNmU4N2NjZDhiZjhhZjRiN2YwNTdiZGUzM2Ix
+    MTdmYjVhZTE3MWMxZDNjN2ExMWNiNTExYzljOGFkYmM2OGNiNjE=
   data.tar.gz: !binary |-
-    NzY2ZjA0ZWZkMTAzNjJkN2YwNGEyOTU1NzdlY2E2ZmIyYWU2NjExYmI0NmNh
-    ZjJlN2YzZjI2YjIyYTk0MDZhNWE3ZGVjZDUwMDZlNmJiOGM5ODI2OTYzOTNm
-    YzNjYmQ0ZjBiMWE1OTcwMWVjZWFkNTEzYTI5MTMxOWQ3MTE3YmQ=
+    NmZiOGMwZDk0YWQ0YjNkNmE2YTZhMTgzYTAwYTlkZDhjNmZiODA4MTljODhl
+    YTQxYWY4ODc1NjdmYjYwMjhiODIzNDU4N2MyMTMzNTQ5NWNlMTE1YmMyNWFj
+    YWIxNGQ5ODJlODk5MzkzMGYzNzhkZjI3Y2FlMjg0MTg4MzZlOTU=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU2P8lAAoJECrHRaUKISqMaxgH/RYi9RP4n0wQoC2uBDfYTTpY
-3NorKPsAKPWRXoGpHbXsg3/JgiEft+p5xOg1PUzy52fZZnR2k+mQgy1Hg2LNf0Bh
-VAlxRxJcxevcJQR0Fy3JVjLR8FzS11q0k5zlCrI6xmhZo+uBE/ReLyS53PquJ46u
-5/x0JcU4/5pMIjudx5bBerPaAv1Y0RsVSR0n213t1cj0WHqufM4VObohVAgHhlgL
-NiGLhba6TiudXXrTphlKvjYBzS4ffy3Se4sJIFEj27y1U1GMuH/tF2/koYKZDpwc
-2gX1Y8Jx0pY/d/EjnwEqGMFhiVgUjheSBDdIzp6GwVyu5dQPBkmoY5I24ux3e/M=
-=unQV
+iQEcBAABAgAGBQJWZV67AAoJECrHRaUKISqMI/gH/3OdeNxY0NIyWk5KHIbmc16q
+8L6kfF6bgWbWzsDGDqSqyErA0U1MzGB1zgDswu8xc+mHhtflqDdVLD+SI2j8aMYs
+YEkxZEsmmQLmao+9p0HboY9IsmNxk9Ir+95EVrxKSEa61STTCQ9r+qcLn+HqsUUB
+BzTNssnbmuTgKPOM/hkn18TGcvzvojLWBfOonVrEDcnP9wEbBp+TdCBdo/qn/GT/
+BNigh+aNMS8iUWFvhEtNtyfFcvHUJ0kpLtINinw1nCv6IL6iWoFeU4uXZv96cPOv
+vP6zD5WIMzZRZB3CXuC22K/eRICcT3s1dtjmls6u/l10sQce7u9M3JZ+3GCT07c=
+=J7o0
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU2P8lAAoJECrHRaUKISqMwCoIAKkaj9D/V/fv9qDQE/QlUUvk
-BDKHevE79Oi09ffMoLt2oMEjHD0KQPDJVmSAcoVQmI8CIanlQin0wvFAv3YU7tHC
-tJ5zNBaGgv6yHhRvWRDTLBmmy2woF4aYkvQgE5mZqSWjlSvhpo62DtVyRgUAVykn
-ZIJ8snHsK1787yzqeDD3FzIl+LWIfrTHZpuCTjofaPFRALT6TwyjEciuIpPVtKCR
-C5n0U9oyP7JhYVhKoEJH6xRC0cGZnWNXB8rcasfaM73Ip+1CiIeavc/W4Ye3Jgu4
-Kal0BgJP5VedIAdypsAecz0Y6Wko6ZsYHjoRjdYUW3My2eYbywLdafMWdQrOUvc=
-=JKLo
+iQEcBAABAgAGBQJWZV67AAoJECrHRaUKISqMJisIAKL8AO+kb8tjGispRS4CpAmD
+EKDqYuLSshp9MpfH1fnK4+CP2MZ9rfVekt6NyVLqVySrZ1FtfyhEe26PJnxpq2vP
+44nF6s4DniIwK5zX8+AvBa3GpkhuAWpe/Ecyp247abO+P7/tU/oBhWP3sfCODGla
+3JMwEZrnkRbmVHIqiDcxF6p1AcNyyBDeaLWg+1oAzEjs1eh5Cj9eL4fdNIDrqNQW
+RwJULUqnfrgzaLSqCemYjL3rQ5rFnCEjdY2mUtacKtjcSxde7pNPQKpR/OBDShKK
+UxIb/nQ+ykyKVcNk9VC03vcc9qPJsrUyoq3m7dkxYuqytoYK9jJ/V+2+OR94Fzs=
+=GtFi
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,18 @@
+Release 4.0.60
+--------------
+
+Note that 4.0.60 is a source-only maintenance release. There will not be any binaries, Debian or RPM packages for this release.
+
+ * Adds OS X El Capitan support.
+ * Updates preferred Nginx version from 1.6.2 to 1.6.3.
+ * Fixes a header collision vulnerability (CVE-2015-7519, medium severity). Please see our blog for detailed vulnerability description and advisory. Thanks to the SUSE security team for reporting this issue.
+ * Fixes the password protection of internal Phusion Passenger processes.
+
+   For security reasons, Phusion Passenger limits access to internal processes, by using Unix file permissions and randomly generated passwords that only authorized internal processes know. It turns out that this password wasn't set correctly, which has now been fixed. There was no security vulnerability, because the file permissions already provide sufficient security. The password only serves as an extra layer of security just in case there is a problem with the former.
+
+   This issue is not at all related to any application-level security or application-level passwords. Any database passwords, keys, or secrets used and generated by applications have got nothing to do with the nature of this issue. This issue only relates to some randomly generated passwords that Passenger uses internally, for its internal operations.
+
+
 Release 4.0.59
 --------------
 

data/bin/passenger-install-apache2-module

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -45,6 +45,7 @@ require 'optparse'
 require 'stringio'
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
 PhusionPassenger.require_passenger_lib 'abstract_installer'

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -38,9 +38,11 @@ require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
 
 DOWNLOAD_OPTION = {
 	:connect_timeout => 30,
@@ -541,11 +543,15 @@ private
 	end
 	
 	def build_nginx_configure_command(prefix, extra_configure_flags = nil)
+		extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+		extra_ldflags = PlatformInfo.openssl_extra_ldflags
+
 		command = "sh ./configure --prefix='#{prefix}' "
 		command << "--with-http_ssl_module "
 		command << "--with-http_gzip_static_module "
 		command << "--with-http_stub_status_module "
-		command << "--with-cc-opt='-Wno-error' "
+		command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+		command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "
 		elsif !pcre_is_installed?

data/ext/apache2/Hooks.cpp

@@ -798,6 +798,16 @@ private:
 			apr_strnatcasecmp(headerName + 1, "ransfer-encoding") == 0;
 	}
 
+	bool contains_non_alphanumdash(const char *current) {
+		while (*current != '\0') {
+			if (!apr_isalnum(*current) && *current != '-') {
+				return false;
+			}
+			current++;
+		}
+		return true;
+	}
+
 	/**
 	 * Convert an HTTP header name to a CGI environment name.
 	 */
@@ -806,10 +816,12 @@ private:
 		char *current = result + sizeof("HTTP_") - 1;
 
 		while (*current != '\0') {
-			if (*current == '-') {
+			if (apr_isalnum(*current)) {
+				*current = apr_toupper(*current);
+			} else if (*current == '-') {
 				*current = '_';
 			} else {
-				*current = apr_toupper(*current);
+				return NULL;
 			}
 			current++;
 		}
@@ -958,11 +970,18 @@ private:
 			if (hdrs[i].key == NULL) {
 				continue;
 			}
+
+			if (!contains_non_alphanumdash(hdrs[i].key)) {
+				continue;
+			}
+
 			size_t keylen = strlen(hdrs[i].key);
 			// We only pass the Transfer-Encoding header if PassengerBufferUpload is disabled,
 			// so that the HelperAgent and the app knows that there is a request body despite
 			// there not being a Content-Length header.
 			if (!headerIsTransferEncoding(hdrs[i].key, keylen) || config->bufferUpload == DirConfig::DISABLED) {
+				// httpToEnv can never return NULL here because of the
+				// earlier contains_non_alphanumdash() check.
 				addHeader(output, httpToEnv(r->pool, hdrs[i].key, keylen), hdrs[i].val);
 			}
 		}

data/ext/apache2/MergeDirConfig.cpp

@@ -39,143 +39,143 @@
 
 
 
-
+	
 		config->ruby =
 			(add->ruby == NULL) ?
 			base->ruby :
 			add->ruby;
+	
 
-
-
+	
 		config->python =
 			(add->python == NULL) ?
 			base->python :
 			add->python;
+	
 
-
-
+	
 		config->nodejs =
 			(add->nodejs == NULL) ?
 			base->nodejs :
 			add->nodejs;
+	
 
-
-
+	
 		config->appEnv =
 			(add->appEnv == NULL) ?
 			base->appEnv :
 			add->appEnv;
+	
 
-
-
+	
 		config->minInstances =
 			(add->minInstances == UNSET_INT_VALUE) ?
 			base->minInstances :
 			add->minInstances;
+	
 
-
-
+	
 		config->maxInstancesPerApp =
 			(add->maxInstancesPerApp == UNSET_INT_VALUE) ?
 			base->maxInstancesPerApp :
 			add->maxInstancesPerApp;
+	
 
-
-
+	
 		config->user =
 			(add->user == NULL) ?
 			base->user :
 			add->user;
+	
 
-
-
+	
 		config->group =
 			(add->group == NULL) ?
 			base->group :
 			add->group;
+	
 
-
-
+	
 		config->errorOverride =
 			(add->errorOverride == DirConfig::UNSET) ?
 			base->errorOverride :
 			add->errorOverride;
+	
 
-
-
+	
 		config->maxRequests =
 			(add->maxRequests == UNSET_INT_VALUE) ?
 			base->maxRequests :
 			add->maxRequests;
+	
 
-
-
+	
 		config->startTimeout =
 			(add->startTimeout == UNSET_INT_VALUE) ?
 			base->startTimeout :
 			add->startTimeout;
+	
 
-
-
+	
 		config->highPerformance =
 			(add->highPerformance == DirConfig::UNSET) ?
 			base->highPerformance :
 			add->highPerformance;
+	
 
-
-
+	
 		config->enabled =
 			(add->enabled == DirConfig::UNSET) ?
 			base->enabled :
 			add->enabled;
+	
 
-
-
+	
 		config->maxRequestQueueSize =
 			(add->maxRequestQueueSize == UNSET_INT_VALUE) ?
 			base->maxRequestQueueSize :
 			add->maxRequestQueueSize;
+	
 
-
-
+	
 		config->loadShellEnvvars =
 			(add->loadShellEnvvars == DirConfig::UNSET) ?
 			base->loadShellEnvvars :
 			add->loadShellEnvvars;
+	
 
-
-
+	
 		config->bufferUpload =
 			(add->bufferUpload == DirConfig::UNSET) ?
 			base->bufferUpload :
 			add->bufferUpload;
+	
 
-
-
+	
 		config->appType =
 			(add->appType == NULL) ?
 			base->appType :
 			add->appType;
+	
 
-
-
+	
 		config->startupFile =
 			(add->startupFile == NULL) ?
 			base->startupFile :
 			add->startupFile;
+	
 
-
-
+	
 		config->stickySessions =
 			(add->stickySessions == DirConfig::UNSET) ?
 			base->stickySessions :
 			add->stickySessions;
+	
 
-
-
+	
 		config->stickySessionsCookieName =
 			(add->stickySessionsCookieName == DirConfig::UNSET) ?
 			base->stickySessionsCookieName :
 			add->stickySessionsCookieName;
-
+	
 

data/ext/common/ApplicationPool2/Group.h

@@ -214,9 +214,9 @@ public:
 		unsigned int restartsInitiated);
 	void spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options,
 		unsigned int restartsInitiated);
-	void finalizeRestart(GroupPtr self, Options options, RestartMethod method,
-		SpawnerFactoryPtr spawnerFactory, unsigned int restartsInitiated,
-		vector<Callback> postLockActions);
+	void finalizeRestart(GroupPtr self, Options oldOptions, Options newOptions,
+		RestartMethod method, SpawnerFactoryPtr spawnerFactory,
+		unsigned int restartsInitiated, vector<Callback> postLockActions);
 	void startCheckingDetachedProcesses(bool immediately);
 	void detachedProcessesCheckerMain(GroupPtr self);
 	void wakeUpGarbageCollector();
@@ -322,14 +322,18 @@ public:
 	#endif
 
 	/**
-	 * Sets options for this Group. Called at creation time and at restart time.
+	 * Persists options into this Group. Called at creation time and at restart time.
+	 * Values will be persisted into `destination`. Or if it's NULL, into `this->options`.
 	 */
-	void resetOptions(const Options &newOptions) {
-		options = newOptions;
-		options.persist(newOptions);
-		options.clearPerRequestFields();
-		options.groupSecret = secret;
-		options.groupUuid   = uuid;
+	void resetOptions(const Options &newOptions, Options *destination = NULL) {
+		if (destination == NULL) {
+			destination = &this->options;
+		}
+		*destination = newOptions;
+		destination->persist(newOptions);
+		destination->clearPerRequestFields();
+		destination->groupSecret = secret;
+		destination->groupUuid   = uuid;
 	}
 
 	/**

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -504,13 +504,14 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 }
 
 
-Group::Group(const SuperGroupPtr &_superGroup, const Options &options, const ComponentInfo &info)
+Group::Group(const SuperGroupPtr &_superGroup, const Options &_options, const ComponentInfo &info)
 	: superGroup(_superGroup),
 	  name(_superGroup->name + "#" + info.name),
 	  secret(generateSecret(_superGroup)),
 	  uuid(generateUuid(_superGroup)),
 	  componentInfo(info)
 {
+	resetOptions(_options);
 	enabledCount   = 0;
 	disablingCount = 0;
 	disabledCount  = 0;
@@ -530,7 +531,6 @@ Group::Group(const SuperGroupPtr &_superGroup, const Options &options, const Com
 		restartFile = options.appRoot + "/" + options.restartDir + "/restart.txt";
 		alwaysRestartFile = options.appRoot + "/" + options.restartDir + "/always_restart.txt";
 	}
-	resetOptions(options);
 
 	detachedProcessesCheckerActive = false;
 }
@@ -1119,6 +1119,7 @@ Group::restart(const Options &options, RestartMethod method) {
 	detachAll(actions);
 	getPool()->interruptableThreads.create_thread(
 		boost::bind(&Group::finalizeRestart, this, shared_from_this(),
+			this->options.copyAndPersist().clearPerRequestFields(),
 			options.copyAndPersist().clearPerRequestFields(),
 			method, getPool()->spawnerFactory, restartsInitiated, actions),
 		"Group restarter: " + name,
@@ -1128,8 +1129,11 @@ Group::restart(const Options &options, RestartMethod method) {
 
 // The 'self' parameter is for keeping the current Group object alive while this thread is running.
 void
-Group::finalizeRestart(GroupPtr self, Options options, RestartMethod method,
-	SpawnerFactoryPtr spawnerFactory, unsigned int restartsInitiated,
+Group::finalizeRestart(GroupPtr self,
+	Options oldOptions,
+	Options newOptions, RestartMethod method,
+	SpawnerFactoryPtr spawnerFactory,
+	unsigned int restartsInitiated,
 	vector<Callback> postLockActions)
 {
 	TRACE_POINT();
@@ -1141,7 +1145,9 @@ Group::finalizeRestart(GroupPtr self, Options options, RestartMethod method,
 	this_thread::disable_syscall_interruption dsi;
 
 	// Create a new spawner.
-	SpawnerPtr newSpawner = spawnerFactory->create(options);
+	Options spawnerOptions = oldOptions;
+	resetOptions(newOptions, &spawnerOptions);
+	SpawnerPtr newSpawner = spawnerFactory->create(spawnerOptions);
 	SpawnerPtr oldSpawner;
 
 	UPDATE_TRACE_POINT();
@@ -1177,7 +1183,7 @@ Group::finalizeRestart(GroupPtr self, Options options, RestartMethod method,
 	UPDATE_TRACE_POINT();
 
 	// Atomically swap the new spawner with the old one.
-	resetOptions(options);
+	resetOptions(newOptions);
 	oldSpawner = spawner;
 	spawner    = newSpawner;