passenger 6.0.8 → 6.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e8a16828ef20d1b8913627ca3eb76851e9e8f2
-  data.tar.gz: 19b4d486f327404c54a4a8506040e8db86ad139b
+  metadata.gz: 536d56479491f031585ad9f7a050a49978a965be
+  data.tar.gz: 2074da45c50faf1754c190f448c8fd89bd1e0bfe
 SHA512:
-  metadata.gz: 572f5728da8e7760703d56f05e7c7f5df40baad2d3f0d26ff67cb321c4f22c5a10e212dc866db69c46d5189929a739424725b50c7eab150969f14864e51e16ca
-  data.tar.gz: 8803471e222631f5f8ed0f26117814093b51327a9b18d59093b8d9cac0a1cba3075ba82b298071d6da60bc71447d1fb4307f161dacc3606d364161c95811fa56
+  metadata.gz: a9c3b77e7ccf78b9018135ac0501a864c3bb2f695df9c5d3aa8510aa75fc04440ed4aaf6c9db3876fa8512965436ac5e3959dadb0905f4ca375f5830dd8c0091
+  data.tar.gz: 5e64ae1f36a459ab8661849c2c48af6fabe5a91ccb88485ecde138323686393557dde2399bfee4c2aa45e121e5cf12bb9c6f59b09e774d393b20db7803b8411c

data/CHANGELOG

@@ -1,3 +1,92 @@
+Release 6.0.12 (Not yet released)
+-------------
+ * [Debian] Fix compilation on 32 bit arm. Contributed by Antonio Terceiro.
+ * [Debian] Add Bullseye Debian packages.
+ * Add formatted error messages to responses. Contributed by Mohammad Aboelnour.
+ * Fixes for running under WSL 1. Contributed by Luke Pearce. Closes GH-2036.
+ * Upgrades Boost to 1.77. To go along with 32 bit arm fix.
+ * [MacOS] Fixes autodetection of openssl lib on apple silicon. Contributed by Taketo Takashima. Closes GH-2389.
+ * Reconnect to mongoid databases after fork, like we do for ActiveRecord. Contributed by Mohammad Aboelnour.
+ * [Ubuntu] add missing apache name in instance registry dir detection.
+ * [Ubuntu] replace hirsute apt packages with impish.
+ * [Nginx] add new config option to choose the status code returned when application spawning fails. (passenger_spawn_exception_status_code).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.4.1 → 4.4.2
+ - cmake: 3.21.2 → 3.21.4
+ - curl: 7.78.0 → 7.79.1
+ - git: 2.33.0 → 2.33.1
+ - gnupg: 2.3.2 → 2.3.3
+ - rubygems: 3.2.27 → 3.2.30
+ - s3cmd: 2.1.0 → 2.2.0
+
+
+Release 6.0.11
+-------------
+ * Fix compilation on GCC 4.4, fixes a regression in 6.0.8 where Passenger would no longer compiler without a C++11 compiler.
+ * [CentOS] Fix version detection on CentOS Stream. Contributed by Taketo Takashima. Closes GH-2377.
+ * [MacOS] Additionally look for PCRE in the new location that Homebrew has split it's packages into.
+ * Fix compilation on GCC < 4.5.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache: 4.3 → 4.4.1
+    - cmake: 3.20.5 → 3.21.2
+    - curl: 7.77.0 → 7.78.0
+    - git: 2.32.0 → 2.33.0
+    - gnupg: 2.3.1 → 2.3.2
+    - libgcrypt: 1.9.3 → 1.9.4
+    - openssl: 1.1.1k → 1.1.1l
+    - pinentry: 1.1.1 → 1.2.0
+    - rubygems: 3.2.21 → 3.2.27
+    - rubies:
+      - 2.6.7 → 2.6.8
+      - 2.7.3 → 2.7.4
+      - 3.0.1 → 3.0.2
+
+
+Release 6.0.10
+-------------
+ * [Debian/Ubuntu] Fix a regression in `passenger_system_ruby` where Ruby 3 couldn't be found.
+ * [CentOS/RHEL] Bump rpm nginx dependency to match EPEL nginx (was 1.16.1 now 1.20.1). Closes GH-2364.
+ * [Nginx] The preferred PCRE version is now 8.45 (previously 8.44).
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - cmake 3.20.3 → 3.20.5
+    - git 2.31.1 → 2.32.0
+    - libksba 1.5.1 → 1.6.0
+    - rubygems 3.2.19 → 3.2.21
+    - pcre 8.44 → 8.45
+
+
+Release 6.0.9
+-------------
+ * Upgrades Boost to 1.76. Fixes a regression where some boost headers for comatibility with older distros were missing.
+ * Make building on Apple Silcon using homebrew openssl work. Contributed by TheBerg.
+ * Add Support for Ubuntu Hirsute.
+ * Remove prebuilt packages for Ubuntu Groovy.
+ * Properly support HTTP 418. Contributed by Thomas Pfister.
+ * Fix several C++ warnings about implicit copy operators/constructors.
+ * Bump preferred nginx 1.18.0 → 1.20.1.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 4.2 → 4.3
+    - cmake 3.19.7 → 3.20.3
+    - curl 7.75.0 → 7.77.0
+    - git 2.31.0 → 2.31.1
+    - gnupg 2.2.27 → 2.3.1
+    - libgcrypt 1.9.2 → 1.9.3
+    - libksba 1.5.0 → 1.5.1
+    - ntbTLS added → 0.2.0
+    - zlib 1.4.9 → 1.5.0
+    - rubygems 3.2.15 → 3.2.19
+    - ruby:
+      - 2.3.8 → removed
+      - 2.5.8 → 2.5.9
+      - 2.6.6 → 2.6.7
+      - 2.7.2 → 2.7.3
+      - 3.0.0 → 3.0.1
+
+
 Release 6.0.8
 -------------
  * [Apache] Fixes crash when restarting Apache on CentOS 8. Closes GH-2318.

