Remove extra parameters from HTTP handler signature

jschmidt-icinga · jschmidt-icinga · commit 62b2dadbac82 · 2025-08-28T13:22:18.000+02:00
These parameters are no longer needed since they were only used
by EventsHandler which was refactored in an earlier commit.
diff --git a/lib/remote/actionshandler.cpp b/lib/remote/actionshandler.cpp
@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);
 
 bool ActionsHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/actionshandler.hpp b/lib/remote/actionshandler.hpp
@@ -17,11 +17,9 @@ class ActionsHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
@@ -15,11 +15,9 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);
 
 bool ConfigFilesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/configfileshandler.hpp b/lib/remote/configfileshandler.hpp
@@ -15,11 +15,9 @@ class ConfigFilesHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/configpackageshandler.cpp b/lib/remote/configpackageshandler.cpp
@@ -13,11 +13,9 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);
 
 bool ConfigPackagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/configpackageshandler.hpp b/lib/remote/configpackageshandler.hpp
@@ -15,11 +15,9 @@ class ConfigPackagesHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 
 private:
diff --git a/lib/remote/configstageshandler.cpp b/lib/remote/configstageshandler.cpp
@@ -20,11 +20,9 @@ static std::mutex l_RunningPackageUpdatesMutex; // Protects the above two variab
 
 bool ConfigStagesHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/configstageshandler.hpp b/lib/remote/configstageshandler.hpp
@@ -15,11 +15,9 @@ class ConfigStagesHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 
 private:
diff --git a/lib/remote/consolehandler.cpp b/lib/remote/consolehandler.cpp
@@ -55,11 +55,9 @@ static void EnsureFrameCleanupTimer()
 
 bool ConsoleHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/consolehandler.hpp b/lib/remote/consolehandler.hpp
@@ -24,11 +24,9 @@ class ConsoleHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 
 	static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);
diff --git a/lib/remote/createobjecthandler.cpp b/lib/remote/createobjecthandler.cpp
@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);
 
 bool CreateObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/createobjecthandler.hpp b/lib/remote/createobjecthandler.hpp
@@ -15,11 +15,9 @@ class CreateObjectHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/deleteobjecthandler.cpp b/lib/remote/deleteobjecthandler.cpp
@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler);
 
 bool DeleteObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/deleteobjecthandler.hpp b/lib/remote/deleteobjecthandler.hpp
@@ -15,11 +15,9 @@ class DeleteObjectHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
@@ -41,11 +41,9 @@ const String l_ApiQuery ("<API query>");
 
 bool EventsHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace asio = boost::asio;
diff --git a/lib/remote/eventshandler.hpp b/lib/remote/eventshandler.hpp
@@ -16,11 +16,9 @@ class EventsHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/httphandler.cpp b/lib/remote/httphandler.cpp
@@ -48,11 +48,9 @@ void HttpHandler::Register(const Url::Ptr& url, const HttpHandler::Ptr& handler)
 
 void HttpHandler::ProcessRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	Dictionary::Ptr node = m_UrlTree;
