Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from an-tao/dev 

Modify the parser of HTTP requests
This commit is contained in:
An Tao 2019-06-27 13:28:36 +08:00 committed by GitHub
parent 16e1868607 eafe88cef1
commit 4c31a806fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
lib/src/HttpRequestParser.cc
View File

@ -37,9 +37,10 @@ void HttpRequestParser::shutdownConnection(HttpStatusCode code)
auto connPtr = _conn.lock();
if (connPtr)
{
connPtr->send(utils::formattedString("HTTP/1.1 %d %s\r\n\r\n",
code,
statusCodeToString(code).data()));
connPtr->send(utils::formattedString(
"HTTP/1.1 %d %s\r\nConnection: close\r\n\r\n",
code,
statusCodeToString(code).data()));
connPtr->shutdown();
}
}
@ -170,76 +171,77 @@ bool HttpRequestParser::parseRequest(MsgBuffer *buf)
LOG_TRACE << "content len=" << len;
if (!len.empty())
{
_request->_contentLen = atoi(len.c_str());
_request->_contentLen = std::stoull(len.c_str());
_state = HttpRequestParseState_ExpectBody;
auto &expect = _request->getHeaderBy("expect");
if (expect == "100-continue" &&
_request->getVersion() >= HttpRequest::kHttp11)
{
if (_request->_contentLen == 0)
{
buf->retrieveAll();
shutdownConnection(k400BadRequest);
return false;
}
// rfc2616-8.2.3
auto connPtr = _conn.lock();
if (connPtr)
{
auto resp = HttpResponse::newHttpResponse();
if (_request->_contentLen >
HttpAppFrameworkImpl::instance()
.getClientMaxBodySize())
{
resp->setStatusCode(
k413RequestEntityTooLarge);
auto httpString =
std::dynamic_pointer_cast<
HttpResponseImpl>(resp)
->renderToString();
reset();
connPtr->send(httpString);
}
else
{
resp->setStatusCode(k100Continue);
auto httpString =
std::dynamic_pointer_cast<
HttpResponseImpl>(resp)
->renderToString();
connPtr->send(httpString);
}
}
}
else if (!expect.empty())
{
LOG_WARN << "417ExpectationFailed for \"" << expect
<< "\"";
auto connPtr = _conn.lock();
if (connPtr)
{
buf->retrieveAll();
shutdownConnection(k417ExpectationFailed);
return false;
}
}
else if (_request->_contentLen >
HttpAppFrameworkImpl::instance()
.getClientMaxBodySize())
{
buf->retrieveAll();
shutdownConnection(k413RequestEntityTooLarge);
return false;
}
_request->reserveBodySize();
}
else
if (_request->_contentLen == 0)
{
_state = HttpRequestParseState_GotAll;
_requestsCounter++;
hasMore = false;
}
auto &expect = _request->getHeaderBy("expect");
if (expect == "100-continue" &&
_request->getVersion() >= HttpRequest::kHttp11)
{
if (_request->_contentLen == 0)
{
buf->retrieveAll();
shutdownConnection(k400BadRequest);
return false;
}
// rfc2616-8.2.3
auto connPtr = _conn.lock();
if (connPtr)
{
auto resp = HttpResponse::newHttpResponse();
if (_request->_contentLen >
HttpAppFrameworkImpl::instance()
.getClientMaxBodySize())
{
resp->setStatusCode(k413RequestEntityTooLarge);
auto httpString =
std::dynamic_pointer_cast<HttpResponseImpl>(
resp)
->renderToString();
reset();
connPtr->send(httpString);
}
else
{
resp->setStatusCode(k100Continue);
auto httpString =
std::dynamic_pointer_cast<HttpResponseImpl>(
resp)
->renderToString();
connPtr->send(httpString);
}
}
}
else if (!expect.empty())
{
LOG_WARN << "417ExpectationFailed for \"" << expect
<< "\"";
auto connPtr = _conn.lock();
if (connPtr)
{
buf->retrieveAll();
shutdownConnection(k417ExpectationFailed);
return false;
}
}
else if (_request->_contentLen >
HttpAppFrameworkImpl::instance()
.getClientMaxBodySize())
{
buf->retrieveAll();
shutdownConnection(k413RequestEntityTooLarge);
return false;
}
_request->reserveBodySize();
}
buf->retrieveUntil(crlf + 2);
}
else

3
lib/src/Utilities.cc
View File

@ -648,8 +648,7 @@ trantor::Date getHttpDate(const std::string &httpFullDateString)
}
std::string formattedString(const char *format, ...)
{
std::string strBuffer;
strBuffer.resize(1024);
std::string strBuffer(128, 0);
va_list ap, backup_ap;
va_start(ap, format);
va_copy(backup_ap, ap);