data/CONTRIBUTORS

@@ -1,4 +1,5 @@
 _why
+A compound of Fe and O
 Adam Duke
 Alessandro Lenzen
 Alex Osborne
@@ -8,8 +9,10 @@ Andre Ferraz
 Andre Nathan
 Andrei Belov
 Andy Allan
+Antonio Terceiro
 Benjamin Fleischer
 Bernd Ahlers
+Bernhard M. Wiedemann
 Camden Narzt (Phusion)
 Chad Fowler
 Chris Walquist
@@ -55,12 +58,14 @@ Jason Cannon
 jastix
 Jay Freeman (saurik)
 jbergler
+Jia L
 John Dewey
 John Leach
 Joshua Lund
 jpatterson
 Jude Nagurney
 Kenneth Powers
+Luke Pearce
 Luuk Hafkamp (Phusion)
 Luuk Hendriks (Phusion)
 MAEDA Go
@@ -71,6 +76,7 @@ Michal Papis
 Michał Pokrywka
 Mike
 Mike Boone
+Mohammad Aboelnour
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson
@@ -107,6 +113,9 @@ Sebastian Welther
 Slippy Douglas
 Stephen Bannasch
 Steven Chamberlain
+Taketo Takashima
+TheBerg
+Thomas Pfister
 Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)

data/bin/passenger-install-nginx-module

@@ -575,6 +575,7 @@ private
             # Nginx checks for PCRE in multiple places...
             system("(gcc -I/usr/local/include -I/usr/include/pcre " <<
               "-I/usr/pkg/include -I/opt/local/include " <<
+              "-I/opt/homebrew/include " <<
               "-c passenger-check.c) >/dev/null 2>/dev/null")
           end
         ensure

data/build/common_library.rb

@@ -245,7 +245,7 @@ end
 
 ########## WebSocket++ ##########
 
