passenger 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fecfb2d41ce019980e9c5e011682a4d086a04359
-  data.tar.gz: be33029161c3b21f12f622218c019df91b7b29e4
+  metadata.gz: 01036c04dda75ab9ff7ebcf52f55b8675d162add
+  data.tar.gz: b72cbc20345165976f230aa36372e526b5a1c0f3
 SHA512:
-  metadata.gz: 3a7a33ae101d44dfb0ca5687c4d8896d79debcbab21ddf80bd4a37c432c5678fed553ce6d31a61aaf82051c39744e3d04a4543858ada6f1da6f6c8a535d0efed
-  data.tar.gz: e65d2e6aac554aa8da467b6ddd28a9cffd30e12e1a1c44830e91b1d17e3d24b7aeaa48828e8a5829c937da65acfefe01b630382d3afdc08c734041e9b164eea9
+  metadata.gz: c81cc451477301effa27488540bc7fd23613ee0e845ac1997b4893080fc5b73b6922a290878ca268c0cfb9ea76fb48334eca5a46f05cfb55e4369e22ac51d93c
+  data.tar.gz: 0e2177accbbd4ebd0b8fd81685bd37eba224b64fa2a45cda1a3d130b3c988fd9695c2c160ed744fb1aac31152d468ddf9a39ef227909b0114065d99e20141714

data/CHANGELOG

@@ -1,9 +1,22 @@
+Release 5.2.3
+-------------
+
+ * Fuse Panel support: fixes a few bugs with handling small log files and with apps that don't output any messages.
+ * Python app support: fixes a Python 3 compatibility issue w.r.t. writing data over the socket.
+ * macOS support: fixes a crash in the `passenger-config compile-nginx-engine` command which only occurs on macOS >= 10.13. This crash was caused by a missing `require` call in our code, and affects users who compile Passenger from source, e.g. users of the Passenger Enterprise Homebrew formula.
+ * Fixes a small memory corruption issue (dangling pointer) in the ApplicationPool subsystem.
+ * Improves support for the $TMPDIR environment variable by removing leftover hardcoded references to /tmp. Closes GH-2052.
+ * Updated PCRE version to 8.42 (was: 8.41) across the board.
+
+
 Release 5.2.2
 -------------
 
  * Adds an option for dumping the web server config manifest to a given file: `PassengerDumpConfigManifest` (Apache) / `passenger_dump_config_manifest` (Nginx). This option is mostly useful for Passenger developers.
  * [Nginx] Fixes support for configurations that have two `passenger_base_uri` options in a single virtual host, without corresponding `passenger_app_group_name` and `passenger_app_root` directives. Closes GH-2043.
  * [Enterprise] Improved support for RAM-based pricing on Heroku (now using officially recommended memory limit reporting via CGROUP).
