8000 Handle corrupt HTTP/1.1 headers more gracefully by neunhoef · Pull Request #21838 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Handle corrupt HTTP/1.1 headers more gracefully #21838

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
merged 2 commits into from
Jul 3, 2025
Merged

Handle corrupt HTTP/1.1 headers more gracefully #21838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf8949c
Handle corrupt headers in HttpCommTask.
neunhoef Jul 3, 2025
5c6a1ed
CHANGELOG.
neunhoef Jul 3, 2025
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
Next Next commit
Handle corrupt headers in HttpCommTask.
  • Loading branch information
@neunhoef
neunhoef committed Jul 3, 2025
commit bf8949c899aa310db0835f72cb9d2d011cb6e1ad
22 changes: 21 additions & 1 deletion arangod/GeneralServer/HttpCommTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ int HttpCommTask<T>::on_message_began(llhttp_t* p) try {
me->_shouldKeepAlive = false;
me->_messageDone = false;
me->_urlCorrupt = false;
me->_headerCorrupt = false;

// acquire a new statistics entry for the request
me->acquireRequestStatistics(1UL).SET_READ_START(TRI_microtime());
Expand Down Expand Up @@ -257,10 +258,12 @@ int HttpCommTask<T>::on_message_complete(llhttp_t* p) {
me->_messageDone = true;
me->_request->parseUrl(me->_url.data(), me->_url.size());
me->_urlCorrupt = false;
me->_headerCorrupt = false;
} catch (...) {
// the caller of this function is a C function, which doesn't know
// exceptions. we must not let an exception escape from here.
me->_urlCorrupt = true;
me->_headerCorrupt = false;
}
return HPE_PAUSED;
}
Expand All @@ -272,7 +275,8 @@ HttpCommTask<T>::HttpCommTask(GeneralServer& server, ConnectionInfo info,
_lastHeaderWasValue(false),
_shouldKeepAlive(false),
_messageDone(false),
_urlCorrupt(false) {
_urlCorrupt(false),
_headerCorrupt(false) {
this->_connectionStatistics.SET_HTTP();

// initialize http parsing code
Expand Down Expand Up @@ -327,6 +331,9 @@ bool HttpCommTask<T>::readCallback(asio_ns::error_code ec) {

err = llhttp_execute(&_parser, data, datasize);
if (err != HPE_OK) {
if (err == HPE_INVALID_HEADER_TOKEN) {
_headerCorrupt = true;
}
ptrdiff_t diff = llhttp_get_error_pos(&_parser) - data;
TRI_ASSERT(diff >= 0);
nparsed += static_cast<size_t>(diff);
Expand All @@ -343,6 +350,18 @@ bool HttpCommTask<T>::readCallback(asio_ns::error_code ec) {
// And count it in the statistics:
this->requestStatistics(1UL).ADD_RECEIVED_BYTES(nparsed);

if (_headerCorrupt) {
LOG_TOPIC("33324", WARN, Logger::REQUESTS)
<< "request failed because of a corrupt header";
auto msgId = _request->messageId();
auto respContentType = _request->contentTypeResponse();
this->sendErrorResponse(rest::ResponseCode::BAD, respContentType, msgId,
TRI_ERROR_HTTP_BAD_PARAMETER,
"some header is corrupt");
_urlCorrupt = false;
_headerCorrupt = false;
return false; // stop read loop
}
if (_messageDone) {
TRI_ASSERT(err == HPE_PAUSED);
_messageDone = false;
Expand All @@ -357,6 +376,7 @@ bool HttpCommTask<T>::readCallback(asio_ns::error_code ec) {
processRequest();
}
_urlCorrupt = false;
_headerCorrupt = false;
return false; // stop read loop
}

Expand Down
1 change: 1 addition & 0 deletions arangod/GeneralServer/HttpCommTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class HttpCommTask final : public GeneralCommTask<T> {
bool _shouldKeepAlive; /// keep connection open
bool _messageDone;
bool _urlCorrupt;
bool _headerCorrupt;
};
} // namespace rest
} // namespace arangodb
0