-let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-copy/websocketpp' }
+let(:websocketpp_cflags) { '-Isrc/cxx_supportlib/vendor-modified/websocketpp' }
 let(:websocketpp_libs) { nil }
 
 

data/dev/copy_boost_headers

@@ -230,8 +230,25 @@ def start
   begin
     prepare
     copy_essential_files
-    copy_dependencies("-std=gnu++11")
-    copy_dependencies("")
+    [
+      "-std=c++98",
+      "-std=c++03",
+      "-std=gnu++98",
+      "-std=gnu++03",
+      "-std=c++11",
+      "-std=gnu++11",
+      "-std=c++14",
+      "-std=gnu++14",
+      "-std=c++17",
+      "-std=gnu++17",
+      "-std=c++20",
+      "-std=gnu++20",
+      "-std=c++0x",
+      "-std=gnu++0x",
+      ""
+    ].each do |flags|
+      copy_dependencies(flags)
+    end
   ensure
     cleanup
   end

data/dev/index_cxx_dependencies.rb

@@ -6,7 +6,7 @@ SEARCH_PATHS = [
   "src/agent",
   "src/cxx_supportlib",
   "src/cxx_supportlib/vendor-copy",
-  "src/cxx_supportlib/vendor-copy/websocketpp",
+  "src/cxx_supportlib/vendor-modified/websocketpp",
   "src/cxx_supportlib/vendor-modified",
   "test/cxx"
 ]

data/dev/webpacketpp.patch

@@ -0,0 +1,39 @@
+From b6d45a246a4461cd7eda420b471de50518cb42d8 Mon Sep 17 00:00:00 2001
+From: Camden Narzt <camden@phusion.nl>
+Date: Mon, 19 Jul 2021 12:31:15 -0600
+Subject: [PATCH] fix compilation on gcc older than 4.5
+
+---
+ .../websocketpp/websocketpp/common/functional.hpp        | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp b/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
+index d332dd15e..25ed93398 100644
+--- a/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
++++ b/src/cxx_supportlib/vendor-copy/websocketpp/websocketpp/common/functional.hpp
+@@ -52,7 +52,7 @@
+ #ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+     #include <functional>
+ #else
+-    #include <boost/bind.hpp>
++    #include <boost/bind/bind.hpp>
+     #include <boost/function.hpp>
+     #include <boost/ref.hpp>
+ #endif
+@@ -83,12 +83,7 @@ namespace lib {
+     using boost::function;
+     using boost::bind;
+     using boost::ref;
+-    namespace placeholders {
+-        /// \todo this feels hacky, is there a better way?
+-        using ::_1;
+-        using ::_2;
+-        using ::_3;
+-    }
++    namespace placeholders = boost::placeholders;
+ 
+     // See above definition for more details on what this is and why it exists
+     #define _WEBSOCKETPP_REF(x) boost::ref(x)
+-- 
+2.30.1 (Apple Git-130)
+

data/package.json

@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/phusion/passenger.git"
+    "url": "https://github.com/phusion/passenger.git"
   },
   "author": "Phusion <info@phusion.nl>",
   "license": "MIT",

data/src/agent/Core/Config.h

@@ -164,7 +164,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/6.0.8")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.12")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only

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

@@ -242,19 +242,25 @@ Controller::reportSessionCheckoutError(Client *client, Request *req,
 	writeOtherExceptionErrorResponse(client, req, e);
 }
 
