jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added Support for NO_BOOST

Browse source
This commit is contained in:
Sébastien Huss 2017-06-05 07:39:58 +02:00
commit d50bcabf8e
6 changed files with 256 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

54
client_https.hpp
View file

@ -5,7 +5,7 @@
#include <boost/asio/ssl.hpp>
namespace SimpleWeb {
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> HTTPS;
typedef asio_ns::ssl::stream<asio_ns::ip::tcp::socket> HTTPS;
template<>
class Client<HTTPS> : public ClientBase<HTTPS> {
@ -13,14 +13,14 @@ namespace SimpleWeb {
Client(const std::string& server_port_path, bool verify_certificate=true,
const std::string& cert_file=std::string(), const std::string& private_key_file=std::string(),
const std::string& verify_file=std::string()) :
ClientBase<HTTPS>::ClientBase(server_port_path, 443), context(boost::asio::ssl::context::tlsv12) {
ClientBase<HTTPS>::ClientBase(server_port_path, 443), context(asio_ns::ssl::context::tlsv12) {
if(cert_file.size()>0 && private_key_file.size()>0) {
context.use_certificate_chain_file(cert_file);
context.use_private_key_file(private_key_file, boost::asio::ssl::context::pem);
context.use_private_key_file(private_key_file, asio_ns::ssl::context::pem);
}
if(verify_certificate)
context.set_verify_callback(boost::asio::ssl::rfc2818_verification(host));
context.set_verify_callback(asio_ns::ssl::rfc2818_verification(host));
if(verify_file.size()>0)
context.load_verify_file(verify_file);
@ -28,25 +28,25 @@ namespace SimpleWeb {
context.set_default_verify_paths();
if(verify_file.size()>0 || verify_certificate)
context.set_verify_mode(boost::asio::ssl::verify_peer);
context.set_verify_mode(asio_ns::ssl::verify_peer);
else
context.set_verify_mode(boost::asio::ssl::verify_none);
context.set_verify_mode(asio_ns::ssl::verify_none);
}
protected:
boost::asio::ssl::context context;
asio_ns::ssl::context context;
void connect() {
if(!socket || !socket->lowest_layer().is_open()) {
std::unique_ptr<boost::asio::ip::tcp::resolver::query> query;
std::unique_ptr<asio_ns::ip::tcp::resolver::query> query;
if(config.proxy_server.empty())
query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(host, std::to_string(port)));
query=std::unique_ptr<asio_ns::ip::tcp::resolver::query>(new asio_ns::ip::tcp::resolver::query(host, std::to_string(port)));
else {
auto proxy_host_port=parse_host_port(config.proxy_server, 8080);
query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second)));
query=std::unique_ptr<asio_ns::ip::tcp::resolver::query>(new asio_ns::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second)));
}
resolver.async_resolve(*query, [this]
(const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator it){
(const error_ns::error_code &ec, asio_ns::ip::tcp::resolver::iterator it){
if(!ec) {
{
std::lock_guard<std::mutex> lock(socket_mutex);
@ -54,44 +54,44 @@ namespace SimpleWeb {
}
auto timer=get_timeout_timer(config.timeout_connect);
boost::asio::async_connect(socket->lowest_layer(), it, [this, timer]
(const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator /*it*/){
asio_ns::async_connect(socket->lowest_layer(), it, [this, timer]
(const error_ns::error_code &ec, asio_ns::ip::tcp::resolver::iterator /*it*/){
if(timer)
timer->cancel();
if(!ec) {
boost::asio::ip::tcp::no_delay option(true);
asio_ns::ip::tcp::no_delay option(true);
this->socket->lowest_layer().set_option(option);
}
else {
std::lock_guard<std::mutex> lock(socket_mutex);
this->socket=nullptr;
throw boost::system::system_error(ec);
throw error_ns::system_error(ec);
}
});
}
else {
std::lock_guard<std::mutex> lock(socket_mutex);
socket=nullptr;
throw boost::system::system_error(ec);
throw error_ns::system_error(ec);
}
});
io_service.reset();
io_service.run();
if(!config.proxy_server.empty()) {
boost::asio::streambuf write_buffer;
asio_ns::streambuf write_buffer;
std::ostream write_stream(&write_buffer);
auto host_port=host+':'+std::to_string(port);
write_stream << "CONNECT "+host_port+" HTTP/1.1\r\n" << "Host: " << host_port << "\r\n\r\n";
auto timer=get_timeout_timer();
boost::asio::async_write(socket->next_layer(), write_buffer,
[this, timer](const boost::system::error_code &ec, size_t /*bytes_transferred*/) {
asio_ns::async_write(socket->next_layer(), write_buffer,
[this, timer](const error_ns::error_code &ec, size_t /*bytes_transferred*/) {
if(timer)
timer->cancel();
if(ec) {
std::lock_guard<std::mutex> lock(socket_mutex);
socket=nullptr;
throw boost::system::system_error(ec);
throw error_ns::system_error(ec);
}
});
io_service.reset();
@ -99,14 +99,14 @@ namespace SimpleWeb {
std::shared_ptr<Response> response(new Response());
timer=get_timeout_timer();
boost::asio::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n",
[this, timer](const boost::system::error_code& ec, size_t /*bytes_transferred*/) {
asio_ns::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n",
[this, timer](const error_ns::error_code& ec, size_t /*bytes_transferred*/) {
if(timer)
timer->cancel();
if(ec) {
std::lock_guard<std::mutex> lock(socket_mutex);
socket=nullptr;
throw boost::system::system_error(ec);
throw error_ns::system_error(ec);
}
});
io_service.reset();
@ -115,19 +115,19 @@ namespace SimpleWeb {
if (response->status_code.empty() || response->status_code.compare(0, 3, "200") != 0) {
std::lock_guard<std::mutex> lock(socket_mutex);
socket=nullptr;
throw boost::system::system_error(boost::system::error_code(boost::system::errc::permission_denied, boost::system::generic_category()));
throw merror_ns::make_error_code(error_ns::errc::permission_denied);
}
}
auto timer=get_timeout_timer();
this->socket->async_handshake(boost::asio::ssl::stream_base::client,
[this, timer](const boost::system::error_code& ec) {
this->socket->async_handshake(asio_ns::ssl::stream_base::client,
[this, timer](const error_ns::error_code& ec) {
if(timer)
timer->cancel();
if(ec) {
std::lock_guard<std::mutex> lock(socket_mutex);
socket=nullptr;
throw boost::system::system_error(ec);
throw error_ns::system_error(ec);
}
});
io_service.reset();