Skip to content

Commit aa0e7b6

Browse files
yhabteabyhabteab
authored
Merge pull request #10692 from Icinga/refactor-httpmessage-more-general
Refactor HttpMessage into generalized templated types
2 parents 5ca1108 + 1505f09 commit aa0e7b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+367
-236
lines changed

‎lib/base/tlsstream.hpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <atomic>
1414
#include <memory>
1515
#include <utility>
16+
#include <variant>
1617
#include <boost/asio/buffered_stream.hpp>
1718
#include <boost/asio/io_context.hpp>
1819
#include <boost/asio/ip/tcp.hpp>
@@ -122,9 +123,9 @@ class AsioTlsStream : public boost::asio::buffered_stream<UnbufferedAsioTlsStrea
122123
}
123124
};
124125

125-
typedef boost::asio::buffered_stream<boost::asio::ip::tcp::socket> AsioTcpStream;
126-
typedef std::pair<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr> OptionalTlsStream;
127-
126+
using AsioTcpStream = boost::asio::buffered_stream<boost::asio::ip::tcp::socket>;
127+
using OptionalTlsStream = std::pair<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr>;
128+
using AsioTlsOrTcpStream = std::variant<Shared<AsioTlsStream>::Ptr, Shared<AsioTcpStream>::Ptr>;
128129
}
129130

130131
#endif /* TLSSTREAM_H */

‎lib/remote/actionshandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ REGISTER_URLHANDLER("/v1/actions", ActionsHandler);
1717

1818
bool ActionsHandler::HandleRequest(
1919
const WaitGroup::Ptr& waitGroup,
20-
const HttpRequest& request,
21-
HttpResponse& response,
20+
const HttpApiRequest& request,
21+
HttpApiResponse& response,
2222
boost::asio::yield_context& yc
2323
)
2424
{

‎lib/remote/actionshandler.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class ActionsHandler final : public HttpHandler
1717

1818
bool HandleRequest(
1919
const WaitGroup::Ptr& waitGroup,
20-
const HttpRequest& request,
21-
HttpResponse& response,
20+
const HttpApiRequest& request,
21+
HttpApiResponse& response,
2222
boost::asio::yield_context& yc
2323
) override;
2424
};

‎lib/remote/configfileshandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ REGISTER_URLHANDLER("/v1/config/files", ConfigFilesHandler);
1515

1616
bool ConfigFilesHandler::HandleRequest(
1717
const WaitGroup::Ptr&,
18-
const HttpRequest& request,
19-
HttpResponse& response,
18+
const HttpApiRequest& request,
19+
HttpApiResponse& response,
2020
boost::asio::yield_context& yc
2121
)
2222
{

‎lib/remote/configfileshandler.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class ConfigFilesHandler final : public HttpHandler
1515

1616
bool HandleRequest(
1717
const WaitGroup::Ptr& waitGroup,
18-
const HttpRequest& request,
19-
HttpResponse& response,
18+
const HttpApiRequest& request,
19+
HttpApiResponse& response,
2020
boost::asio::yield_context& yc
2121
) override;
2222
};

‎lib/remote/configpackageshandler.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ REGISTER_URLHANDLER("/v1/config/packages", ConfigPackagesHandler);
1313

1414
bool ConfigPackagesHandler::HandleRequest(
1515
const WaitGroup::Ptr&,
16-
const HttpRequest& request,
17-
HttpResponse& response,
16+
const HttpApiRequest& request,
17+
HttpApiResponse& response,
1818
boost::asio::yield_context& yc
1919
)
2020
{
@@ -39,7 +39,7 @@ bool ConfigPackagesHandler::HandleRequest(
3939
return true;
4040
}
4141

42-
void ConfigPackagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
42+
void ConfigPackagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
4343
{
4444
namespace http = boost::beast::http;
4545

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

90-
void ConfigPackagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
90+
void ConfigPackagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
9191
{
9292
namespace http = boost::beast::http;
9393

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

140-
void ConfigPackagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
140+
void ConfigPackagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
141141
{
142142
namespace http = boost::beast::http;
143143

‎lib/remote/configpackageshandler.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ class ConfigPackagesHandler final : public HttpHandler
1515

1616
bool HandleRequest(
1717
const WaitGroup::Ptr& waitGroup,
18-
const HttpRequest& request,
19-
HttpResponse& response,
18+
const HttpApiRequest& request,
19+
HttpApiResponse& response,
2020
boost::asio::yield_context& yc
2121
) override;
2222

2323
private:
24-
void HandleGet(const HttpRequest& request, HttpResponse& response);
25-
void HandlePost(const HttpRequest& request, HttpResponse& response);
26-
void HandleDelete(const HttpRequest& request, HttpResponse& response);
24+
void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
25+
void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
26+
void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);
2727

2828
};
2929

‎lib/remote/configstageshandler.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ static std::mutex l_RunningPackageUpdatesMutex; // Protects the above two variab
2020

2121
bool ConfigStagesHandler::HandleRequest(
2222
const WaitGroup::Ptr&,
23-
const HttpRequest& request,
24-
HttpResponse& response,
23+
const HttpApiRequest& request,
24+
HttpApiResponse& response,
2525
boost::asio::yield_context& yc
2626
)
2727
{
@@ -46,7 +46,7 @@ bool ConfigStagesHandler::HandleRequest(
4646
return true;
4747
}
4848

49-
void ConfigStagesHandler::HandleGet(const HttpRequest& request, HttpResponse& response)
49+
void ConfigStagesHandler::HandleGet(const HttpApiRequest& request, HttpApiResponse& response)
5050
{
5151
namespace http = boost::beast::http;
5252

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

95-
void ConfigStagesHandler::HandlePost(const HttpRequest& request, HttpResponse& response)
95+
void ConfigStagesHandler::HandlePost(const HttpApiRequest& request, HttpApiResponse& response)
9696
{
9797
namespace http = boost::beast::http;
9898

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

206-
void ConfigStagesHandler::HandleDelete(const HttpRequest& request, HttpResponse& response)
206+
void ConfigStagesHandler::HandleDelete(const HttpApiRequest& request, HttpApiResponse& response)
207207
{
208208
namespace http = boost::beast::http;
209209

‎lib/remote/configstageshandler.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ class ConfigStagesHandler final : public HttpHandler
1515

1616
bool HandleRequest(
1717
const WaitGroup::Ptr& waitGroup,
18-
const HttpRequest& request,
19-
HttpResponse& response,
18+
const HttpApiRequest& request,
19+
HttpApiResponse& response,
2020
boost::asio::yield_context& yc
2121
) override;
2222

2323
private:
24-
void HandleGet(const HttpRequest& request, HttpResponse& response);
25-
void HandlePost(const HttpRequest& request, HttpResponse& response);
26-
void HandleDelete(const HttpRequest& request, HttpResponse& response);
24+
void HandleGet(const HttpApiRequest& request, HttpApiResponse& response);
25+
void HandlePost(const HttpApiRequest& request, HttpApiResponse& response);
26+
void HandleDelete(const HttpApiRequest& request, HttpApiResponse& response);
2727
};
2828

2929
}

‎lib/remote/consolehandler.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ static void EnsureFrameCleanupTimer()
5454

5555
bool ConsoleHandler::HandleRequest(
5656
const WaitGroup::Ptr&,
57-
const HttpRequest& request,
58-
HttpResponse& response,
57+
const HttpApiRequest& request,
58+
HttpApiResponse& response,
5959
boost::asio::yield_context& yc
6060
)
6161
{
@@ -102,7 +102,7 @@ bool ConsoleHandler::HandleRequest(
102102
return true;
103103
}
104104

105-
bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpResponse& response,
105+
bool ConsoleHandler::ExecuteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
106106
const String& command, const String& session, bool sandboxed)
107107
{
108108
namespace http = boost::beast::http;
@@ -176,7 +176,7 @@ bool ConsoleHandler::ExecuteScriptHelper(const HttpRequest& request, HttpRespons
176176
return true;
177177
}
178178

179-
bool ConsoleHandler::AutocompleteScriptHelper(const HttpRequest& request, HttpResponse& response,
179+
bool ConsoleHandler::AutocompleteScriptHelper(const HttpApiRequest& request, HttpApiResponse& response,
180180
const String& command, const String& session, bool sandboxed)
181181
{
182182
namespace http = boost::beast::http;

0 commit comments

Comments
 (0)