tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7486 from Icinga/bugfix/http-header-error-handling 

Rewrite error handling in HttpServerConnection#EnsureValidHeaders()
This commit is contained in:
Michael Friedrich 2019-09-09 11:40:44 +02:00 committed by GitHub
parent 5aa5ab956d c5aa978912
commit 613925813f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
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) {
/**
* Unfortunately there's no way to tell an HTTP protocol error
* from an error on a lower layer:
*
* <https://github.com/boostorg/beast/issues/643>
*/
throw std::invalid_argument(ec.message());
}
if (ec) {
errorMsg = ec.message();
httpError = true;
}
httpError = false;
switch (parser.get().version()) {
case 10:
case 11:
break;
default:
errorMsg = "Unsupported HTTP version";
}
switch (parser.get().version()) {
case 10:
case 11:
break;
default:
throw std::invalid_argument("Unsupported HTTP version");
}
} catch (const std::invalid_argument& ex) {
if (!errorMsg.IsEmpty() || httpError) {
response.result(http::status::bad_request);
if (!httpError && parser.get()[http::field::accept] == "application/json") {
HttpUtility::SendJsonBody(response, nullptr, new Dictionary({
{ "error", 400 },
{ "status", String("Bad Request: ") + ex.what() }
{ "status", String("Bad Request: ") + errorMsg }
}));
} else {
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());
}