2016-04-30 13:00:33 -04:00
|
|
|
//
|
2017-07-24 09:42:36 -07:00
|
|
|
// Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
|
2016-04-30 13:00:33 -04:00
|
|
|
//
|
|
|
|
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
|
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
//
|
2017-07-20 13:40:34 -07:00
|
|
|
// Official repository: https://github.com/boostorg/beast
|
|
|
|
//
|
2016-04-30 13:00:33 -04:00
|
|
|
|
|
|
|
// Test that header file is self-contained.
|
2017-07-20 13:40:34 -07:00
|
|
|
#include <boost/beast/websocket/stream.hpp>
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2016-08-26 09:11:06 -04:00
|
|
|
#include "websocket_sync_echo_server.hpp"
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2017-07-20 13:40:34 -07:00
|
|
|
#include <boost/beast/core/ostream.hpp>
|
|
|
|
#include <boost/beast/core/multi_buffer.hpp>
|
2017-08-01 20:15:07 -07:00
|
|
|
#include <boost/beast/test/stream.hpp>
|
2017-07-20 13:40:34 -07:00
|
|
|
#include <boost/beast/test/yield_to.hpp>
|
|
|
|
#include <boost/beast/unit_test/suite.hpp>
|
2016-04-30 13:00:33 -04:00
|
|
|
#include <boost/optional.hpp>
|
2017-08-01 20:15:07 -07:00
|
|
|
#include <memory>
|
2016-05-15 16:22:25 -04:00
|
|
|
#include <mutex>
|
|
|
|
#include <condition_variable>
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2017-07-20 13:40:34 -07:00
|
|
|
namespace boost {
|
2016-04-30 13:00:33 -04:00
|
|
|
namespace beast {
|
|
|
|
namespace websocket {
|
|
|
|
|
2016-05-04 17:27:50 -04:00
|
|
|
class stream_test
|
2016-05-06 19:14:17 -04:00
|
|
|
: public beast::unit_test::suite
|
2016-05-04 17:27:50 -04:00
|
|
|
, public test::enable_yield_to
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
|
|
|
public:
|
2016-05-15 16:22:25 -04:00
|
|
|
using self = stream_test;
|
2016-04-30 13:00:33 -04:00
|
|
|
using endpoint_type = boost::asio::ip::tcp::endpoint;
|
|
|
|
using address_type = boost::asio::ip::address;
|
|
|
|
using socket_type = boost::asio::ip::tcp::socket;
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
|
|
|
class asyncEchoServer
|
|
|
|
: public std::enable_shared_from_this<asyncEchoServer>
|
|
|
|
{
|
|
|
|
std::ostream& log_;
|
|
|
|
websocket::stream<test::stream> ws_;
|
|
|
|
boost::asio::io_service::strand strand_;
|
|
|
|
static_buffer<2001> buffer_;
|
|
|
|
|
|
|
|
public:
|
|
|
|
asyncEchoServer(
|
|
|
|
std::ostream& log,
|
|
|
|
test::stream stream)
|
|
|
|
: log_(log)
|
|
|
|
, ws_(std::move(stream))
|
|
|
|
, strand_(ws_.get_io_service())
|
|
|
|
{
|
|
|
|
permessage_deflate pmd;
|
|
|
|
pmd.client_enable = true;
|
|
|
|
pmd.server_enable = true;
|
|
|
|
ws_.set_option(pmd);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
run()
|
|
|
|
{
|
|
|
|
ws_.async_accept(strand_.wrap(std::bind(
|
|
|
|
&asyncEchoServer::on_accept,
|
|
|
|
shared_from_this(),
|
|
|
|
std::placeholders::_1)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
on_accept(error_code ec)
|
|
|
|
{
|
|
|
|
if(ec)
|
|
|
|
return fail(ec);
|
|
|
|
do_read();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
do_read()
|
|
|
|
{
|
|
|
|
ws_.async_read(buffer_,
|
|
|
|
strand_.wrap(std::bind(
|
|
|
|
&asyncEchoServer::on_read,
|
|
|
|
shared_from_this(),
|
|
|
|
std::placeholders::_1)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
on_read(error_code ec)
|
|
|
|
{
|
|
|
|
if(ec)
|
|
|
|
return fail(ec);
|
|
|
|
ws_.text(ws_.got_text());
|
|
|
|
ws_.async_write(buffer_.data(),
|
|
|
|
strand_.wrap(std::bind(
|
|
|
|
&asyncEchoServer::on_write,
|
|
|
|
this->shared_from_this(),
|
|
|
|
std::placeholders::_1)));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
on_write(error_code ec)
|
|
|
|
{
|
|
|
|
if(ec)
|
|
|
|
return fail(ec);
|
|
|
|
buffer_.consume(buffer_.size());
|
|
|
|
do_read();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
fail(error_code ec)
|
|
|
|
{
|
|
|
|
if( ec != error::closed &&
|
|
|
|
ec != error::failed &&
|
|
|
|
ec != boost::asio::error::eof)
|
|
|
|
log_ <<
|
|
|
|
"asyncEchoServer: " <<
|
|
|
|
ec.message() <<
|
|
|
|
std::endl;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
void
|
|
|
|
echoServer(test::stream& stream)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
websocket::stream<test::stream&> ws{stream};
|
|
|
|
permessage_deflate pmd;
|
|
|
|
pmd.client_enable = true;
|
|
|
|
pmd.server_enable = true;
|
|
|
|
ws.set_option(pmd);
|
|
|
|
ws.accept();
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
static_buffer<2001> buffer;
|
|
|
|
ws.read(buffer);
|
|
|
|
ws.text(ws.got_text());
|
|
|
|
ws.write(buffer.data());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
if( se.code() != error::closed &&
|
|
|
|
se.code() != error::failed &&
|
|
|
|
se.code() != boost::asio::error::eof)
|
|
|
|
log << "echoServer: " << se.code().message() << std::endl;
|
|
|
|
}
|
|
|
|
catch(std::exception const& e)
|
|
|
|
{
|
|
|
|
log << "echoServer: " << e.what() << std::endl;
|
|
|
|
}
|
|
|
|
}
|
2017-08-17 22:38:50 -07:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
void
|
|
|
|
launchEchoServer(test::stream stream)
|
|
|
|
{
|
|
|
|
std::thread{std::bind(
|
|
|
|
&stream_test::echoServer,
|
|
|
|
this,
|
|
|
|
std::move(stream))}.detach();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
launchEchoServerAsync(test::stream stream)
|
|
|
|
{
|
|
|
|
std::make_shared<asyncEchoServer>(
|
|
|
|
log, std::move(stream))->run();
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
|
|
|
using ws_stream_type =
|
|
|
|
websocket::stream<test::stream&>;
|
|
|
|
|
|
|
|
template<class Test>
|
|
|
|
void
|
|
|
|
doTestLoop(Test const& f)
|
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
// This number has to be high for the
|
|
|
|
// test that writes the large buffer.
|
|
|
|
static std::size_t constexpr limit = 1000;
|
2017-08-01 20:15:07 -07:00
|
|
|
std::size_t n;
|
|
|
|
for(n = 0; n <= limit; ++n)
|
|
|
|
{
|
|
|
|
test::fail_counter fc{n};
|
|
|
|
test::stream ts{ios_, fc};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
f(ts);
|
|
|
|
|
|
|
|
// Made it through
|
|
|
|
ts.close();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == test::error::fail_error,
|
|
|
|
se.code().message());
|
|
|
|
ts.close();
|
|
|
|
}
|
|
|
|
catch(std::exception const& e)
|
|
|
|
{
|
|
|
|
fail(e.what(), __FILE__, __LINE__);
|
|
|
|
ts.close();
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
BEAST_EXPECT(n < limit);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class Wrap, class Launch, class Test>
|
|
|
|
void
|
|
|
|
doTest(
|
|
|
|
Wrap const& w,
|
|
|
|
permessage_deflate const& pmd,
|
|
|
|
Launch const& launch,
|
|
|
|
Test const& f)
|
|
|
|
{
|
|
|
|
doTestLoop(
|
|
|
|
[&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
ws.set_option(pmd);
|
|
|
|
launch(ts.remote());
|
|
|
|
w.handshake(ws, "localhost", "/");
|
|
|
|
f(ws);
|
|
|
|
});
|
2017-08-12 15:03:39 -07:00
|
|
|
#if 0
|
|
|
|
// Lowering the read_size takes a disproportionate
|
|
|
|
// amount of time for the gains in coverage .
|
|
|
|
doTestLoop(
|
|
|
|
[&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
ts.read_size(45);
|
|
|
|
ws.set_option(pmd);
|
|
|
|
launch(ts.remote());
|
|
|
|
w.handshake(ws, "localhost", "/");
|
|
|
|
f(ws);
|
|
|
|
});
|
|
|
|
#endif
|
2017-08-01 20:15:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
template<class Wrap>
|
|
|
|
void
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(
|
2017-08-01 20:15:07 -07:00
|
|
|
Wrap const& w,
|
|
|
|
ws_stream_type& ws,
|
|
|
|
close_code code)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
multi_buffer b;
|
|
|
|
w.read(ws, b);
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
if(se.code() != error::closed)
|
2017-08-01 20:15:07 -07:00
|
|
|
throw;
|
|
|
|
BEAST_EXPECT(
|
|
|
|
ws.reason().code == code);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
template<class Wrap>
|
|
|
|
void
|
|
|
|
doFailTest(
|
|
|
|
Wrap const& w,
|
|
|
|
ws_stream_type& ws,
|
|
|
|
error_code ev)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
multi_buffer b;
|
|
|
|
w.read(ws, b);
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
if(se.code() != ev)
|
|
|
|
throw;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-05-04 05:01:50 -07:00
|
|
|
template<class ConstBufferSequence>
|
|
|
|
static
|
|
|
|
std::string
|
|
|
|
to_string(ConstBufferSequence const& bs)
|
|
|
|
{
|
2017-07-21 08:55:25 -07:00
|
|
|
using boost::asio::buffer_cast;
|
|
|
|
using boost::asio::buffer_size;
|
|
|
|
std::string s;
|
|
|
|
s.reserve(buffer_size(bs));
|
|
|
|
for(boost::asio::const_buffer b : bs)
|
|
|
|
s.append(buffer_cast<char const*>(b),
|
|
|
|
buffer_size(b));
|
|
|
|
return s;
|
2017-05-04 05:01:50 -07:00
|
|
|
}
|
|
|
|
|
2016-05-15 16:22:25 -04:00
|
|
|
template<std::size_t N>
|
|
|
|
class cbuf_helper
|
|
|
|
{
|
|
|
|
std::array<std::uint8_t, N> v_;
|
|
|
|
boost::asio::const_buffer cb_;
|
|
|
|
|
|
|
|
public:
|
|
|
|
using value_type = decltype(cb_);
|
|
|
|
using const_iterator = value_type const*;
|
|
|
|
|
|
|
|
template<class... Vn>
|
|
|
|
explicit
|
|
|
|
cbuf_helper(Vn... vn)
|
|
|
|
: v_({{ static_cast<std::uint8_t>(vn)... }})
|
|
|
|
, cb_(v_.data(), v_.size())
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-05-15 16:22:25 -04:00
|
|
|
const_iterator
|
|
|
|
begin() const
|
2016-05-04 17:27:50 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
return &cb_;
|
2016-05-04 17:27:50 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
|
|
|
|
const_iterator
|
|
|
|
end() const
|
2016-05-04 17:27:50 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
return begin()+1;
|
2016-05-04 17:27:50 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
template<class... Vn>
|
|
|
|
cbuf_helper<sizeof...(Vn)>
|
|
|
|
cbuf(Vn... vn)
|
|
|
|
{
|
|
|
|
return cbuf_helper<sizeof...(Vn)>(vn...);
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
template<std::size_t N>
|
|
|
|
static
|
|
|
|
boost::asio::const_buffers_1
|
2016-05-15 16:22:25 -04:00
|
|
|
sbuf(const char (&s)[N])
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
|
|
|
return boost::asio::const_buffers_1(&s[0], N-1);
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
template<
|
|
|
|
class DynamicBuffer,
|
|
|
|
class ConstBufferSequence>
|
|
|
|
static
|
|
|
|
void
|
|
|
|
put(
|
|
|
|
DynamicBuffer& buffer,
|
|
|
|
ConstBufferSequence const& buffers)
|
|
|
|
{
|
|
|
|
using boost::asio::buffer_copy;
|
|
|
|
using boost::asio::buffer_size;
|
|
|
|
buffer.commit(buffer_copy(
|
|
|
|
buffer.prepare(buffer_size(buffers)),
|
|
|
|
buffers));
|
|
|
|
}
|
|
|
|
|
2016-05-15 16:22:25 -04:00
|
|
|
template<class Pred>
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
run_until(boost::asio::io_service& ios,
|
|
|
|
std::size_t limit, Pred&& pred)
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
for(std::size_t i = 0; i < limit; ++i)
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
if(pred())
|
|
|
|
return true;
|
|
|
|
ios.run_one();
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
struct SyncClient
|
|
|
|
{
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
accept(stream<NextLayer>& ws) const
|
|
|
|
{
|
|
|
|
ws.accept();
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Buffers>
|
2017-05-08 12:41:45 -07:00
|
|
|
typename std::enable_if<
|
|
|
|
! http::detail::is_header<Buffers>::value>::type
|
2017-04-25 10:12:43 -07:00
|
|
|
accept(stream<NextLayer>& ws,
|
|
|
|
Buffers const& buffers) const
|
|
|
|
{
|
|
|
|
ws.accept(buffers);
|
|
|
|
}
|
|
|
|
|
2017-07-14 13:00:09 -07:00
|
|
|
template<class NextLayer>
|
2017-04-25 10:12:43 -07:00
|
|
|
void
|
|
|
|
accept(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
|
|
|
ws.accept(req);
|
|
|
|
}
|
|
|
|
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
template<class NextLayer, class Decorator>
|
|
|
|
void
|
|
|
|
accept_ex(stream<NextLayer>& ws,
|
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.accept_ex(d);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer,
|
|
|
|
class Buffers, class Decorator>
|
2017-05-08 12:41:45 -07:00
|
|
|
typename std::enable_if<
|
|
|
|
! http::detail::is_header<Buffers>::value>::type
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
accept_ex(stream<NextLayer>& ws,
|
|
|
|
Buffers const& buffers,
|
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.accept_ex(buffers, d);
|
|
|
|
}
|
|
|
|
|
2017-07-14 13:00:09 -07:00
|
|
|
template<class NextLayer, class Decorator>
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
void
|
|
|
|
accept_ex(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.accept_ex(req, d);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer,
|
2017-07-14 13:00:09 -07:00
|
|
|
class Buffers, class Decorator>
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
void
|
|
|
|
accept_ex(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Buffers const& buffers,
|
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.accept_ex(req, buffers, d);
|
|
|
|
}
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
handshake(stream<NextLayer>& ws,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
|
|
|
ws.handshake(uri, path);
|
|
|
|
}
|
|
|
|
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
handshake(stream<NextLayer>& ws,
|
|
|
|
response_type& res,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path) const
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
|
|
|
ws.handshake(res, uri, path);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Decorator>
|
|
|
|
void
|
|
|
|
handshake_ex(stream<NextLayer>& ws,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.handshake_ex(uri, path, d);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Decorator>
|
|
|
|
void
|
|
|
|
handshake_ex(stream<NextLayer>& ws,
|
|
|
|
response_type& res,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
ws.handshake_ex(res, uri, path, d);
|
|
|
|
}
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
ping(stream<NextLayer>& ws,
|
|
|
|
ping_data const& payload) const
|
|
|
|
{
|
|
|
|
ws.ping(payload);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
pong(stream<NextLayer>& ws,
|
|
|
|
ping_data const& payload) const
|
|
|
|
{
|
|
|
|
ws.pong(payload);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
close(stream<NextLayer>& ws,
|
|
|
|
close_reason const& cr) const
|
|
|
|
{
|
|
|
|
ws.close(cr);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class DynamicBuffer>
|
2017-07-25 08:50:58 -07:00
|
|
|
std::size_t
|
2017-04-25 10:12:43 -07:00
|
|
|
read(stream<NextLayer>& ws,
|
2017-06-08 19:55:42 -07:00
|
|
|
DynamicBuffer& buffer) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
2017-07-15 17:05:24 -07:00
|
|
|
return ws.read(buffer);
|
2017-04-25 10:12:43 -07:00
|
|
|
}
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class DynamicBuffer>
|
|
|
|
std::size_t
|
|
|
|
read_some(stream<NextLayer>& ws,
|
|
|
|
std::size_t limit,
|
|
|
|
DynamicBuffer& buffer) const
|
|
|
|
{
|
|
|
|
return ws.read_some(buffer, limit);
|
|
|
|
}
|
|
|
|
|
2017-08-03 04:21:24 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class MutableBufferSequence>
|
|
|
|
std::size_t
|
|
|
|
read_some(stream<NextLayer>& ws,
|
|
|
|
MutableBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
return ws.read_some(buffers);
|
|
|
|
}
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
|
|
|
write(stream<NextLayer>& ws,
|
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
ws.write(buffers);
|
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
2017-07-15 17:05:24 -07:00
|
|
|
write_some(stream<NextLayer>& ws, bool fin,
|
2017-04-25 10:12:43 -07:00
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
2017-07-15 17:05:24 -07:00
|
|
|
ws.write_some(fin, buffers);
|
2017-04-25 10:12:43 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
|
|
|
write_raw(stream<NextLayer>& ws,
|
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
boost::asio::write(
|
|
|
|
ws.next_layer(), buffers);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
class AsyncClient
|
|
|
|
{
|
|
|
|
yield_context& yield_;
|
|
|
|
|
|
|
|
public:
|
|
|
|
explicit
|
|
|
|
AsyncClient(yield_context& yield)
|
|
|
|
: yield_(yield)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
accept(stream<NextLayer>& ws) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept(yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Buffers>
|
2017-05-08 12:41:45 -07:00
|
|
|
typename std::enable_if<
|
|
|
|
! http::detail::is_header<Buffers>::value>::type
|
2017-04-25 10:12:43 -07:00
|
|
|
accept(stream<NextLayer>& ws,
|
|
|
|
Buffers const& buffers) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept(buffers, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
2017-07-14 13:00:09 -07:00
|
|
|
template<class NextLayer>
|
2017-04-25 10:12:43 -07:00
|
|
|
void
|
|
|
|
accept(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept(req, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
class Decorator>
|
2017-04-25 10:12:43 -07:00
|
|
|
void
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
accept_ex(stream<NextLayer>& ws,
|
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept_ex(d, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer,
|
|
|
|
class Buffers, class Decorator>
|
2017-05-08 12:41:45 -07:00
|
|
|
typename std::enable_if<
|
|
|
|
! http::detail::is_header<Buffers>::value>::type
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
accept_ex(stream<NextLayer>& ws,
|
|
|
|
Buffers const& buffers,
|
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept_ex(buffers, d, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
2017-07-14 13:00:09 -07:00
|
|
|
template<class NextLayer, class Decorator>
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
void
|
|
|
|
accept_ex(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const& d) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_accept_ex(req, d, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
2017-07-14 13:00:09 -07:00
|
|
|
template<class NextLayer,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
class Buffers, class Decorator>
|
|
|
|
void
|
|
|
|
accept_ex(stream<NextLayer>& ws,
|
2017-07-14 13:00:09 -07:00
|
|
|
http::request<http::empty_body> const& req,
|
2017-04-25 10:12:43 -07:00
|
|
|
Buffers const& buffers,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const& d) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
error_code ec;
|
|
|
|
ws.async_accept_ex(
|
|
|
|
req, buffers, d, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
2017-04-25 10:12:43 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
handshake(stream<NextLayer>& ws,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
|
|
|
error_code ec;
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
ws.async_handshake(
|
|
|
|
uri, path, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
handshake(stream<NextLayer>& ws,
|
|
|
|
response_type& res,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path) const
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_handshake(
|
|
|
|
res, uri, path, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Decorator>
|
|
|
|
void
|
|
|
|
handshake_ex(stream<NextLayer>& ws,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const &d) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_handshake_ex(
|
|
|
|
uri, path, d, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer, class Decorator>
|
|
|
|
void
|
|
|
|
handshake_ex(stream<NextLayer>& ws,
|
|
|
|
response_type& res,
|
2017-06-04 10:52:28 -07:00
|
|
|
string_view uri,
|
|
|
|
string_view path,
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
Decorator const &d) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_handshake_ex(
|
|
|
|
res, uri, path, d, yield_[ec]);
|
2017-04-25 10:12:43 -07:00
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
ping(stream<NextLayer>& ws,
|
|
|
|
ping_data const& payload) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_ping(payload, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
pong(stream<NextLayer>& ws,
|
|
|
|
ping_data const& payload) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_pong(payload, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<class NextLayer>
|
|
|
|
void
|
|
|
|
close(stream<NextLayer>& ws,
|
|
|
|
close_reason const& cr) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_close(cr, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class DynamicBuffer>
|
2017-07-25 08:50:58 -07:00
|
|
|
std::size_t
|
2017-04-25 10:12:43 -07:00
|
|
|
read(stream<NextLayer>& ws,
|
2017-06-08 19:55:42 -07:00
|
|
|
DynamicBuffer& buffer) const
|
2017-04-25 10:12:43 -07:00
|
|
|
{
|
|
|
|
error_code ec;
|
2017-07-25 08:50:58 -07:00
|
|
|
auto const bytes_written =
|
|
|
|
ws.async_read(buffer, yield_[ec]);
|
2017-04-25 10:12:43 -07:00
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
2017-07-25 08:50:58 -07:00
|
|
|
return bytes_written;
|
2017-04-25 10:12:43 -07:00
|
|
|
}
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class DynamicBuffer>
|
|
|
|
std::size_t
|
|
|
|
read_some(stream<NextLayer>& ws,
|
|
|
|
std::size_t limit,
|
|
|
|
DynamicBuffer& buffer) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
auto const bytes_written =
|
|
|
|
ws.async_read_some(buffer, limit, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
return bytes_written;
|
|
|
|
}
|
|
|
|
|
2017-08-03 04:21:24 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class MutableBufferSequence>
|
|
|
|
std::size_t
|
|
|
|
read_some(stream<NextLayer>& ws,
|
|
|
|
MutableBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
auto const bytes_written =
|
|
|
|
ws.async_read_some(buffers, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
return bytes_written;
|
|
|
|
}
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
|
|
|
write(stream<NextLayer>& ws,
|
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
ws.async_write(buffers, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
2017-07-15 17:05:24 -07:00
|
|
|
write_some(stream<NextLayer>& ws, bool fin,
|
2017-04-25 10:12:43 -07:00
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
2017-07-15 17:05:24 -07:00
|
|
|
ws.async_write_some(fin, buffers, yield_[ec]);
|
2017-04-25 10:12:43 -07:00
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
|
|
|
|
template<
|
|
|
|
class NextLayer, class ConstBufferSequence>
|
|
|
|
void
|
|
|
|
write_raw(stream<NextLayer>& ws,
|
|
|
|
ConstBufferSequence const& buffers) const
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
boost::asio::async_write(
|
|
|
|
ws.next_layer(), buffers, yield_[ec]);
|
|
|
|
if(ec)
|
|
|
|
throw system_error{ec};
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-04-12 18:49:18 -07:00
|
|
|
void
|
|
|
|
testOptions()
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
stream<socket_type> ws(ios_);
|
2017-06-08 17:36:31 -07:00
|
|
|
ws.auto_fragment(true);
|
2017-06-08 18:27:32 -07:00
|
|
|
ws.write_buffer_size(2048);
|
2017-06-08 18:03:10 -07:00
|
|
|
ws.binary(false);
|
2017-06-08 18:22:25 -07:00
|
|
|
ws.read_message_max(1 * 1024 * 1024);
|
2016-05-15 16:22:25 -04:00
|
|
|
try
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2017-06-08 18:27:32 -07:00
|
|
|
ws.write_buffer_size(7);
|
2016-05-15 16:22:25 -04:00
|
|
|
fail();
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
catch(std::exception const&)
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
pass();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-04-25 10:12:43 -07:00
|
|
|
template<class Client>
|
|
|
|
void
|
2017-08-01 20:15:07 -07:00
|
|
|
doTestAccept(Client const& c)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
class res_decorator
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
bool& b_;
|
|
|
|
|
|
|
|
public:
|
|
|
|
res_decorator(res_decorator const&) = default;
|
|
|
|
|
|
|
|
explicit
|
|
|
|
res_decorator(bool& b)
|
|
|
|
: b_(b)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
operator()(response_type&) const
|
|
|
|
{
|
|
|
|
b_ = true;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
auto const big = []
|
|
|
|
{
|
|
|
|
std::string s;
|
|
|
|
s += "X1: " + std::string(2000, '*') + "\r\n";
|
|
|
|
return s;
|
|
|
|
}();
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in stream
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
ts.str(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n");
|
|
|
|
ts.read_size(20);
|
|
|
|
c.accept(ws);
|
|
|
|
// VFALCO validate contents of ws.next_layer().str?
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in stream, oversized
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"};
|
|
|
|
error_code ec = test::error::fail_error;
|
|
|
|
try
|
|
|
|
{
|
|
|
|
c.accept(ws);
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
// VFALCO Its the http error category...
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == http::error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in stream, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
ts.str(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n");
|
|
|
|
ts.read_size(20);
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, res_decorator{called});
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in stream, decorator, oversized
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, res_decorator{called});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
// VFALCO Its the http error category...
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == http::error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in buffers
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
c.accept(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
));
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in buffers, oversize
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
c.accept(ws, boost::asio::buffer(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"
|
|
|
|
));
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in buffers, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"),
|
|
|
|
res_decorator{called});
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in buffers, decorator, oversized
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, boost::asio::buffer(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"),
|
|
|
|
res_decorator{called});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in buffers and stream
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
ts.str(
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n");
|
|
|
|
ts.read_size(16);
|
|
|
|
c.accept(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
));
|
|
|
|
// VFALCO validate contents of ws.next_layer().str?
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in buffers and stream, oversized
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_,
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
c.accept(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
));
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == http::error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in buffers and stream, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
ts.str(
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n");
|
|
|
|
ts.read_size(16);
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"),
|
|
|
|
res_decorator{called});
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
|
|
|
|
2017-08-16 19:25:02 -07:00
|
|
|
// request in buffers and stream, decorator, oversize
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_,
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
+ big +
|
|
|
|
"\r\n"};
|
|
|
|
try
|
|
|
|
{
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, sbuf(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"),
|
|
|
|
res_decorator{called});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == http::error::buffer_overflow,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// request in message
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
request_type req;
|
|
|
|
req.method(http::verb::get);
|
|
|
|
req.target("/");
|
|
|
|
req.version = 11;
|
|
|
|
req.insert(http::field::host, "localhost");
|
|
|
|
req.insert(http::field::upgrade, "websocket");
|
|
|
|
req.insert(http::field::connection, "upgrade");
|
|
|
|
req.insert(http::field::sec_websocket_key, "dGhlIHNhbXBsZSBub25jZQ==");
|
|
|
|
req.insert(http::field::sec_websocket_version, "13");
|
|
|
|
c.accept(ws, req);
|
|
|
|
});
|
|
|
|
|
|
|
|
// request in message, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
request_type req;
|
|
|
|
req.method(http::verb::get);
|
|
|
|
req.target("/");
|
|
|
|
req.version = 11;
|
|
|
|
req.insert(http::field::host, "localhost");
|
|
|
|
req.insert(http::field::upgrade, "websocket");
|
|
|
|
req.insert(http::field::connection, "upgrade");
|
|
|
|
req.insert(http::field::sec_websocket_key, "dGhlIHNhbXBsZSBub25jZQ==");
|
|
|
|
req.insert(http::field::sec_websocket_version, "13");
|
|
|
|
bool called = false;
|
|
|
|
c.accept_ex(ws, req,
|
|
|
|
res_decorator{called});
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
|
|
|
|
|
|
|
// request in message, close frame in stream
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
request_type req;
|
|
|
|
req.method(http::verb::get);
|
|
|
|
req.target("/");
|
|
|
|
req.version = 11;
|
|
|
|
req.insert(http::field::host, "localhost");
|
|
|
|
req.insert(http::field::upgrade, "websocket");
|
|
|
|
req.insert(http::field::connection, "upgrade");
|
|
|
|
req.insert(http::field::sec_websocket_key, "dGhlIHNhbXBsZSBub25jZQ==");
|
|
|
|
req.insert(http::field::sec_websocket_version, "13");
|
|
|
|
ts.str("\x88\x82\xff\xff\xff\xff\xfc\x17");
|
|
|
|
c.accept(ws, req);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
static_buffer<1> b;
|
|
|
|
c.read(ws, b);
|
|
|
|
fail("success", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& e)
|
|
|
|
{
|
|
|
|
if(e.code() != websocket::error::closed)
|
|
|
|
throw;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
// failed handshake (missing Sec-WebSocket-Key)
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
ts.str(
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost\r\n"
|
|
|
|
"Upgrade: websocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n");
|
|
|
|
ts.read_size(20);
|
|
|
|
try
|
|
|
|
{
|
|
|
|
c.accept(ws);
|
|
|
|
fail("success", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& e)
|
|
|
|
{
|
|
|
|
if( e.code() !=
|
|
|
|
websocket::error::handshake_failed &&
|
|
|
|
e.code() !=
|
|
|
|
boost::asio::error::eof)
|
|
|
|
throw;
|
|
|
|
}
|
|
|
|
});
|
2017-08-16 19:25:02 -07:00
|
|
|
|
|
|
|
// Closed by client
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
ws.next_layer().remote().close();
|
|
|
|
try
|
|
|
|
{
|
|
|
|
c.accept(ws);
|
|
|
|
fail("success", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& e)
|
|
|
|
{
|
|
|
|
if(! BEAST_EXPECTS(
|
|
|
|
e.code() == error::closed,
|
|
|
|
e.code().message()))
|
|
|
|
throw;
|
|
|
|
}
|
|
|
|
}
|
2017-04-25 10:12:43 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
testAccept()
|
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
doTestAccept(SyncClient{});
|
|
|
|
|
|
|
|
yield_to([&](yield_context yield)
|
|
|
|
{
|
|
|
|
doTestAccept(AsyncClient{yield});
|
|
|
|
});
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
|
|
|
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-08-17 22:38:50 -07:00
|
|
|
template<class Wrap>
|
|
|
|
void
|
|
|
|
doTestClose(Wrap const& w)
|
|
|
|
{
|
|
|
|
permessage_deflate pmd;
|
|
|
|
pmd.client_enable = false;
|
|
|
|
pmd.server_enable = false;
|
|
|
|
|
|
|
|
auto const launch =
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServerAsync(std::move(stream));
|
|
|
|
};
|
|
|
|
|
|
|
|
// normal close
|
|
|
|
doTest(w, pmd, launch,
|
|
|
|
[&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
w.close(ws, {});
|
|
|
|
});
|
|
|
|
|
|
|
|
// double close
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
launch(ws.next_layer().remote());
|
|
|
|
w.handshake(ws, "localhost", "/");
|
|
|
|
w.close(ws, {});
|
|
|
|
try
|
|
|
|
{
|
|
|
|
w.close(ws, {});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == boost::asio::error::operation_aborted,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// drain a message after close
|
|
|
|
doTest(w, pmd, launch,
|
|
|
|
[&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.next_layer().str("\x81\x01\x2a");
|
|
|
|
w.close(ws, {});
|
|
|
|
});
|
|
|
|
|
|
|
|
// drain a big message after close
|
|
|
|
{
|
|
|
|
std::string s;
|
|
|
|
s = "\x81\x7e\x10\x01";
|
|
|
|
s.append(4097, '*');
|
|
|
|
doTest(w, pmd, launch,
|
|
|
|
[&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.next_layer().str(s);
|
|
|
|
w.close(ws, {});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// drain a ping after close
|
|
|
|
doTest(w, pmd, launch,
|
|
|
|
[&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.next_layer().str("\x89\x01*");
|
|
|
|
w.close(ws, {});
|
|
|
|
});
|
|
|
|
|
|
|
|
// drain invalid message frame after close
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
launch(ws.next_layer().remote());
|
|
|
|
w.handshake(ws, "localhost", "/");
|
|
|
|
ws.next_layer().str("\x81\x81\xff\xff\xff\xff*");
|
|
|
|
try
|
|
|
|
{
|
|
|
|
w.close(ws, {});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == error::failed,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// drain invalid close frame after close
|
|
|
|
{
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
launch(ws.next_layer().remote());
|
|
|
|
w.handshake(ws, "localhost", "/");
|
|
|
|
ws.next_layer().str("\x88\x01*");
|
|
|
|
try
|
|
|
|
{
|
|
|
|
w.close(ws, {});
|
|
|
|
fail("", __FILE__, __LINE__);
|
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
se.code() == error::failed,
|
|
|
|
se.code().message());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// close with incomplete read message
|
|
|
|
doTest(w, pmd, launch,
|
|
|
|
[&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.next_layer().str("\x81\x02**");
|
|
|
|
static_buffer<1> b;
|
|
|
|
w.read_some(ws, 1, b);
|
|
|
|
w.close(ws, {});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
doTestCloseAsync()
|
|
|
|
{
|
|
|
|
auto const launch =
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServer(std::move(stream));
|
|
|
|
//launchEchoServerAsync(std::move(stream));
|
|
|
|
};
|
|
|
|
|
|
|
|
// suspend on write
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<test::stream> ws{ios, ios_};
|
|
|
|
launch(ws.next_layer().remote());
|
|
|
|
ws.handshake("localhost", "/", ec);
|
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
|
|
|
std::size_t count = 0;
|
|
|
|
ws.async_ping("",
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
|
|
|
});
|
|
|
|
BEAST_EXPECT(ws.wr_block_);
|
|
|
|
ws.async_close({},
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
|
|
|
});
|
|
|
|
ios.run();
|
|
|
|
BEAST_EXPECT(count == 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// suspend on read
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<test::stream> ws{ios, ios_};
|
|
|
|
launch(ws.next_layer().remote());
|
|
|
|
ws.handshake("localhost", "/", ec);
|
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
|
|
|
flat_buffer b;
|
|
|
|
std::size_t count = 0;
|
|
|
|
ws.async_read(b,
|
|
|
|
[&](error_code ec, std::size_t)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
ec == error::closed, ec.message());
|
|
|
|
});
|
|
|
|
BEAST_EXPECT(ws.rd_block_);
|
|
|
|
ws.async_close({},
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
ec == boost::asio::error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
BEAST_EXPECT(ws.wr_close_);
|
|
|
|
ios.run();
|
|
|
|
BEAST_EXPECT(count == 2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
testClose()
|
|
|
|
{
|
|
|
|
doTestClose(SyncClient{});
|
|
|
|
|
|
|
|
yield_to([&](yield_context yield)
|
|
|
|
{
|
|
|
|
doTestClose(AsyncClient{yield});
|
|
|
|
});
|
|
|
|
|
|
|
|
doTestCloseAsync();
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
|
|
|
void
|
|
|
|
testRead()
|
|
|
|
{
|
|
|
|
// Read close frames
|
|
|
|
{
|
|
|
|
auto const check =
|
|
|
|
[&](error_code ev, string_view s)
|
|
|
|
{
|
|
|
|
test::stream ts{ios_};
|
|
|
|
stream<test::stream&> ws{ts};
|
|
|
|
launchEchoServerAsync(ts.remote());
|
|
|
|
ws.handshake("localhost", "/");
|
|
|
|
ts.str(s);
|
|
|
|
static_buffer<1> b;
|
|
|
|
error_code ec;
|
|
|
|
ws.read(b, ec);
|
|
|
|
BEAST_EXPECTS(ec == ev, ec.message());
|
|
|
|
};
|
|
|
|
|
|
|
|
// payload length 1
|
|
|
|
check(error::failed,
|
|
|
|
"\x88\x01\x01");
|
|
|
|
|
|
|
|
// invalid close code 1005
|
|
|
|
check(error::failed,
|
|
|
|
"\x88\x02\x03\xed");
|
|
|
|
|
|
|
|
// invalid utf8
|
|
|
|
check(error::failed,
|
|
|
|
"\x88\x06\xfc\x15\x0f\xd7\x73\x43");
|
|
|
|
|
|
|
|
// good utf8
|
|
|
|
check(error::closed,
|
|
|
|
"\x88\x06\xfc\x15utf8");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
template<class Client, class Launch>
|
|
|
|
void
|
|
|
|
doTestHandshake(Client const& c, Launch const& launch)
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
class req_decorator
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
bool& b_;
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
public:
|
|
|
|
req_decorator(req_decorator const&) = default;
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
explicit
|
|
|
|
req_decorator(bool& b)
|
|
|
|
: b_(b)
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
|
|
|
}
|
2017-08-01 20:15:07 -07:00
|
|
|
|
|
|
|
void
|
|
|
|
operator()(request_type&) const
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
b_ = true;
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
}
|
2017-08-01 20:15:07 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
// handshake
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
launch(ts.remote());
|
|
|
|
c.handshake(ws, "localhost", "/");
|
|
|
|
});
|
|
|
|
|
|
|
|
// handshake, response
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
launch(ts.remote());
|
|
|
|
response_type res;
|
|
|
|
c.handshake(ws, res, "localhost", "/");
|
|
|
|
// VFALCO validate res?
|
|
|
|
});
|
|
|
|
|
|
|
|
// handshake, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
launch(ts.remote());
|
|
|
|
bool called = false;
|
|
|
|
c.handshake_ex(ws, "localhost", "/",
|
|
|
|
req_decorator{called});
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
|
|
|
|
|
|
|
// handshake, response, decorator
|
|
|
|
doTestLoop([&](test::stream& ts)
|
|
|
|
{
|
|
|
|
ws_stream_type ws{ts};
|
|
|
|
launch(ts.remote());
|
|
|
|
bool called = false;
|
|
|
|
response_type res;
|
|
|
|
c.handshake_ex(ws, res, "localhost", "/",
|
|
|
|
req_decorator{called});
|
|
|
|
// VFALCO validate res?
|
|
|
|
BEAST_EXPECT(called);
|
|
|
|
});
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
testHandshake()
|
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
doTestHandshake(SyncClient{},
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServer(std::move(stream));
|
|
|
|
});
|
|
|
|
|
|
|
|
yield_to([&](yield_context yield)
|
|
|
|
{
|
|
|
|
doTestHandshake(AsyncClient{yield},
|
|
|
|
[&](test::stream stream)
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
launchEchoServerAsync(std::move(stream));
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
});
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2016-05-15 16:22:25 -04:00
|
|
|
void testBadHandshakes()
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
auto const check =
|
|
|
|
[&](error_code const& ev, std::string const& s)
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
for(int i = 0; i < 3; ++i)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
std::size_t n;
|
|
|
|
switch(i)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
case 0:
|
|
|
|
n = 1;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
n = s.size() / 2;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
n = s.size() - 1;
|
|
|
|
break;
|
|
|
|
}
|
2017-08-01 20:15:07 -07:00
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
ws.next_layer().str(
|
2017-08-12 15:03:39 -07:00
|
|
|
s.substr(n, s.size() - n));
|
2016-05-15 16:22:25 -04:00
|
|
|
try
|
|
|
|
{
|
2017-07-22 06:31:22 -07:00
|
|
|
ws.accept(
|
2017-08-12 15:03:39 -07:00
|
|
|
boost::asio::buffer(s.data(), n));
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(! ev, ev.message());
|
2016-05-15 16:22:25 -04:00
|
|
|
}
|
|
|
|
catch(system_error const& se)
|
|
|
|
{
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(se.code() == ev, se.what());
|
2016-05-15 16:22:25 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
// wrong version
|
2017-06-19 14:35:32 -07:00
|
|
|
check(http::error::end_of_stream,
|
2016-05-15 16:22:25 -04:00
|
|
|
"GET / HTTP/1.0\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// wrong method
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"POST / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing Host
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing Sec-WebSocket-Key
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing Sec-WebSocket-Version
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// wrong Sec-WebSocket-Version
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive,upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 1\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing upgrade token
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: HTTP/2\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing connection token
|
|
|
|
check(error::handshake_failed,
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// valid request
|
|
|
|
check({},
|
|
|
|
"GET / HTTP/1.1\r\n"
|
|
|
|
"Host: localhost:80\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
|
|
|
|
2016-05-15 16:22:25 -04:00
|
|
|
void testBadResponses()
|
2016-05-04 11:06:17 -04:00
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
auto const check =
|
|
|
|
[&](std::string const& s)
|
2016-05-04 11:06:17 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
ws.next_layer().str(s);
|
|
|
|
ws.next_layer().remote().close();
|
2016-05-04 11:06:17 -04:00
|
|
|
try
|
|
|
|
{
|
2016-05-15 16:22:25 -04:00
|
|
|
ws.handshake("localhost:80", "/");
|
|
|
|
fail();
|
2016-05-04 11:06:17 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
catch(system_error const& se)
|
2016-05-04 11:06:17 -04:00
|
|
|
{
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECT(se.code() == error::handshake_failed);
|
2016-05-04 11:06:17 -04:00
|
|
|
}
|
2016-05-15 16:22:25 -04:00
|
|
|
};
|
|
|
|
// wrong HTTP version
|
|
|
|
check(
|
|
|
|
"HTTP/1.0 101 Switching Protocols\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// wrong status
|
|
|
|
check(
|
|
|
|
"HTTP/1.1 200 OK\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing upgrade token
|
|
|
|
check(
|
|
|
|
"HTTP/1.1 101 Switching Protocols\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: HTTP/2\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing connection token
|
|
|
|
check(
|
|
|
|
"HTTP/1.1 101 Switching Protocols\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: keep-alive\r\n"
|
|
|
|
"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// missing accept key
|
|
|
|
check(
|
|
|
|
"HTTP/1.1 101 Switching Protocols\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
|
|
|
// wrong accept key
|
|
|
|
check(
|
|
|
|
"HTTP/1.1 101 Switching Protocols\r\n"
|
|
|
|
"Server: beast\r\n"
|
|
|
|
"Upgrade: WebSocket\r\n"
|
|
|
|
"Connection: upgrade\r\n"
|
|
|
|
"Sec-WebSocket-Accept: *\r\n"
|
|
|
|
"Sec-WebSocket-Version: 13\r\n"
|
|
|
|
"\r\n"
|
|
|
|
);
|
2016-05-04 11:06:17 -04:00
|
|
|
}
|
|
|
|
|
2017-05-04 05:01:50 -07:00
|
|
|
void
|
|
|
|
testMask(endpoint_type const& ep,
|
2016-05-04 17:27:50 -04:00
|
|
|
yield_context do_yield)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::vector<char> v;
|
|
|
|
for(char n = 0; n < 20; ++n)
|
|
|
|
{
|
2017-06-13 07:23:58 -07:00
|
|
|
error_code ec = test::error::fail_error;
|
2016-05-04 17:27:50 -04:00
|
|
|
socket_type sock(ios_);
|
|
|
|
sock.connect(ep, ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
|
|
|
stream<socket_type&> ws(sock);
|
|
|
|
ws.handshake("localhost", "/", ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
|
|
|
ws.write(boost::asio::buffer(v), ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
2017-08-12 15:03:39 -07:00
|
|
|
multi_buffer b;
|
|
|
|
ws.read(b, ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
2017-08-12 15:03:39 -07:00
|
|
|
BEAST_EXPECT(to_string(b.data()) ==
|
2016-08-29 13:28:08 -04:00
|
|
|
std::string(v.data(), v.size()));
|
2016-05-04 17:27:50 -04:00
|
|
|
v.push_back(n+1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
{
|
|
|
|
std::vector<char> v;
|
|
|
|
for(char n = 0; n < 20; ++n)
|
|
|
|
{
|
2017-06-13 07:23:58 -07:00
|
|
|
error_code ec = test::error::fail_error;
|
2016-05-04 17:27:50 -04:00
|
|
|
socket_type sock(ios_);
|
|
|
|
sock.connect(ep, ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
|
|
|
stream<socket_type&> ws(sock);
|
|
|
|
ws.handshake("localhost", "/", ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
|
|
|
ws.async_write(boost::asio::buffer(v), do_yield[ec]);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
2017-08-12 15:03:39 -07:00
|
|
|
multi_buffer b;
|
|
|
|
ws.async_read(b, do_yield[ec]);
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
2016-05-04 17:27:50 -04:00
|
|
|
break;
|
2017-08-12 15:03:39 -07:00
|
|
|
BEAST_EXPECT(to_string(b.data()) ==
|
2016-08-29 13:28:08 -04:00
|
|
|
std::string(v.data(), v.size()));
|
2016-05-04 17:27:50 -04:00
|
|
|
v.push_back(n+1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
void
|
|
|
|
testPausation1()
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
for(int i = 0; i < 2; ++i)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<test::stream> ws{ios, ios_};
|
|
|
|
if(i == 0)
|
|
|
|
launchEchoServer(ws.next_layer().remote());
|
|
|
|
else
|
|
|
|
launchEchoServerAsync(ws.next_layer().remote());
|
|
|
|
ws.handshake("localhost", "/");
|
2016-05-15 16:22:25 -04:00
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
// Make remote send a text message with bad utf8.
|
|
|
|
ws.binary(true);
|
|
|
|
put(ws.next_layer().buffer(), cbuf(
|
|
|
|
0x03, 0xea, 0xf0, 0x28, 0x8c, 0xbc));
|
|
|
|
multi_buffer b;
|
|
|
|
std::size_t count = 0;
|
|
|
|
// Read text message with bad utf8.
|
|
|
|
// Causes a close to be sent, blocking writes.
|
|
|
|
ws.async_read(b,
|
|
|
|
[&](error_code ec, std::size_t)
|
|
|
|
{
|
|
|
|
// Read should fail with protocol error
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(
|
|
|
|
ec == error::failed, ec.message());
|
|
|
|
// Reads after failure are aborted
|
|
|
|
ws.async_read(b,
|
|
|
|
[&](error_code ec, std::size_t)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// Run until the read_op writes a close frame.
|
|
|
|
while(! ws.wr_block_)
|
|
|
|
ios.run_one();
|
|
|
|
// Write a text message, leaving
|
|
|
|
// the write_op suspended as a pausation.
|
|
|
|
ws.async_write(sbuf("Hello"),
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
// Send is canceled because close received.
|
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
// Writes after close are aborted.
|
|
|
|
ws.async_write(sbuf("World"),
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
});
|
|
|
|
// Run until all completions are delivered.
|
|
|
|
while(! ios.stopped())
|
|
|
|
ios.run_one();
|
|
|
|
BEAST_EXPECT(count == 4);
|
2016-05-15 16:22:25 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
void
|
|
|
|
testPausation2(endpoint_type const& ep)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<socket_type> ws(ios);
|
|
|
|
ws.next_layer().connect(ep);
|
|
|
|
ws.handshake("localhost", "/");
|
|
|
|
|
|
|
|
// Cause close to be received
|
2017-06-08 18:03:10 -07:00
|
|
|
ws.binary(true);
|
2016-05-15 16:22:25 -04:00
|
|
|
ws.write(sbuf("CLOSE"));
|
2017-08-12 15:03:39 -07:00
|
|
|
multi_buffer b;
|
2016-05-15 16:22:25 -04:00
|
|
|
std::size_t count = 0;
|
|
|
|
// Read a close frame.
|
|
|
|
// Sends a close frame, blocking writes.
|
2017-08-12 15:03:39 -07:00
|
|
|
ws.async_read(b,
|
2017-07-25 08:50:58 -07:00
|
|
|
[&](error_code ec, std::size_t)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
// Read should complete with error::closed
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == error::closed,
|
2016-05-15 16:22:25 -04:00
|
|
|
ec.message());
|
|
|
|
// Pings after a close are aborted
|
|
|
|
ws.async_ping("",
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
2016-05-15 16:22:25 -04:00
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
});
|
2017-07-25 12:35:54 -07:00
|
|
|
if(! BEAST_EXPECT(run_until(ios, 100,
|
2016-05-15 16:22:25 -04:00
|
|
|
[&]{ return ws.wr_close_; })))
|
|
|
|
return;
|
|
|
|
// Try to ping
|
|
|
|
ws.async_ping("payload",
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
// Pings after a close are aborted
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
2016-05-15 16:22:25 -04:00
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
// Subsequent calls to close are aborted
|
|
|
|
ws.async_close({},
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
2016-05-15 16:22:25 -04:00
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
});
|
|
|
|
static std::size_t constexpr limit = 100;
|
|
|
|
std::size_t n;
|
|
|
|
for(n = 0; n < limit; ++n)
|
|
|
|
{
|
|
|
|
if(count >= 4)
|
|
|
|
break;
|
|
|
|
ios.run_one();
|
|
|
|
}
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECT(n < limit);
|
2016-05-15 16:22:25 -04:00
|
|
|
ios.run();
|
|
|
|
}
|
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
void
|
|
|
|
testPausation3(endpoint_type const& ep)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<socket_type> ws(ios);
|
|
|
|
ws.next_layer().connect(ep);
|
|
|
|
ws.handshake("localhost", "/");
|
|
|
|
|
|
|
|
// Cause close to be received
|
2017-06-08 18:03:10 -07:00
|
|
|
ws.binary(true);
|
2016-05-15 16:22:25 -04:00
|
|
|
ws.write(sbuf("CLOSE"));
|
2017-08-12 15:03:39 -07:00
|
|
|
multi_buffer b;
|
2016-05-15 16:22:25 -04:00
|
|
|
std::size_t count = 0;
|
2017-08-12 15:03:39 -07:00
|
|
|
ws.async_read(b,
|
2017-07-25 08:50:58 -07:00
|
|
|
[&](error_code ec, std::size_t)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == error::closed,
|
2016-05-15 16:22:25 -04:00
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
while(! ws.wr_block_)
|
|
|
|
ios.run_one();
|
|
|
|
// try to close
|
|
|
|
ws.async_close("payload",
|
|
|
|
[&](error_code ec)
|
|
|
|
{
|
|
|
|
++count;
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(ec == boost::asio::
|
2016-05-15 16:22:25 -04:00
|
|
|
error::operation_aborted,
|
|
|
|
ec.message());
|
|
|
|
});
|
|
|
|
static std::size_t constexpr limit = 100;
|
|
|
|
std::size_t n;
|
|
|
|
for(n = 0; n < limit; ++n)
|
|
|
|
{
|
|
|
|
if(count >= 2)
|
|
|
|
break;
|
|
|
|
ios.run_one();
|
|
|
|
}
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECT(n < limit);
|
2016-05-15 16:22:25 -04:00
|
|
|
ios.run();
|
|
|
|
}
|
|
|
|
|
2017-04-14 12:32:36 -07:00
|
|
|
/*
|
2017-07-29 05:03:05 -07:00
|
|
|
https://github.com/boostorg/beast/issues/300
|
2017-04-14 12:32:36 -07:00
|
|
|
|
|
|
|
Write a message as two individual frames
|
|
|
|
*/
|
|
|
|
void
|
2017-08-12 15:03:39 -07:00
|
|
|
testWriteFrames()
|
2017-04-14 12:32:36 -07:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
for(int i = 0; i < 2; ++i)
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
stream<test::stream> ws{ios_};
|
|
|
|
if(i == 0)
|
|
|
|
launchEchoServer(ws.next_layer().remote());
|
|
|
|
else
|
|
|
|
launchEchoServerAsync(ws.next_layer().remote());
|
|
|
|
ws.handshake("localhost", "/", ec);
|
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
|
|
|
return;
|
|
|
|
ws.write_some(false, sbuf("u"));
|
|
|
|
ws.write_some(true, sbuf("v"));
|
|
|
|
multi_buffer b;
|
|
|
|
ws.read(b, ec);
|
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
|
|
|
}
|
2017-04-14 12:32:36 -07:00
|
|
|
}
|
|
|
|
|
2016-10-24 18:41:25 -04:00
|
|
|
void
|
2017-08-12 15:03:39 -07:00
|
|
|
testAsyncWriteFrame()
|
2016-10-24 18:41:25 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
for(int i = 0; i < 2; ++i)
|
2016-10-24 18:41:25 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
error_code ec;
|
|
|
|
boost::asio::io_service ios;
|
|
|
|
stream<test::stream> ws{ios, ios_};
|
|
|
|
if(i == 0)
|
|
|
|
launchEchoServer(ws.next_layer().remote());
|
|
|
|
else
|
|
|
|
launchEchoServerAsync(ws.next_layer().remote());
|
|
|
|
ws.handshake("localhost", "/", ec);
|
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
|
|
|
break;
|
|
|
|
ws.async_write_some(false,
|
|
|
|
boost::asio::null_buffers{},
|
|
|
|
[&](error_code)
|
|
|
|
{
|
|
|
|
fail();
|
|
|
|
});
|
|
|
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
|
|
|
break;
|
|
|
|
//
|
|
|
|
// Destruction of the io_service will cause destruction
|
|
|
|
// of the write_some_op without invoking the final handler.
|
|
|
|
//
|
2016-10-24 18:41:25 -04:00
|
|
|
break;
|
2017-08-12 15:03:39 -07:00
|
|
|
}
|
2016-10-24 18:41:25 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
//--------------------------------------------------------------------------
|
2016-10-24 18:41:25 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
template<class Wrap, class Launch>
|
2016-10-24 18:41:25 -04:00
|
|
|
void
|
2017-08-01 20:15:07 -07:00
|
|
|
testStream(
|
|
|
|
Wrap const& c,
|
|
|
|
permessage_deflate const& pmd,
|
|
|
|
Launch const& launch)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
|
|
|
using boost::asio::buffer;
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// send empty message
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.text(true);
|
|
|
|
c.write(ws, boost::asio::null_buffers{});
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(ws.got_text());
|
|
|
|
BEAST_EXPECT(b.size() == 0);
|
|
|
|
});
|
|
|
|
|
|
|
|
// send message
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.auto_fragment(false);
|
|
|
|
ws.binary(false);
|
|
|
|
c.write(ws, sbuf("Hello"));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(ws.got_text());
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == "Hello");
|
|
|
|
});
|
|
|
|
|
|
|
|
// read_some
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.write(ws, sbuf("Hello"));
|
|
|
|
char buf[10];
|
|
|
|
auto const bytes_written =
|
|
|
|
c.read_some(ws, buffer(buf, sizeof(buf)));
|
2017-08-12 15:03:39 -07:00
|
|
|
BEAST_EXPECT(bytes_written > 0);
|
|
|
|
buf[bytes_written] = 0;
|
|
|
|
BEAST_EXPECT(
|
|
|
|
string_view(buf).substr(0, bytes_written) ==
|
|
|
|
string_view("Hello").substr(0, bytes_written));
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
2016-05-15 16:22:25 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// close, no payload
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.close(ws, {});
|
|
|
|
});
|
2016-05-15 16:22:25 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// close with code
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.close(ws, close_code::going_away);
|
|
|
|
});
|
2016-11-03 17:53:32 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// send ping and message
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
bool once = false;
|
|
|
|
auto cb =
|
|
|
|
[&](frame_type kind, string_view s)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
BEAST_EXPECT(kind == frame_type::pong);
|
|
|
|
BEAST_EXPECT(! once);
|
|
|
|
once = true;
|
|
|
|
BEAST_EXPECT(s == "");
|
|
|
|
};
|
|
|
|
ws.control_callback(cb);
|
|
|
|
c.ping(ws, "");
|
|
|
|
ws.binary(true);
|
|
|
|
c.write(ws, sbuf("Hello"));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(once);
|
|
|
|
BEAST_EXPECT(ws.got_binary());
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == "Hello");
|
|
|
|
});
|
|
|
|
|
|
|
|
// send ping and fragmented message
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
bool once = false;
|
|
|
|
auto cb =
|
|
|
|
[&](frame_type kind, string_view s)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
BEAST_EXPECT(kind == frame_type::pong);
|
|
|
|
BEAST_EXPECT(! once);
|
|
|
|
once = true;
|
|
|
|
BEAST_EXPECT(s == "payload");
|
|
|
|
};
|
|
|
|
ws.control_callback(cb);
|
|
|
|
ws.ping("payload");
|
|
|
|
c.write_some(ws, false, sbuf("Hello, "));
|
|
|
|
c.write_some(ws, false, sbuf(""));
|
|
|
|
c.write_some(ws, true, sbuf("World!"));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(once);
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == "Hello, World!");
|
|
|
|
ws.control_callback();
|
|
|
|
});
|
|
|
|
|
|
|
|
// send pong
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.pong(ws, "");
|
|
|
|
});
|
|
|
|
|
|
|
|
// send auto fragmented message
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
ws.auto_fragment(true);
|
|
|
|
ws.write_buffer_size(8);
|
|
|
|
c.write(ws, sbuf("Now is the time for all good men"));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == "Now is the time for all good men");
|
|
|
|
});
|
|
|
|
|
|
|
|
// send message with write buffer limit
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
std::string s(2000, '*');
|
|
|
|
ws.write_buffer_size(1200);
|
|
|
|
c.write(ws, buffer(s.data(), s.size()));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == s);
|
|
|
|
});
|
|
|
|
|
|
|
|
// unexpected cont
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.write_raw(ws, cbuf(
|
|
|
|
0x80, 0x80, 0xff, 0xff, 0xff, 0xff));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::protocol_error);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
|
|
|
|
|
|
|
// invalid fixed frame header
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.write_raw(ws, cbuf(
|
|
|
|
0x8f, 0x80, 0xff, 0xff, 0xff, 0xff));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::protocol_error);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
|
|
|
|
|
|
|
if(! pmd.client_enable)
|
|
|
|
{
|
|
|
|
// expected cont
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.write_some(ws, false, boost::asio::null_buffers{});
|
|
|
|
c.write_raw(ws, cbuf(
|
|
|
|
0x81, 0x80, 0xff, 0xff, 0xff, 0xff));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::protocol_error);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
2016-05-15 16:22:25 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// message size above 2^64
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
c.write_some(ws, false, cbuf(0x00));
|
|
|
|
c.write_raw(ws, cbuf(
|
|
|
|
0x80, 0xff, 0xff, 0xff, 0xff, 0xff,
|
|
|
|
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::too_big);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
2016-05-15 16:22:25 -04:00
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
/*
|
|
|
|
// message size exceeds max
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
2016-05-15 16:22:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
// VFALCO This was never implemented correctly
|
|
|
|
ws.read_message_max(1);
|
|
|
|
c.write(ws, cbuf(0x81, 0x02, '*', '*'));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::too_big);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
|
|
|
*/
|
2016-05-15 16:22:25 -04:00
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
// receive ping
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
put(ws.next_layer().buffer(), cbuf(
|
|
|
|
0x89, 0x00));
|
|
|
|
bool invoked = false;
|
|
|
|
auto cb = [&](frame_type kind, string_view)
|
|
|
|
{
|
|
|
|
BEAST_EXPECT(! invoked);
|
|
|
|
BEAST_EXPECT(kind == frame_type::ping);
|
|
|
|
invoked = true;
|
|
|
|
};
|
|
|
|
ws.control_callback(cb);
|
|
|
|
c.write(ws, sbuf("Hello"));
|
|
|
|
multi_buffer b;
|
|
|
|
c.read(ws, b);
|
|
|
|
BEAST_EXPECT(invoked);
|
|
|
|
BEAST_EXPECT(ws.got_text());
|
|
|
|
BEAST_EXPECT(to_string(b.data()) == "Hello");
|
|
|
|
});
|
|
|
|
|
|
|
|
// receive ping
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
put(ws.next_layer().buffer(), cbuf(
|
|
|
|
0x88, 0x00));
|
|
|
|
bool invoked = false;
|
|
|
|
auto cb = [&](frame_type kind, string_view)
|
|
|
|
{
|
|
|
|
BEAST_EXPECT(! invoked);
|
|
|
|
BEAST_EXPECT(kind == frame_type::close);
|
|
|
|
invoked = true;
|
|
|
|
};
|
|
|
|
ws.control_callback(cb);
|
|
|
|
c.write(ws, sbuf("Hello"));
|
2017-08-12 15:03:39 -07:00
|
|
|
doCloseTest(c, ws, close_code::none);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
|
|
|
|
|
|
|
// receive bad utf8
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
put(ws.next_layer().buffer(), cbuf(
|
|
|
|
0x81, 0x06, 0x03, 0xea, 0xf0, 0x28, 0x8c, 0xbc));
|
2017-08-12 15:03:39 -07:00
|
|
|
doFailTest(c, ws, error::failed);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
|
|
|
|
|
|
|
// receive bad close
|
|
|
|
doTest(c, pmd, launch, [&](ws_stream_type& ws)
|
|
|
|
{
|
|
|
|
put(ws.next_layer().buffer(), cbuf(
|
|
|
|
0x88, 0x02, 0x03, 0xed));
|
2017-08-12 15:03:39 -07:00
|
|
|
doFailTest(c, ws, error::failed);
|
2017-08-01 20:15:07 -07:00
|
|
|
});
|
2017-07-29 17:47:04 -07:00
|
|
|
}
|
|
|
|
|
2017-08-01 20:15:07 -07:00
|
|
|
//--------------------------------------------------------------------------
|
|
|
|
|
2017-06-07 17:41:27 -07:00
|
|
|
void
|
|
|
|
run() override
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(std::is_constructible<
|
|
|
|
stream<socket_type>, boost::asio::io_service&>::value);
|
2016-05-07 17:06:46 -04:00
|
|
|
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(std::is_move_constructible<
|
|
|
|
stream<socket_type>>::value);
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(std::is_move_assignable<
|
|
|
|
stream<socket_type>>::value);
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(std::is_constructible<
|
|
|
|
stream<socket_type&>, socket_type&>::value);
|
2016-04-30 13:00:33 -04:00
|
|
|
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(std::is_move_constructible<
|
|
|
|
stream<socket_type&>>::value);
|
2016-05-04 11:06:17 -04:00
|
|
|
|
2017-05-23 12:33:31 -07:00
|
|
|
BOOST_STATIC_ASSERT(! std::is_move_assignable<
|
|
|
|
stream<socket_type&>>::value);
|
2016-05-04 17:27:50 -04:00
|
|
|
|
2016-06-10 15:48:39 -04:00
|
|
|
log << "sizeof(websocket::stream) == " <<
|
2017-08-16 19:25:02 -07:00
|
|
|
sizeof(websocket::stream<test::stream&>) << std::endl;
|
|
|
|
|
|
|
|
testAccept();
|
2017-08-17 22:38:50 -07:00
|
|
|
testClose();
|
|
|
|
testRead();
|
2016-06-10 15:48:39 -04:00
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
permessage_deflate pmd;
|
|
|
|
pmd.client_enable = false;
|
|
|
|
pmd.server_enable = false;
|
|
|
|
|
2016-10-24 18:41:25 -04:00
|
|
|
testOptions();
|
Refactor websocket decorators (API Change):
fix #80, #212, fix #303, fix #314, fix #317
websocket::stream now provides the following families of
functions for performing handshakes:
When operating in the server role:
* stream::accept
* stream::accept_ex
* stream::async_accept
* stream::async_accept_ex
When operating in the client role:
* stream::handshake
* stream::handshake_ex
* stream::async_handshake
* stream::async_handshake_ex
Member functions ending with "_ex" allow an additional
RequestDecorator parameter (for the accept family of
functions) or ResponseDecorator parameter (for the
handshake family of functions).
The decorator is called to optionally modify the contents
of the HTTP request or HTTP response object generated by
the implementation, before the message is sent. This
permits callers to set the User-Agent or Server fields,
add or modify HTTP fields related to subprotocols, or
perform any required transformation of the HTTP message
for application-specific needs.
The handshake() family of functions now have an additional
set of overloads accepting a parameter of type response_type&,
allowing the caller to receive the HTTP Response to the
Upgrade handshake. This permits inspection of the response
to handle things like subprotocols, authentication, or
other application-specific needs.
The new implementation does not require any state to be
stored in the stream object. Therefore, websocket::stream
objects are now smaller in size.
The overload of set_option for setting a decorator on the
stream is removed. The only way to set decorators now is
with a suitable overload of accept or handshake.
2017-04-25 09:35:22 -07:00
|
|
|
testHandshake();
|
2016-10-24 18:41:25 -04:00
|
|
|
testBadHandshakes();
|
|
|
|
testBadResponses();
|
2017-08-01 20:15:07 -07:00
|
|
|
testClose();
|
2017-08-12 15:03:39 -07:00
|
|
|
testPausation1();
|
|
|
|
testWriteFrames();
|
|
|
|
testAsyncWriteFrame();
|
2016-10-24 18:41:25 -04:00
|
|
|
|
2017-08-12 15:03:39 -07:00
|
|
|
// Legacy tests use actual TCP/IP sockets
|
|
|
|
// VFALCO: Rewrite to use test::stream and
|
|
|
|
// remote <boost/asio/ip/tcp.hpp>
|
2016-04-30 13:00:33 -04:00
|
|
|
{
|
2017-08-12 15:03:39 -07:00
|
|
|
auto const any = endpoint_type{
|
|
|
|
address_type::from_string("127.0.0.1"), 0};
|
2017-01-30 09:53:10 -05:00
|
|
|
error_code ec;
|
|
|
|
::websocket::sync_echo_server server{nullptr};
|
2017-04-14 12:32:36 -07:00
|
|
|
server.set_option(pmd);
|
2017-01-30 09:53:10 -05:00
|
|
|
server.open(any, ec);
|
2017-07-25 12:35:54 -07:00
|
|
|
BEAST_EXPECTS(! ec, ec.message());
|
2016-10-24 18:41:25 -04:00
|
|
|
auto const ep = server.local_endpoint();
|
2017-04-27 17:29:25 -07:00
|
|
|
testPausation2(ep);
|
|
|
|
testPausation3(ep);
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
2016-10-24 18:41:25 -04:00
|
|
|
|
|
|
|
auto const doClientTests =
|
2017-08-01 20:15:07 -07:00
|
|
|
[this](permessage_deflate const& pmd)
|
2016-10-24 18:41:25 -04:00
|
|
|
{
|
2017-08-01 20:15:07 -07:00
|
|
|
testStream(SyncClient{}, pmd,
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServer(std::move(stream));
|
|
|
|
});
|
2017-08-12 15:03:39 -07:00
|
|
|
#if 0
|
|
|
|
// This causes false positives on ASAN
|
|
|
|
testStream(SyncClient{}, pmd,
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServerAsync(std::move(stream));
|
|
|
|
});
|
|
|
|
#endif
|
|
|
|
yield_to(
|
|
|
|
[&](yield_context yield)
|
|
|
|
{
|
|
|
|
testStream(AsyncClient{yield}, pmd,
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServer(std::move(stream));
|
|
|
|
});
|
|
|
|
});
|
2017-08-01 20:15:07 -07:00
|
|
|
yield_to(
|
|
|
|
[&](yield_context yield)
|
|
|
|
{
|
|
|
|
testStream(AsyncClient{yield}, pmd,
|
|
|
|
[&](test::stream stream)
|
|
|
|
{
|
|
|
|
launchEchoServerAsync(std::move(stream));
|
|
|
|
});
|
|
|
|
});
|
2016-10-24 18:41:25 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
pmd.client_enable = false;
|
|
|
|
pmd.server_enable = false;
|
|
|
|
doClientTests(pmd);
|
|
|
|
|
|
|
|
pmd.client_enable = true;
|
|
|
|
pmd.server_enable = true;
|
|
|
|
pmd.client_max_window_bits = 10;
|
|
|
|
pmd.client_no_context_takeover = false;
|
2017-07-31 18:48:22 -07:00
|
|
|
pmd.compLevel = 1;
|
|
|
|
pmd.memLevel = 1;
|
2016-10-24 18:41:25 -04:00
|
|
|
doClientTests(pmd);
|
|
|
|
|
|
|
|
pmd.client_enable = true;
|
|
|
|
pmd.server_enable = true;
|
|
|
|
pmd.client_max_window_bits = 10;
|
|
|
|
pmd.client_no_context_takeover = true;
|
2017-07-31 18:48:22 -07:00
|
|
|
pmd.compLevel = 1;
|
|
|
|
pmd.memLevel = 1;
|
2016-10-24 18:41:25 -04:00
|
|
|
doClientTests(pmd);
|
2016-04-30 13:00:33 -04:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2017-08-01 17:01:57 -07:00
|
|
|
BEAST_DEFINE_TESTSUITE(beast,websocket,stream);
|
2016-04-30 13:00:33 -04:00
|
|
|
|
|
|
|
} // websocket
|
|
|
|
} // beast
|
2017-07-20 13:40:34 -07:00
|
|
|
} // boost
|