passenger 6.1.8 → 6.2.1

data/src/agent/Watchdog/{AgentWatcher.cpp → AgentWatcher.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -23,6 +23,27 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_WATCHDOG_AGENT_WATCHER_H_
+#define _PASSENGER_WATCHDOG_AGENT_WATCHER_H_
+
+#include <boost/enable_shared_from_this.hpp>
+#include <oxt/thread.hpp>
+#include <oxt/system_calls.hpp>
+#include <string>
+
+#include <LoggingKit/Logging.h>
+#include <FileDescriptor.h>
+#include <ProcessManagement/Utils.h>
+#include <Utils.h>
+#include <Utils/Timer.h>
+
+#include <Watchdog/WorkingObjects.h>
+
+namespace Passenger {
+namespace Watchdog {
+
+using namespace oxt;
+
 
 /**
  * Abstract base class for watching agent processes.
@@ -535,3 +556,9 @@ public:
 };
 
 typedef boost::shared_ptr<AgentWatcher> AgentWatcherPtr;
+
+
+} // namespace Watchdog
+} // namespace Passenger
+
+#endif /* _PASSENGER_WATCHDOG_AGENT_WATCHER_H_ */

data/src/agent/Watchdog/ApiServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -92,6 +92,29 @@ public:
 	}
 };
 
+/**
+ * Builds the config that WatchdogMain.cpp passes to the ApiServer constructor.
+ *
+ * Must assign `authorizations` to the OUTER key "watchdog_api_server_authorizations",
+ * not to the inner "authorizations" key. `watchdogConfig.inspectEffectiveValues()`
+ * already contains "watchdog_api_server_authorizations", defaulting to an empty
+ * array, and the ApiServer schema translator maps that outer name onto the inner
+ * "authorizations". Assigning the inner name here leaves both keys present in the
+ * same document; ConfigKit's translator assigns while iterating, jsoncpp iterates
+ * keys in sorted order, so the outer key gets applied last and silently overwrites
+ * these entries with the empty default, always emptying the API account database.
+ */
+inline Json::Value
+buildConfig(const ConfigKit::Store &watchdogConfig, const Json::Value &authorizations,
+	const StaticString &fdPassingPassword)
+{
+	Json::Value config = watchdogConfig.inspectEffectiveValues();
+	config["fd_passing_password"] = fdPassingPassword.toString();
+	config.removeMember("watchdog_api_server_authorizations"); // Replace with scoped auth
+	config["authorizations"] = authorizations;
+	return config;
+}
+
 struct ConfigChangeRequest {
 	ServerKit::HttpServerConfigChangeRequest forParent;
 	boost::scoped_ptr<ApiAccountUtils::ApiAccountDatabase> apiAccountDatabase;
@@ -160,6 +183,7 @@ private:
 		if (req->method == HTTP_GET) {
 			if (!authorizeStateInspectionOperation(this, client, req)) {
 				apiServerRespondWith401(this, client, req);
+				return;
 			}
 
 			HeaderTable headers;

data/src/agent/Watchdog/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -139,7 +139,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.1.8")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.2.1")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only

data/src/agent/Watchdog/{CoreWatcher.cpp → CoreWatcher.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -23,9 +23,19 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_WATCHDOG_CORE_WATCHER_H_
+#define _PASSENGER_WATCHDOG_CORE_WATCHER_H_
 
+#include <Shared/Fundamentals/Initialization.h>
 #include <Shared/Fundamentals/Utils.h>
 #include <IOTools/MessageIO.h>
+#include <Watchdog/AgentWatcher.h>
+
+namespace Passenger {
+namespace Watchdog {
+
+using namespace Passenger::Agent::Fundamentals;
+
 
 class CoreWatcher: public AgentWatcher {
 protected:
@@ -93,3 +103,10 @@ public:
 		report["core_password"] = watchdogConfig->get("controller_secure_headers_password").asString();
 	}
 };
+
+
+} // namespace Watchdog
+} // namespace Passenger
+
+#endif /* _PASSENGER_WATCHDOG_CORE_WATCHER_H_ */
+

data/src/agent/Watchdog/{InstanceDirToucher.cpp → InstanceDirToucher.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -23,11 +23,24 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_WATCHDOG_INSTANCE_DIR_TOUCHER_H_
+#define _PASSENGER_WATCHDOG_INSTANCE_DIR_TOUCHER_H_
 
 #include <boost/bind/bind.hpp>
+#include <oxt/thread.hpp>
+
 #include <Shared/Fundamentals/Utils.h>
 #include <Utils/AsyncSignalSafeUtils.h>
 
+#include <Watchdog/WorkingObjects.h>
+
+namespace Passenger {
+namespace Watchdog {
+
+using namespace oxt;
+using namespace Passenger::Agent::Fundamentals;
+
+
 /**
  * Touch all files in the server instance dir every 6 hours in order to prevent /tmp
  * cleaners from weaking havoc:
@@ -153,3 +166,9 @@ public:
 };
 
 typedef boost::shared_ptr<InstanceDirToucher> InstanceDirToucherPtr;
+
+
+} // namespace Watchdog
+} // namespace Passenger
+
+#endif /* _PASSENGER_WATCHDOG_INSTANCE_DIR_TOUCHER_H_ */

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -66,6 +66,7 @@
 #include <Core/OptionParser.h>
 #include <Watchdog/Config.h>
 #include <Watchdog/ApiServer.h>
+#include <Watchdog/WorkingObjects.h>
 #include <JsonTools/Autocast.h>
 #include <Constants.h>
 #include <InstanceDirectory.h>
@@ -93,6 +94,7 @@ using namespace std;
 using namespace boost;
 using namespace oxt;
 using namespace Passenger;
+using namespace Passenger::Watchdog;
 using namespace Passenger::Agent::Fundamentals;
 
 
@@ -101,83 +103,16 @@ enum OomFileType {
 	OOM_SCORE_ADJ
 };
 
-class InstanceDirToucher;
-class AgentWatcher;
-
-/***** Working objects *****/
-
-namespace Passenger {
-namespace Watchdog {
-	struct WorkingObjects {
-		RandomGenerator randomGenerator;
-		EventFd errorEvent;
-		EventFd exitEvent;
-		uid_t defaultUid;
-		gid_t defaultGid;
-		InstanceDirectoryPtr instanceDir;
-		int startupReportFile;
-		int lockFile;
-		vector<string> cleanupPidfiles;
-		bool pidsCleanedUp;
-		bool pidFileCleanedUp;
-		string corePidFile;
-		string fdPassingPassword;
-		Json::Value extraConfigToPassToSubAgents;
-		Json::Value controllerAddresses;
-		Json::Value coreApiServerAddresses;
-		Json::Value coreApiServerAuthorizations;
-		Json::Value watchdogApiServerAddresses;
-		Json::Value watchdogApiServerAuthorizations;
-
-		int apiServerFds[SERVER_KIT_MAX_SERVER_ENDPOINTS];
-		BackgroundEventLoop *bgloop;
-		ServerKit::Context *serverKitContext;
-		ServerKit::Schema serverKitSchema;
-		ApiServer::ApiServer *apiServer;
-
-		WorkingObjects()
-			: errorEvent(__FILE__, __LINE__, "WorkingObjects: errorEvent"),
-			  exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
-			  startupReportFile(-1),
-			  pidsCleanedUp(false),
-			  pidFileCleanedUp(false),
-			  extraConfigToPassToSubAgents(Json::objectValue),
-			  controllerAddresses(Json::arrayValue),
-			  coreApiServerAddresses(Json::arrayValue),
-			  coreApiServerAuthorizations(Json::arrayValue),
-			  watchdogApiServerAddresses(Json::arrayValue),
-			  watchdogApiServerAuthorizations(Json::arrayValue),
-			  bgloop(NULL),
-			  serverKitContext(NULL),
-			  apiServer(NULL)
-		{
-			for (unsigned int i = 0; i < SERVER_KIT_MAX_SERVER_ENDPOINTS; i++) {
-				apiServerFds[i] = -1;
-			}
-		}
-	};
-
-	typedef boost::shared_ptr<WorkingObjects> WorkingObjectsPtr;
-} // namespace Watchdog
-} // namespace Passenger
-
-using namespace Passenger::Watchdog;
-
-static WrapperRegistry::Registry *watchdogWrapperRegistry;
-static Schema *watchdogSchema;
-static ConfigKit::Store *watchdogConfig;
-static WorkingObjects *workingObjects;
-
 static void cleanup(const WorkingObjectsPtr &wo);
 
-#include "AgentWatcher.cpp"
-#include "InstanceDirToucher.cpp"
-#include "CoreWatcher.cpp"
+#include <Watchdog/AgentWatcher.h>
+#include <Watchdog/InstanceDirToucher.h>
+#include <Watchdog/CoreWatcher.h>
 
 
 /***** Functions *****/
 
-#if !BOOST_OS_MACOS
+#if BOOST_OS_LINUX
 
 struct WatchdogOomAdjustResult {
 	struct Message {
@@ -860,7 +795,7 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	 * for this watchdog. Note that the OOM score is inherited by child processes
 	 * so we need to restore it after each fork().
 	 */
-#if !BOOST_OS_MACOS
+#if BOOST_OS_LINUX
 	WatchdogOomAdjustResult oomAdjustResult = setOomScoreNeverKill();
 #endif
 
@@ -877,7 +812,7 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 
 	wo = boost::make_shared<WorkingObjects>();
 	workingObjects = wo.get();
-#if !BOOST_OS_MACOS
+#if BOOST_OS_LINUX
 	printOomAdjustResultMessages(oomAdjustResult);
 	wo->extraConfigToPassToSubAgents["oom_score"] = oomAdjustResult.oldScore;
 #endif
@@ -1242,9 +1177,8 @@ initializeApiServer(const WorkingObjectsPtr &wo) {
 	wo->serverKitContext->initialize();
 
 	UPDATE_TRACE_POINT();
-	Json::Value apiServerConfig = watchdogConfig->inspectEffectiveValues();
-	apiServerConfig["fd_passing_password"] = wo->fdPassingPassword;
-	apiServerConfig["authorizations"] = wo->watchdogApiServerAuthorizations;
+	Json::Value apiServerConfig = ApiServer::buildConfig(*watchdogConfig,
+		wo->watchdogApiServerAuthorizations, wo->fdPassingPassword);
 	wo->apiServer = new ApiServer::ApiServer(
 		wo->serverKitContext,
 		watchdogSchema->apiServer.schema,

data/src/agent/Watchdog/WorkingObjects.h

@@ -0,0 +1,108 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Asynchronous B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_WATCHDOG_WORKING_OBJECTS_H_
+#define _PASSENGER_WATCHDOG_WORKING_OBJECTS_H_
+
+#include <vector>
+#include <string>
+#include <jsoncpp/json.h>
+
+#include <RandomGenerator.h>
+#include <InstanceDirectory.h>
+#include <BackgroundEventLoop.h>
+#include <WrapperRegistry/Registry.h>
+#include <ServerKit/Context.h>
+
+#include <Watchdog/Config.h>
+#include <Watchdog/ApiServer.h>
+
+namespace Passenger {
+namespace Watchdog {
+
+using namespace std;
+
+
+struct WorkingObjects {
+	RandomGenerator randomGenerator;
+	EventFd errorEvent;
+	EventFd exitEvent;
+	uid_t defaultUid;
+	gid_t defaultGid;
+	InstanceDirectoryPtr instanceDir;
+	int startupReportFile;
+	int lockFile;
+	vector<string> cleanupPidfiles;
+	bool pidsCleanedUp;
+	bool pidFileCleanedUp;
+	string corePidFile;
+	string fdPassingPassword;
+	Json::Value extraConfigToPassToSubAgents;
+	Json::Value controllerAddresses;
+	Json::Value coreApiServerAddresses;
+	Json::Value coreApiServerAuthorizations;
+	Json::Value watchdogApiServerAddresses;
+	Json::Value watchdogApiServerAuthorizations;
+
+	int apiServerFds[SERVER_KIT_MAX_SERVER_ENDPOINTS];
+	BackgroundEventLoop *bgloop;
+	ServerKit::Context *serverKitContext;
+	ServerKit::Schema serverKitSchema;
+	ApiServer::ApiServer *apiServer;
+
+	WorkingObjects()
+		: errorEvent(__FILE__, __LINE__, "WorkingObjects: errorEvent"),
+			exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
+			startupReportFile(-1),
+			pidsCleanedUp(false),
+			pidFileCleanedUp(false),
+			extraConfigToPassToSubAgents(Json::objectValue),
+			controllerAddresses(Json::arrayValue),
+			coreApiServerAddresses(Json::arrayValue),
+			coreApiServerAuthorizations(Json::arrayValue),
+			watchdogApiServerAddresses(Json::arrayValue),
+			watchdogApiServerAuthorizations(Json::arrayValue),
+			bgloop(NULL),
+			serverKitContext(NULL),
+			apiServer(NULL)
+	{
+		for (unsigned int i = 0; i < SERVER_KIT_MAX_SERVER_ENDPOINTS; i++) {
+			apiServerFds[i] = -1;
+		}
+	}
+};
+
+typedef boost::shared_ptr<WorkingObjects> WorkingObjectsPtr;
+
+static WrapperRegistry::Registry *watchdogWrapperRegistry;
+static Schema *watchdogSchema;
+static ConfigKit::Store *watchdogConfig;
+static WorkingObjects *workingObjects;
+
+
+} // namespace Watchdog
+} // namespace Passenger
+
+#endif /* _PASSENGER_WATCHDOG_WORKING_OBJECTS_H_ */

data/src/apache2_module/Bucket.cpp

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

data/src/apache2_module/Bucket.h

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

data/src/apache2_module/CBindings.cpp

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

data/src/apache2_module/Config.cpp

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

data/src/apache2_module/Config.h

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