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

Better treatment of SSL short reads:

Browse Source 
fix #38

This improves the behavior when encountering a short read:

* Any stream error encountered during a read is converting into
  `http::error::partial_message` if some data was received but
  the message is incomplete.

* Examples squelch SSL short read errors from the logs.
This commit is contained in:
Vinnie Falco
2019-02-23 08:56:59 -08:00
parent d4dddec1c0
commit 094f5ec5cb
11 changed files with 124 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/beast/http/impl/read.hpp
+11 -1
View File
@@ -43,7 +43,7 @@ parse_until(
{
if(parser.got_some())
{
// caller sees EOF on next read
// Caller sees EOF on next read
ec = {};
parser.put_eof(ec);
BOOST_ASSERT(ec || parser.is_done());
@@ -55,7 +55,17 @@ parse_until(
return 0;
}
if(ec)
{
// Upgrade the error if we have a partial message.
// This causes SSL short reads (and every other error)
// to be converted into something else, allowing the
// caller to distinguish an SSL short read which
// represents a safe connection closure, versus
// a closure with data loss.
if(parser.got_some() && ! parser.is_done())
ec = error::partial_message;
return 0;
}
if(parser.is_done())
return 0;
if(buffer.size() > 0)
include/boost/beast/http/impl/write.hpp
+1
View File
@@ -105,6 +105,7 @@ public:
// What else could it be?
BOOST_ASSERT(sr_.is_done());
}
return net::post(
s_.get_executor(),
beast::bind_front_handler(
include/boost/beast/websocket/impl/ssl.hpp
+3 -3
View File
@@ -18,10 +18,10 @@ namespace websocket {
/*
See
http://stackoverflow.com/questions/32046034/what-is-the-proper-way-to-securely-disconnect-an-asio-ssl-socket/32054476#32054476
See
http://stackoverflow.com/questions/32046034/what-is-the-proper-way-to-securely-disconnect-an-asio-ssl-socket/32054476#32054476
Behavior of ssl::stream regarding close_
Behavior of ssl::stream regarding close_notify
If the remote host calls async_shutdown then the
local host's async_read will complete with eof.