Skip to content

Refactor HttpMessage into generalized templated types #10692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yhabteab merged 2 commits into from
Jan 23, 2026
Merged

Refactor HttpMessage into generalized templated types #10692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0f603f
Update names of HttpRequest and HttpResponse
jschmidt-icinga Jan 22, 2026
1505f09
Refactor HttpMessage into generalized templated types
jschmidt-icinga Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/base/tlsstream.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <atomic>
#include <memory>
#include <utility>
#include <variant>
#include <boost/asio/buffered_stream.hpp>
#include <boost/asio/io_context.hpp>
#include <boost/asio/ip/tcp.hpp>
Expand Down Expand Up @@ -122,9 +123,9 @@ class AsioTlsStream : public boost::asio::buffered_stream<UnbufferedAsioTlsStrea
}
};

typedef boost::asio::buffered_stream<boost::asio::ip::tcp::socket> AsioTcpStream;
typedef std::pair<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr> OptionalTlsStream;

using AsioTcpStream = boost::asio::buffered_stream<boost::asio::ip::tcp::socket>;
using OptionalTlsStream = std::pair<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr>;
using AsioTlsOrTcpStream = std::variant<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr>;
}

#endif /* TLSSTREAM_H */
4 changes: 2 additions & 2 deletions lib/remote/actionshandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);

bool ActionsHandler::HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/actionshandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class ActionsHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;
};
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/configfileshandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);

bool ConfigFilesHandler::HandleRequest(
const WaitGroup::Ptr&,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/configfileshandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class ConfigFilesHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;
};
Expand Down
10 changes: 5 additions & 5 deletions lib/remote/configpackageshandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);

bool ConfigPackagesHandler::HandleRequest(
const WaitGroup::Ptr&,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand All @@ -39,7 +39,7 @@ bool ConfigPackagesHandler::HandleRequest(
return true;
}

void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
void ConfigPackagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down Expand Up @@ -87,7 +87,7 @@ void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse&
HttpUtility::SendJsonBody(response, params, result);
}

void ConfigPackagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
void ConfigPackagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down Expand Up @@ -137,7 +137,7 @@ void ConfigPackagesHandler::HandlePost(const HttpRequest& request, HttpResponse&
HttpUtility::SendJsonBody(response, params, result);
}

void ConfigPackagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
void ConfigPackagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down
10 changes: 5 additions & 5 deletions lib/remote/configpackageshandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ class ConfigPackagesHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;

private:
void HandleGet(const HttpRequest& request, HttpResponse& response);
void HandlePost(const HttpRequest& request, HttpResponse& response);
void HandleDelete(const HttpRequest& request, HttpResponse& response);
void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);

};

Expand Down
10 changes: 5 additions & 5 deletions lib/remote/configstageshandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ static std::mutex l_RunningPackageUpdatesMutex; // Protects the above two variab

bool ConfigStagesHandler::HandleRequest(
const WaitGroup::Ptr&,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand All @@ -46,7 +46,7 @@ bool ConfigStagesHandler::HandleRequest(
return true;
}

void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
void ConfigStagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down Expand Up @@ -92,7 +92,7 @@ void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& re
HttpUtility::SendJsonBody(response, params, result);
}

void ConfigStagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
void ConfigStagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down Expand Up @@ -203,7 +203,7 @@ void ConfigStagesHandler::HandlePost(const HttpRequest& request, HttpResponse& r
HttpUtility::SendJsonBody(response, params, result);
}

void ConfigStagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
void ConfigStagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
{
namespace http = boost::beast::http;

Expand Down
10 changes: 5 additions & 5 deletions lib/remote/configstageshandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ class ConfigStagesHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;

private:
void HandleGet(const HttpRequest& request, HttpResponse& response);
void HandlePost(const HttpRequest& request, HttpResponse& response);
void HandleDelete(const HttpRequest& request, HttpResponse& response);
void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);
};

}
Expand Down
8 changes: 4 additions & 4 deletions lib/remote/consolehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ static void EnsureFrameCleanupTimer()

bool ConsoleHandler::HandleRequest(
const WaitGroup::Ptr&,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down Expand Up @@ -102,7 +102,7 @@ bool ConsoleHandler::HandleRequest(
return true;
}

bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpResponse& response,
bool ConsoleHandler::ExecuteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
const String& command, const String& session, bool sandboxed)
{
namespace http = boost::beast::http;
Expand Down Expand Up @@ -176,7 +176,7 @@ bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpRespons
return true;
}

bool ConsoleHandler::AutocompleteScriptHelper(const HttpRequest& request, HttpResponse& response,
bool ConsoleHandler::AutocompleteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
const String& command, const String& session, bool sandboxed)
{
namespace http = boost::beast::http;
Expand Down
8 changes: 4 additions & 4 deletions lib/remote/consolehandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ class ConsoleHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;

static std::vector<String> GetAutocompletionSuggestions(const String& word, ScriptFrame& frame);

private:
static bool ExecuteScriptHelper(const HttpRequest& request, HttpResponse& response,
static bool ExecuteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
const String& command, const String& session, bool sandboxed);
static bool AutocompleteScriptHelper(const HttpRequest& request, HttpResponse& response,
static bool AutocompleteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
const String& command, const String& session, bool sandboxed);

};
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/createobjecthandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/objects", CreateObjectHandler);

bool CreateObjectHandler::HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/createobjecthandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class CreateObjectHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;
};
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/deleteobjecthandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/objects", DeleteObjectHandler);

bool DeleteObjectHandler::HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/deleteobjecthandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class DeleteObjectHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;
};
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/eventshandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ const String l_ApiQuery ("<API query>");

bool EventsHandler::HandleRequest(
const WaitGroup::Ptr&,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/eventshandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ class EventsHandler final : public HttpHandler

bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) override;
};
Expand Down
4 changes: 2 additions & 2 deletions lib/remote/httphandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ void HttpHandler::Register(const Url::Ptr& url, const HttpHandler::Ptr& handler)

void HttpHandler::ProcessRequest(
const WaitGroup::Ptr& waitGroup,
HttpRequest& request,
HttpResponse& response,
HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
)
{
Expand Down
8 changes: 4 additions & 4 deletions lib/remote/httphandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ class HttpHandler : public Object

virtual bool HandleRequest(
const WaitGroup::Ptr& waitGroup,
const HttpRequest& request,
HttpResponse& response,
const HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
) = 0;

static void Register(const Url::Ptr& url, const HttpHandler::Ptr& handler);
static void ProcessRequest(
const WaitGroup::Ptr& waitGroup,
HttpRequest& request,
HttpResponse& response,
HttpApiRequest& request,
HttpApiResponse& response,
boost::asio::yield_context& yc
);

Expand Down
Loading
Loading