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

Added error reporting through on_error std::function

Browse source
This commit is contained in:
eidheim 2016-12-19 08:39:34 +01:00
commit eef8a10849
3 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
server_http.hpp
View file

@ -21,6 +21,9 @@
#endif #endif
namespace SimpleWeb { namespace SimpleWeb {
template <class socket_type>
class Server;
template <class socket_type> template <class socket_type>
class ServerBase { class ServerBase {
public: public:
@ -59,6 +62,7 @@ namespace SimpleWeb {
class Request { class Request {
friend class ServerBase<socket_type>; friend class ServerBase<socket_type>;
friend class Server<socket_type>;
//Based on http://www.boost.org/doc/libs/1_60_0/doc/html/unordered/hash_equality.html //Based on http://www.boost.org/doc/libs/1_60_0/doc/html/unordered/hash_equality.html
class iequal_to { class iequal_to {
@ -89,7 +93,13 @@ namespace SimpleWeb {
unsigned short remote_endpoint_port; unsigned short remote_endpoint_port;
private: private:
Request(): content(streambuf) {} Request(const socket_type &socket): content(streambuf) {
try {
remote_endpoint_address=socket.lowest_layer().remote_endpoint().address().to_string();
remote_endpoint_port=socket.lowest_layer().remote_endpoint().port();
}
catch(...) {}
}
boost::asio::streambuf streambuf; boost::asio::streambuf streambuf;
}; };
@ -116,7 +126,7 @@ namespace SimpleWeb {
std::unordered_map<std::string, std::unordered_map<std::string,
std::function<void(std::shared_ptr<typename ServerBase<socket_type>::Response>, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > default_resource; std::function<void(std::shared_ptr<typename ServerBase<socket_type>::Response>, std::shared_ptr<typename ServerBase<socket_type>::Request>)> > default_resource;
std::function<void(const std::exception&)> exception_handler; std::function<void(std::shared_ptr<typename ServerBase<socket_type>::Request>, const boost::system::error_code&)> on_error;
private: private:
std::vector<std::pair<std::string, std::vector<std::pair<REGEX_NS::regex, std::vector<std::pair<std::string, std::vector<std::pair<REGEX_NS::regex,
@ -218,7 +228,7 @@ namespace SimpleWeb {
auto timer=std::make_shared<boost::asio::deadline_timer>(*io_service); auto timer=std::make_shared<boost::asio::deadline_timer>(*io_service);
timer->expires_from_now(boost::posix_time::seconds(seconds)); timer->expires_from_now(boost::posix_time::seconds(seconds));
timer->async_wait([socket](const boost::system::error_code& ec){ timer->async_wait([this, socket](const boost::system::error_code& ec){
if(!ec) { if(!ec) {
boost::system::error_code ec; boost::system::error_code ec;
socket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec); socket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
@ -231,15 +241,7 @@ namespace SimpleWeb {
void read_request_and_content(const std::shared_ptr<socket_type> &socket) { void read_request_and_content(const std::shared_ptr<socket_type> &socket) {
//Create new streambuf (Request::streambuf) for async_read_until() //Create new streambuf (Request::streambuf) for async_read_until()
//shared_ptr is used to pass temporary objects to the asynchronous functions //shared_ptr is used to pass temporary objects to the asynchronous functions
std::shared_ptr<Request> request(new Request()); std::shared_ptr<Request> request(new Request(*socket));
try {
request->remote_endpoint_address=socket->lowest_layer().remote_endpoint().address().to_string();
request->remote_endpoint_port=socket->lowest_layer().remote_endpoint().port();
}
catch(const std::exception &e) {
if(exception_handler)
exception_handler(e);
}
//Set timeout on the following boost::asio::async-read or write function //Set timeout on the following boost::asio::async-read or write function
auto timer=this->get_timeout_timer(socket, timeout_request); auto timer=this->get_timeout_timer(socket, timeout_request);
@ -266,8 +268,8 @@ namespace SimpleWeb {
content_length=stoull(it->second); content_length=stoull(it->second);
} }
catch(const std::exception &e) { catch(const std::exception &e) {
if(exception_handler) if(on_error)
exception_handler(e); on_error(request, boost::system::error_code(boost::system::errc::protocol_error, boost::system::generic_category()));
return; return;
} }
if(content_length>num_additional_bytes) { if(content_length>num_additional_bytes) {
@ -281,6 +283,8 @@ namespace SimpleWeb {
timer->cancel(); timer->cancel();
if(!ec) if(!ec)
this->find_resource(socket, request); this->find_resource(socket, request);
else if(on_error)
on_error(request, ec);
}); });
} }
else else
@ -289,6 +293,8 @@ namespace SimpleWeb {
else else
this->find_resource(socket, request); this->find_resource(socket, request);
} }
else if(on_error)
on_error(request, ec);
}); });
} }
@ -370,8 +376,8 @@ namespace SimpleWeb {
http_version=stof(request->http_version); http_version=stof(request->http_version);
} }
catch(const std::exception &e){ catch(const std::exception &e){
if(exception_handler) if(on_error)
exception_handler(e); on_error(request, boost::system::error_code(boost::system::errc::protocol_error, boost::system::generic_category()));
return; return;
} }
@ -383,6 +389,8 @@ namespace SimpleWeb {
if(http_version>1.05) if(http_version>1.05)
this->read_request_and_content(response->socket); this->read_request_and_content(response->socket);
} }
else if(on_error)
on_error(request, ec);
}); });
}); });
@ -390,8 +398,8 @@ namespace SimpleWeb {
resource_function(response, request); resource_function(response, request);
} }
catch(const std::exception &e) { catch(const std::exception &e) {
if(exception_handler) if(on_error)
exception_handler(e); on_error(request, boost::system::error_code(boost::system::errc::operation_canceled, boost::system::generic_category()));
return; return;
} }
} }
@ -425,6 +433,9 @@ namespace SimpleWeb {
this->read_request_and_content(socket); this->read_request_and_content(socket);
} }
else if(on_error) {
on_error(std::shared_ptr<Request>(new Request(*socket)), ec);
}
}); });
} }
}; };