-void
-Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
-	const boost::shared_ptr<RequestQueueFullException> &e)
+int
+Controller::lookupCodeFromHeader(Request *req, const char* header, int statusCode)
 {
-	TRACE_POINT();
-	const LString *value = req->secureHeaders.lookup(
-		"!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE");
-	int requestQueueOverflowStatusCode = 503;
+	const LString *value = req->secureHeaders.lookup(header);
 	if (value != NULL && value->size > 0) {
 		value = psg_lstr_make_contiguous(value, req->pool);
-		requestQueueOverflowStatusCode = stringToInt(
+		statusCode = stringToInt(
 			StaticString(value->start->data, value->size));
 	}
+	return statusCode;
+}
+
+void
+Controller::writeRequestQueueFullExceptionErrorResponse(Client *client, Request *req,
+	const boost::shared_ptr<RequestQueueFullException> &e)
+{
+	TRACE_POINT();
+
+	int requestQueueOverflowStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE", 503);
 
 	SKC_WARN(client, "Returning HTTP " << requestQueueOverflowStatusCode <<
 		" due to: " << e->what());
@@ -271,15 +277,20 @@ Controller::writeSpawnExceptionErrorResponse(Client *client, Request *req,
 	const boost::shared_ptr<SpawningKit::SpawnException> &e)
 {
 	TRACE_POINT();
+	int spawnExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
 	SKC_ERROR(client, "Cannot checkout session because a spawning error occurred. " <<
 		"The identifier of the error is " << e->getId() << ". Please see earlier logs for " <<
 		"details about the error.");
-	endRequestWithErrorResponse(&client, &req, *e);
+	endRequestWithErrorResponse(&client, &req, *e, spawnExceptionStatusCode);
 }
 
 void
 Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const ExceptionPtr &e) {
 	TRACE_POINT();
+
+	// ATM "other" exceptions always return a spawn exception error message, so use the matching status code
+	int otherExceptionStatusCode = lookupCodeFromHeader(req, "!~PASSENGER_SPAWN_EXCEPTION_STATUS_CODE", 500);
+
 	string typeName;
 	const oxt::tracable_exception &eptr = *e;
 	#ifdef CXX_ABI_API_AVAILABLE
@@ -324,16 +335,16 @@ Controller::writeOtherExceptionErrorResponse(Client *client, Request *req, const
 		}
 		pos = appendData(pos, end, "</p>");
 
-		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), 500);
+		endRequestWithSimpleResponse(&client, &req, StaticString(buf, pos - buf), otherExceptionStatusCode);
 	} else {
 		endRequestWithSimpleResponse(&client, &req, "<h2>Internal server error</h2>"
-			"Application could not be started. Please try again later.", 500);
+			"Application could not be started. Please try again later.", otherExceptionStatusCode);
 	}
 }
 
 void
 Controller::endRequestWithErrorResponse(Client **c, Request **r,
-	const SpawningKit::SpawnException &e)
+	const SpawningKit::SpawnException &e, int statusCode)
 {
 	TRACE_POINT();
 	Client *client = *c;
@@ -359,7 +370,7 @@ Controller::endRequestWithErrorResponse(Client **c, Request **r,
 		}
 	}
 
-	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), 500);
+	endRequestWithSimpleResponse(c, r, psg_pstrdup(req->pool, data), statusCode);
 }
 
 bool

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

@@ -115,7 +115,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/6.0.8")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.12")
  *   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/Controller/InternalUtils.cpp

@@ -96,7 +96,7 @@ Controller::endRequestWithAppSocketIncompleteResponse(Client **client, Request *
 			SKC_WARN(*client, "Sending 502 response: application did not send a complete response");
 		}
 		endRequestWithSimpleResponse(client, req,
-			"<h2>Incomplete response received from application</h2>", 502);
+			getFormattedMessage(*req, "Incomplete response received from application"), 502);
 	} else {
 		disconnectWithAppSocketIncompleteResponseError(client);
 	}
@@ -107,12 +107,39 @@ Controller::endRequestWithAppSocketReadError(Client **client, Request **req, int
 	Client *c = *client;
 	if (!(*req)->responseBegun) {
 		SKC_WARN(*client, "Sending 502 response: application socket read error");
-		endRequestWithSimpleResponse(client, req, "<h2>Application socket read error</h2>", 502);
+		endRequestWithSimpleResponse(client, req,
+			getFormattedMessage(*req, "Application socket read error"), 502);
 	} else {
 		disconnectWithAppSocketReadError(&c, e);
 	}
 }
 
