feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Parser body_limit is optional (API Change):

Browse Source 
API Changes:

The signature of basic_parser<>::body_limit(n) has changed. It now accepts an
optional std::uint64_t. The caller may indicate that no body limit is required
by calling body_limit(boost::none). The default limits remain in place in order
to maintain 'safe by default' behaviour.

closes #1897
closes #1965
This commit is contained in:
Richard Hodges
2020-05-29 20:28:22 +02:00
parent d7f1426f34
commit 0fdf9cb4df
5 changed files with 151 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/beast/http/basic_parser.hpp
+6 -4
View File
@@ -69,8 +69,9 @@ template<bool isRequest>
class basic_parser
: private detail::basic_parser_base
{
std::uint64_t body_limit_ =
default_body_limit(is_request{}); // max payload body
boost::optional<std::uint64_t>
body_limit_ =
default_body_limit(is_request{}); // max payload body
std::uint64_t len_ = 0; // size of chunk or body
std::uint64_t len0_ = 0; // content length if known
std::unique_ptr<char[]> buf_; // temp storage
@@ -289,10 +290,11 @@ public:
The default limit is 1MB for requests and 8MB for responses.
@param v The payload body limit to set
@param v An optional integral value representing the body limit.
If this is equal to `boost::none`, then the body limit is disabled.
*/
void
body_limit(std::uint64_t v)
body_limit(boost::optional<std::uint64_t> v)
{
body_limit_ = v;
}
include/boost/beast/http/impl/basic_parser.ipp
+14 -8
View File
@@ -573,12 +573,15 @@ basic_parser<isRequest>::
parse_body_to_eof(char const*& p,
std::size_t n, error_code& ec)
{
if(n > body_limit_)
if(body_limit_.has_value())
{
ec = error::body_limit;
return;
if (n > *body_limit_)
{
ec = error::body_limit;
return;
}
*body_limit_ -= n;
}
body_limit_ = body_limit_ - n;
ec = {};
n = this->on_body_impl(string_view{p, n}, ec);
p += n;
@@ -648,12 +651,15 @@ parse_chunk_header(char const*& p0,
}
if(size != 0)
{
if(size > body_limit_)
if (body_limit_.has_value())
{
ec = error::body_limit;
return;
if (size > *body_limit_)
{
ec = error::body_limit;
return;
}
*body_limit_ -= size;
}
body_limit_ -= size;
auto const start = p;
parse_chunk_extensions(p, pend, ec);
if(ec)