@@ -106,7 +104,7 @@ void HttpHandler::ProcessRequest(
 	 */
 	try {
 		for (const HttpHandler::Ptr& handler : handlers) {
-			if (handler->HandleRequest(waitGroup, stream, request, response, yc, server)) {
+			if (handler->HandleRequest(waitGroup, request, response, yc)) {
 				processed = true;
 				break;
 			}
diff --git a/lib/remote/httphandler.hpp b/lib/remote/httphandler.hpp
@@ -30,21 +30,17 @@ class HttpHandler : public Object
 
 	virtual bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) = 0;
 
 	static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler);
 	static void ProcessRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	);
 
 private:
diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
@@ -408,12 +408,9 @@ bool EnsureValidBody(
 }
 
 static inline
-bool ProcessRequest(
-	AsioTlsStream& stream,
+void ProcessRequest(
 	HttpRequest& request,
 	HttpResponse& response,
-	HttpServerConnection& server,
-	bool& connectionReusable,
 	const WaitGroup::Ptr& waitGroup,
 	std::chrono::steady_clock::duration& cpuBoundWorkTime,
 	boost::asio::yield_context& yc
@@ -425,12 +422,9 @@ bool ProcessRequest(
 		CpuBoundWork handlingRequest (yc);
 		cpuBoundWorkTime = std::chrono::steady_clock::now() - start;
 
-		HttpHandler::ProcessRequest(waitGroup, stream, request, response, yc, server);
+		HttpHandler::ProcessRequest(waitGroup, request, response, yc);
+		response.body().Finish();
 	} catch (const std::exception& ex) {
-		if (!connectionReusable) {
-			return false;
-		}
-
 		/* Since we don't know the state the stream is in, we can't send an error response and
 		 * have to just cause a disconnect here.
 		 */
@@ -439,18 +433,9 @@ bool ProcessRequest(
 		}
 
 		HttpUtility::SendJsonError(response, request.Params(), 500, "Unhandled exception", DiagnosticInformation(ex));
-		response.Flush(yc);
-		return true;
 	}
 
-	if (!connectionReusable) {
-		return false;
-	}
-
-	response.body().Finish();
 	response.Flush(yc);
-
-	return true;
 }
 
 void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
@@ -536,9 +521,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
 
 			m_Seen = std::numeric_limits<decltype(m_Seen)>::max();
 
-			if (!ProcessRequest(*m_Stream, request, response, *this, m_ConnectionReusable, m_WaitGroup, cpuBoundWorkTime, yc)) {
-				break;
-			}
+			ProcessRequest(request, response, m_WaitGroup, cpuBoundWorkTime, yc);
 
 			if (!request.keep_alive() || !m_ConnectionReusable) {
 				break;
diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp
@@ -10,11 +10,9 @@ REGISTER_URLHANDLER("/", InfoHandler);
 
 bool InfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/infohandler.hpp b/lib/remote/infohandler.hpp
@@ -15,11 +15,9 @@ class InfoHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/mallocinfohandler.cpp b/lib/remote/mallocinfohandler.cpp
@@ -19,11 +19,9 @@ REGISTER_URLHANDLER("/v1/debug/malloc_info", MallocInfoHandler);
 
 bool MallocInfoHandler::HandleRequest(
 	const WaitGroup::Ptr&,
-	AsioTlsStream&,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context&,
-	HttpServerConnection&
+	boost::asio::yield_context&
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/mallocinfohandler.hpp b/lib/remote/mallocinfohandler.hpp
@@ -14,11 +14,9 @@ class MallocInfoHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/modifyobjecthandler.cpp b/lib/remote/modifyobjecthandler.cpp
@@ -15,11 +15,9 @@ REGISTER_URLHANDLER("/v1/objects", ModifyObjectHandler);
 
 bool ModifyObjectHandler::HandleRequest(
 	const WaitGroup::Ptr& waitGroup,
-	AsioTlsStream& stream,
 	const HttpRequest& request,
 	HttpResponse& response,
-	boost::asio::yield_context& yc,
-	HttpServerConnection& server
+	boost::asio::yield_context& yc
 )
 {
 	namespace http = boost::beast::http;
diff --git a/lib/remote/modifyobjecthandler.hpp b/lib/remote/modifyobjecthandler.hpp
@@ -15,11 +15,9 @@ class ModifyObjectHandler final : public HttpHandler
 
 	bool HandleRequest(
 		const WaitGroup::Ptr& waitGroup,
-		AsioTlsStream& stream,
 		const HttpRequest& request,
 		HttpResponse& response,
-		boost::asio::yield_context& yc,
-		HttpServerConnection& server
+		boost::asio::yield_context& yc
 	) override;
 };
 
diff --git a/lib/remote/objectqueryhandler.cpp b/lib/remote/objectqueryhandler.cpp
diff --git a/lib/remote/objectqueryhandler.hpp b/lib/remote/objectqueryhandler.hpp
diff --git a/lib/remote/statushandler.cpp b/lib/remote/statushandler.cpp
diff --git a/lib/remote/statushandler.hpp b/lib/remote/statushandler.hpp
diff --git a/lib/remote/templatequeryhandler.cpp b/lib/remote/templatequeryhandler.cpp
diff --git a/lib/remote/templatequeryhandler.hpp b/lib/remote/templatequeryhandler.hpp
diff --git a/lib/remote/typequeryhandler.cpp b/lib/remote/typequeryhandler.cpp
diff --git a/lib/remote/typequeryhandler.hpp b/lib/remote/typequeryhandler.hpp
diff --git a/lib/remote/variablequeryhandler.cpp b/lib/remote/variablequeryhandler.cpp
diff --git a/lib/remote/variablequeryhandler.hpp b/lib/remote/variablequeryhandler.hpp

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,9 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);`
`17`	`17`
`18`	`18`	`bool ActionsHandler::HandleRequest(`
`19`	`19`	`const WaitGroup::Ptr& waitGroup,`
`20`		`- AsioTlsStream& stream,`
`21`	`20`	`const HttpRequest& request,`
`22`	`21`	`HttpResponse& response,`
`23`		`- boost::asio::yield_context& yc,`
`24`		`- HttpServerConnection& server`
	`22`	`+ boost::asio::yield_context& yc`
`25`	`23`	`)`
`26`	`24`	`{`
`27`	`25`	`namespace http = boost::beast::http;`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,9 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);`
`15`	`15`
`16`	`16`	`bool ConfigFilesHandler::HandleRequest(`
`17`	`17`	`const WaitGroup::Ptr&,`
`18`		`- AsioTlsStream& stream,`
`19`	`18`	`const HttpRequest& request,`
`20`	`19`	`HttpResponse& response,`
`21`		`- boost::asio::yield_context& yc,`
`22`		`- HttpServerConnection& server`
	`20`	`+ boost::asio::yield_context& yc`
`23`	`21`	`)`
`24`	`22`	`{`
`25`	`23`	`namespace http = boost::beast::http;`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,9 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);`
`13`	`13`
`14`	`14`	`bool ConfigPackagesHandler::HandleRequest(`
`15`	`15`	`const WaitGroup::Ptr&,`
`16`		`- AsioTlsStream& stream,`
`17`	`16`	`const HttpRequest& request,`
`18`	`17`	`HttpResponse& response,`
`19`		`- boost::asio::yield_context& yc,`
`20`		`- HttpServerConnection& server`
	`18`	`+ boost::asio::yield_context& yc`
`21`	`19`	`)`
`22`	`20`	`{`
`23`	`21`	`namespace http = boost::beast::http;`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,9 @@ static std::mutex l_RunningPackageUpdatesMutex; // Protects the above two variab`
`20`	`20`
`21`	`21`	`bool ConfigStagesHandler::HandleRequest(`
`22`	`22`	`const WaitGroup::Ptr&,`
`23`		`- AsioTlsStream& stream,`
`24`	`23`	`const HttpRequest& request,`
`25`	`24`	`HttpResponse& response,`
`26`		`- boost::asio::yield_context& yc,`
`27`		`- HttpServerConnection& server`
	`25`	`+ boost::asio::yield_context& yc`
`28`	`26`	`)`
`29`	`27`	`{`
`30`	`28`	`namespace http = boost::beast::http;`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,9 @@ static void EnsureFrameCleanupTimer()`
`55`	`55`
`56`	`56`	`bool ConsoleHandler::HandleRequest(`
`57`	`57`	`const WaitGroup::Ptr&,`
`58`		`- AsioTlsStream& stream,`
`59`	`58`	`const HttpRequest& request,`
`60`	`59`	`HttpResponse& response,`
`61`		`- boost::asio::yield_context& yc,`
`62`		`- HttpServerConnection& server`
	`60`	`+ boost::asio::yield_context& yc`
`63`	`61`	`)`
`64`	`62`	`{`
`65`	`63`	`namespace http = boost::beast::http;`