+ServerKit::HeaderTable
+Controller::getHeadersWithContentType(Request *req)
+{
+	ServerKit::HeaderTable headers;
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			headers.insert(req->pool, "content-type", "application/json");
+		}
+		// Here we can extend setting `content-type` with more supported formats, ie: xml,...
+	}
+	return headers;
+}
+
+const StaticString
+Controller::getFormattedMessage(Request *req, const StaticString &body)
+{
+	const LString *value = req->headers.lookup(P_STATIC_STRING("content-type"));
+	if (value != NULL) {
+		if (psg_lstr_cmp(value, P_STATIC_STRING("application/json"))) {
+			return "{\"status\":\"error\", \"message\": \""+body+"\"}";
+		}
+	}
+	return "<h1>"+body+"</h1>";
+}
+
 /**
  * `data` must outlive the request.
  */
@@ -122,8 +149,7 @@ Controller::endRequestWithSimpleResponse(Client **c, Request **r,
 {
 	Client *client = *c;
 	Request *req = *r;
-	ServerKit::HeaderTable headers;
-
+	ServerKit::HeaderTable headers = getHeadersWithContentType(req);
 	headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
 	writeSimpleResponse(client, code, &headers, body);
 	endRequest(c, r);
@@ -134,9 +160,9 @@ Controller::endRequestAsBadGateway(Client **client, Request **req) {
 	if ((*req)->responseBegun) {
 		disconnectWithError(client, "bad gateway");
 	} else {
-		ServerKit::HeaderTable headers;
+		ServerKit::HeaderTable headers = getHeadersWithContentType(*req);
 		headers.insert((*req)->pool, "cache-control", "no-cache, no-store, must-revalidate");
-		writeSimpleResponse(*client, 502, &headers, "<h1>Bad Gateway</h1>");
+		writeSimpleResponse(*client, 502, &headers, getFormattedMessage(*req, "Bad Gateway"));
 		endRequest(client, req);
 	}
 }

data/src/agent/Core/Controller.h

@@ -207,6 +207,7 @@ private:
 	static void checkoutSessionLater(Request *req);
 	void reportSessionCheckoutError(Client *client, Request *req,
 		const ExceptionPtr &e);
+	int lookupCodeFromHeader(Request *req, const char* header, int statusCode);
 	void writeRequestQueueFullExceptionErrorResponse(Client *client,
 		Request *req, const boost::shared_ptr<RequestQueueFullException> &e);
 	void writeSpawnExceptionErrorResponse(Client *client, Request *req,
@@ -214,7 +215,7 @@ private:
 	void writeOtherExceptionErrorResponse(Client *client, Request *req,
 		const ExceptionPtr &e);
 	void endRequestWithErrorResponse(Client **c, Request **r,
-		const SpawningKit::SpawnException &e);
+		const SpawningKit::SpawnException &e, int statusCode);
 	bool friendlyErrorPagesEnabled(Request *req);
 
 
@@ -313,6 +314,8 @@ private:
 		Request **req);
 	void endRequestWithAppSocketReadError(Client **client, Request **req,
 		int e);
+	ServerKit::HeaderTable getHeadersWithContentType(Request *req);
+	const StaticString getFormattedMessage(Request *req, const StaticString &body);
 	void endRequestWithSimpleResponse(Client **c, Request **r,
 		const StaticString &body, int code = 200);
 	void endRequestAsBadGateway(Client **client, Request **req);

data/src/agent/Shared/ApplicationPoolApiKey.h

@@ -102,6 +102,8 @@ public:
 		memcpy(value, other.data(), SIZE);
 	}
 
+	ApiKey& operator=(const ApiKey &other) = default;
+
 	ApiKey(const ApiKey &other) {
 		memcpy(value, other.value, SIZE);
 	}

data/src/agent/Watchdog/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/6.0.8")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.12")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only