6
server_https.hpp
View file

@ -61,14 +61,18 @@ namespace SimpleWeb {
//Set timeout on the following boost::asio::ssl::stream::async_handshake //Set timeout on the following boost::asio::ssl::stream::async_handshake
auto timer=get_timeout_timer(socket, timeout_request); auto timer=get_timeout_timer(socket, timeout_request);
(*socket).async_handshake(boost::asio::ssl::stream_base::server, [this, socket, timer] socket->async_handshake(boost::asio::ssl::stream_base::server, [this, socket, timer]
(const boost::system::error_code& ec) { (const boost::system::error_code& ec) {
if(timer) if(timer)
timer->cancel(); timer->cancel();
if(!ec) if(!ec)
read_request_and_content(socket); read_request_and_content(socket);
else if(on_error)
on_error(std::shared_ptr<Request>(new Request(*socket)), ec);
}); });
} }
else if(on_error)
on_error(std::shared_ptr<Request>(new Request(*socket)), ec);
}); });
} }
}; };

4
tests/parse_test.cpp
View file

@ -13,7 +13,8 @@ public:
void accept() {} void accept() {}
bool parse_request_test() { bool parse_request_test() {
std::shared_ptr<Request> request(new Request()); HTTP socket(*io_service);
std::shared_ptr<Request> request(new Request(socket));
std::ostream stream(&request->content.streambuf); std::ostream stream(&request->content.streambuf);
stream << "GET /test/ HTTP/1.1\r\n"; stream << "GET /test/ HTTP/1.1\r\n";
@ -100,6 +101,7 @@ public:
int main() { int main() {
ServerTest serverTest; ServerTest serverTest;
serverTest.io_service=std::make_shared<boost::asio::io_service>();
if(!serverTest.parse_request_test()) { if(!serverTest.parse_request_test()) {
cerr << "FAIL Server::parse_request" << endl; cerr << "FAIL Server::parse_request" << endl;