+ * (added in CHANGELOG after release) Four new options to connect to the new Fuse Panel: admin_panel_url, admin_panel_auth_type, admin_panel_username, admin_panel_password
+ * (added in CHANGELOG after release) Updated OpenSSL version used in precompiled binaries (used for e.g. gem installs) to 1.0.2o (was: 1.0.2m).
 
 
 Release 5.2.1

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/passenger.svg)](https://badge.fury.io/rb/passenger)
 # <img src="images/passenger_logo.svg" alt="passenger logo" style="margin-bottom: -.2em; width: 1.4em"> Phusion Passenger
 <h3>Supercharge your Ruby, Node.js and Python apps</h3>
 
@@ -5,12 +6,18 @@
 
 <a href="https://fpdl.vimeocdn.com/vimeo-prod-skyfire-std-us/01/4984/8/224923750/789267447.mp4?token=1520274300-0xc6893cd7e4a119105d32dd731bf4a34928c2c1c8"><img src="https://github.com/phusion/passenger/blob/stable-5.2/images/justin.png" height="400"></a><br><em>Phusion Passenger - the smart app server</em>
 
-What makes it so fast and reliable is its <strong>C++</strong> core, its <strong>zero-copy</strong> architecture, its <strong>watchdog</strong> system and its <strong>hybrid</strong> evented, multi-threaded and multi-process design.</p>
+<p>What makes Passenger so fast and reliable is its <strong>C++</strong> core, its <strong>zero-copy</strong> architecture, its <strong>watchdog</strong> system and its <strong>hybrid</strong> evented, multi-threaded and multi-process design.</p>
+
+## Fuse Panel - GUI for Passenger
+The <strong>smarter</strong> and <strong>simpler command center</strong> for your applications. <strong><a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Fuse Panel</a></strong> monitors your apps in near real-time, offers insights in your logs and enables analyzing and troubleshooting issues. New and exclusively available in the Fuse Panel is much-requested feature <strong>per-application log viewing and splitting</strong>.
+
+Regardless of if you’re running Passenger open source or you’re one of our enterprise customers, the Fuse Panel is available for free while in beta. <a href="https://www.phusionpassenger.com/fuse-panel" target="_blank">Give it a try</a>.
 
 <img src="https://github.com/phusion/passenger/blob/stable-5.2/images/spark.png" align="left" width="300">
 
 ### Learn more:
 - [Website](https://www.phusionpassenger.com/)
+- [Fuse Panel](https://www.phusionpassenger.com/fuse-panel)
 - [Documentation &amp; Support](https://www.phusionpassenger.com/support)
 - [Twitter](https://twitter.com/phusion_nl)
 - [Blog](http://blog.phusion.nl/)

data/dev/configkit-schemas/index.json

@@ -289,7 +289,7 @@
          "type" : "unsigned integer"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.2",
+         "default_value" : "Phusion_Passenger/5.2.3",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -794,7 +794,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.2",
+         "default_value" : "Phusion_Passenger/5.2.3",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -1519,7 +1519,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.2",
+         "default_value" : "Phusion_Passenger/5.2.3",
          "has_default_value" : "static",
          "type" : "string"
       },

data/src/agent/Core/AdminPanelConnector.h

@@ -466,6 +466,7 @@ private:
 						dup2(pipe.second, STDOUT_FILENO);
 						pipe.first.close();
 						pipe.second.close();
+						closeAllFileDescriptors(2, true);
 
 						execvp(execArgs[0], (char * const *) &execArgs[0]);
 
@@ -486,12 +487,9 @@ private:
 					} else {
 						pipe.second.close();
 						string out = readAll(pipe.first);
+						LoggingKit::context->saveMonitoredFileLog(key, f.c_str(), f.size(),
+							out.data(), out.size());
 						pipe.first.close();
-						istringstream iss(out);
-						string line;
-						while (getline(iss, line)) {
-							LoggingKit::context->updateLog(key, f.c_str(), f.size(), line.c_str(), line.size());
-						}
 						syscalls::waitpid(pid, NULL, 0);
 					}
 				}

data/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp

@@ -310,6 +310,7 @@ Group::restart(const Options &options, RestartMethod method) {
 	m_spawning   = false;
 	m_restarting = true;
 	uuid         = generateUuid(pool);
+	this->options.groupUuid = uuid;
 	detachAll(actions);
 	getPool()->interruptableThreads.create_thread(
 		boost::bind(&Group::finalizeRestart, this, shared_from_this(),

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

@@ -116,6 +116,7 @@ private:
 		result.push_back(&options.ustRouterUsername);
 		result.push_back(&options.ustRouterPassword);
 		result.push_back(&options.apiKey);
+		result.push_back(&options.groupUuid);
 		result.push_back(&options.hostName);
 		result.push_back(&options.uri);
 		result.push_back(&options.unionStationKey);

data/src/agent/Core/Config.h

@@ -153,7 +153,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/5.2.2")
+ *   server_software                                                 string             -          default("Phusion_Passenger/5.2.3")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_type                                        string             -          read_only

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

@@ -111,7 +111,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/5.2.2")
+ *   server_software                                     string             -          default("Phusion_Passenger/5.2.3")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

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

@@ -129,12 +129,19 @@ protected:
 
 	public:
 		DebugDir(uid_t uid, gid_t gid) {
-			char buf[PATH_MAX] = "/tmp/passenger.spawn-debug.XXXXXXXXXX";
+			char buf[PATH_MAX];
+			char *pos = buf;
+			const char *end = buf + PATH_MAX;
+
+			pos = appendData(pos, end, getSystemTempDir());
+			pos = appendData(pos, end, "/passenger.spawn-debug.XXXXXXXXXX");
+			*pos = '\0';
+
 			const char *result = mkdtemp(buf);
 			if (result == NULL) {
 				int e = errno;
 				throw SystemException("Cannot create a temporary directory "
-					"in the format of '/tmp/passenger-spawn-debug.XXX'", e);
+					"in the format of '" + StaticString(buf) + "'", e);
 			} else {
 				path = result;
 				boost::this_thread::disable_interruption di;

data/src/agent/Shared/Fundamentals/AbortHandler.cpp

@@ -75,6 +75,7 @@ struct AbortHandlerContext {
 	const AbortHandlerConfig *config;
 	char *installSpec;
 	char *rubyLibDir;
+	char *tmpDir;
 	char *crashWatchCommand;
 	char *backtraceSanitizerCommand;
 	bool backtraceSanitizerPassProgramInfo;
@@ -642,7 +643,8 @@ createCrashLogFile(char *filename, size_t bufSize, time_t t) {
 	int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
 	if (fd == -1) {
 		pos = filename;
-		pos = ASSU::appendData(pos, end, "/tmp/passenger-crash-log.");
+		pos = ASSU::appendData(pos, end, ctx->tmpDir);
+		pos = ASSU::appendData(pos, end, "/passenger-crash-log.");
 		pos = ASSU::appendInteger<time_t, 10>(pos, end, t);
 		*pos = '\0';
 		fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
@@ -977,6 +979,7 @@ abortHandlerConfigChanged() {
 	const AbortHandlerConfig *config = ctx->config;
 	char *oldInstallSpec = ctx->installSpec;
 	char *oldRubyLibDir = ctx->rubyLibDir;
+	char *oldTmpDir = ctx->tmpDir;
 	char *oldCrashWatchCommand = ctx->crashWatchCommand;
 	char *oldBacktraceSanitizerCommand = ctx->backtraceSanitizerCommand;
 
@@ -986,11 +989,14 @@ abortHandlerConfigChanged() {
 
 		ctx->installSpec = strdup(locator->getInstallSpec().c_str());
 		ctx->rubyLibDir = strdup(locator->getRubyLibDir().c_str());
+		ctx->tmpDir = strdup(getSystemTempDir());
 
 		path = locator->getHelperScriptsDir() + "/crash-watch.rb";
 		ctx->crashWatchCommand = strdup(path.c_str());
 
-		if (ctx->installSpec == NULL || ctx->rubyLibDir == NULL || ctx->crashWatchCommand == NULL) {
+		if (ctx->installSpec == NULL || ctx->rubyLibDir == NULL
+			|| ctx->tmpDir == NULL || ctx->crashWatchCommand == NULL)
+		{
 			fprintf(stderr, "Cannot allocate memory for abort handler!\n");
 			fflush(stderr);
 			abort();
@@ -1013,12 +1019,14 @@ abortHandlerConfigChanged() {
 	} else {
 		ctx->installSpec = NULL;
 		ctx->rubyLibDir = NULL;
+		ctx->tmpDir = NULL;
 		ctx->crashWatchCommand = NULL;
 		useCxxFiltAsBacktraceSanitizer();
 	}
 
 	free(oldInstallSpec);
 	free(oldRubyLibDir);
+	free(oldTmpDir);
 	free(oldCrashWatchCommand);
 	free(oldBacktraceSanitizerCommand);
 }
@@ -1027,6 +1035,7 @@ void
 shutdownAbortHandler() {
 	free(ctx->installSpec);
 	free(ctx->rubyLibDir);
+	free(ctx->tmpDir);
 	free(ctx->crashWatchCommand);
 	free(ctx->backtraceSanitizerCommand);
 	free(ctx->alternativeStack);

data/src/agent/Watchdog/Config.h

@@ -145,7 +145,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/5.2.2")
+ *   server_software                                                          string             -          default("Phusion_Passenger/5.2.3")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/cxx_supportlib/Constants.h

@@ -81,7 +81,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "5.2.2"
+#define PASSENGER_VERSION "5.2.3"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/LoggingKit/Context.h

@@ -107,8 +107,9 @@ public:
 
 	// specifically for logging output from application processes
 	void saveNewLog(const HashedStaticString &groupName, const char *sourceStr, unsigned int sourceStrLen, const char *message, unsigned int messageLen);
-	// the message might already have been logged (e.g. because the source is a `tail -n`)
-	void updateLog(const HashedStaticString &groupName, const char *sourceStr, unsigned int sourceStrLen, const char *message, unsigned int messageLen);
+	void saveMonitoredFileLog(const HashedStaticString &groupName,
+		const char *sourceStr, unsigned int sourceStrLen,
+		const char *content, unsigned int contentLen);
 	// snapshot logStore to a JSON structure for external relay
 	Json::Value convertLog();
 

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -332,7 +332,13 @@ Context::saveNewLog(const HashedStaticString &groupName, const char *sourceStr,
 }
 
 void
-Context::updateLog(const HashedStaticString &groupName, const char *sourceStr, unsigned int sourceStrLen, const char *message, unsigned int messageLen) {
+Context::saveMonitoredFileLog(const HashedStaticString &groupName,
+	const char *sourceStr, unsigned int sourceStrLen,
+	const char *content, unsigned int contentLen)
+{
+	vector<StaticString> lines;
+	split(StaticString(content, contentLen), '\n', lines);
+
 	boost::lock_guard<boost::mutex> l(syncher); //lock
 
 	LogStore::Cell *c = logStore.lookupCell(groupName);
@@ -344,11 +350,15 @@ Context::updateLog(const HashedStaticString &groupName, const char *sourceStr, u
 	AppGroupLog &rec = c->value;
 
 	HashedStaticString source(sourceStr, sourceStrLen);
-	if (!rec.watchFileLog.contains(source)) {
+	SimpleLogMap::Cell *c2 = rec.watchFileLog.lookupCell(source);
+	if (c2 == NULL) {
 		SimpleLogBuffer logBuffer(LOG_MONITORING_MAX_LINES);
-		rec.watchFileLog.insert(source, logBuffer);
+		c2 = rec.watchFileLog.insert(source, logBuffer);
+	}
+	c2->value.clear();
+	foreach (StaticString line, lines) {
+		c2->value.push_back(string(line.data(), line.size()));
 	}
-	rec.watchFileLog.lookupCell(source)->value.push_back(string(message, messageLen));
 	//unlock
 }
 
@@ -363,6 +373,9 @@ Context::convertLog(){
 			reply[appGroupIter.getKey()] = Json::objectValue;
 
 			Json::Value &processLog = reply[appGroupIter.getKey()]["Application process log (combined)"];
+			if (processLog.isNull()) {
+				processLog = Json::arrayValue;
+			}
 			foreach (TimestampedLog logLine, appGroupIter->value.pidLog) {
 				Json::Value logLineJson = Json::objectValue;
 				logLineJson["source_id"] = logLine.sourceId;

data/src/helper-scripts/wsgi-loader.py

@@ -126,7 +126,10 @@ if sys.version_info[0] >= 3:
 		return b.decode('latin-1')
 
 	def str_to_bytes(s):
-		return s.encode('latin-1')
+		if isinstance(s, bytes):
+			return s
+		else:
+			return s.encode('latin-1')
 else:
 	def reraise_exception(exc_info):
 		exec("raise exc_info[0], exc_info[1], exc_info[2]")
@@ -261,7 +264,7 @@ class RequestHandler:
 						output_stream.sendall(str_to_bytes('%s: %s\r\n' % header))
 					output_stream.sendall(b'\r\n')
 				if not is_head:
-					output_stream.sendall(data)
+					output_stream.sendall(str_to_bytes(data))
 			except IOError:
 				# Mark this exception as coming from the Phusion Passenger
 				# socket and not some other socket.

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '5.2.2'
+  VERSION_STRING = '5.2.3'
 
   PREFERRED_NGINX_VERSION = '1.12.2'
   NGINX_SHA256_CHECKSUM = '305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'
@@ -41,8 +41,9 @@ module PhusionPassenger
   PACKAGING_PREFERRED_NGINX_VERSION = '1.12.2'
   PACKAGING_NGINX_SHA256_CHECKSUM = '305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'
 
-  PREFERRED_PCRE_VERSION  = '8.41'
-  PCRE_SHA256_CHECKSUM = '244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c'
+  # sha256sum of the .tar.gz
+  PREFERRED_PCRE_VERSION  = '8.42'
+  PCRE_SHA256_CHECKSUM = '69acbc2fbdefb955d42a4c606dfde800c2885711d2979e356c0636efde9ec3b5'
 
   STANDALONE_INTERFACE_VERSION  = 1
 

data/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb

@@ -24,6 +24,7 @@
 
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 
 module PhusionPassenger
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake