tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite error handling in HttpServerConnection#EnsureValidHeaders()

Browse Source 
Throwing local exceptions unnecessarily pollutes the exception
stack with immediate unwinding. Avoid this pattern at all cost within
Boost.Coroutines. MSVC may handle exceptions differently and cause
problems with stack unwinding.

refs #7431
refs #7351
This commit is contained in:
Michael Friedrich 2019-09-06 14:19:53 +02:00
parent 5aa5ab956d
commit c5aa978912
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/remote/httpserverconnection.cpp
View File

@ -146,43 +146,37 @@ bool EnsureValidHeaders(
{ {
namespace http = boost::beast::http; namespace http = boost::beast::http;
bool httpError = true; bool httpError = false;
String errorMsg;
try { boost::system::error_code ec;
boost::system::error_code ec;
http::async_read_header(stream, buf, parser, yc[ec]); http::async_read_header(stream, buf, parser, yc[ec]);
if (ec) { if (ec) {
/** errorMsg = ec.message();
* Unfortunately there's no way to tell an HTTP protocol error httpError = true;
* from an error on a lower layer: }
*
* <https://github.com/boostorg/beast/issues/643>
*/
throw std::invalid_argument(ec.message());
}
httpError = false; switch (parser.get().version()) {
case 10:
case 11:
break;
default:
errorMsg = "Unsupported HTTP version";
}
switch (parser.get().version()) { if (!errorMsg.IsEmpty() || httpError) {
case 10:
case 11:
break;
default:
throw std::invalid_argument("Unsupported HTTP version");
}
} catch (const std::invalid_argument& ex) {
response.result(http::status::bad_request); response.result(http::status::bad_request);
if (!httpError && parser.get()[http::field::accept] == "application/json") { if (!httpError && parser.get()[http::field::accept] == "application/json") {
HttpUtility::SendJsonBody(response, nullptr, new Dictionary({ HttpUtility::SendJsonBody(response, nullptr, new Dictionary({
{ "error", 400 }, { "error", 400 },
{ "status", String("Bad Request: ") + ex.what() } { "status", String("Bad Request: ") + errorMsg }
})); }));
} else { } else {
response.set(http::field::content_type, "text/html"); response.set(http::field::content_type, "text/html");
response.body() = String("<h1>Bad Request</h1><p><pre>") + ex.what() + "</pre></p>"; response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>";
response.set(http::field::content_length, response.body().size()); response.set(http::field::content_length, response.body().size());
} }