Might add HTTPS support, and a simple client. Added namespace and some restructuring preparing for HTTPS especially.
This commit is contained in:
eidheim
parent
1f4ed9d4a3
commit
4f5522adb9
4 changed files with 175 additions and 183 deletions
135
httpserver.cpp
135
httpserver.cpp
|
|
@ -1,135 +0,0 @@
|
|||
#include "httpserver.hpp"
|
||||
|
||||
HTTPServer::HTTPServer(unsigned short port, size_t num_threads=1) : endpoint(ip::tcp::v4(), port),
|
||||
acceptor(m_io_service, endpoint), num_threads(num_threads) {}
|
||||
|
||||
void HTTPServer::start() {
|
||||
accept();
|
||||
|
||||
//If num_threads>1, start m_io_service.run() in (num_threads-1) threads for thread-pooling
|
||||
for(size_t c=1;c<num_threads;c++) {
|
||||
threads.emplace_back([this](){
|
||||
m_io_service.run();
|
||||
});
|
||||
}
|
||||
|
||||
//Main thread
|
||||
m_io_service.run();
|
||||
|
||||
//Wait for the rest of the threads, if any, to finish as well
|
||||
for(thread& t: threads) {
|
||||
t.join();
|
||||
}
|
||||
}
|
||||
|
||||
void HTTPServer::accept() {
|
||||
//Create new socket for this connection
|
||||
//Shared_ptr is used to pass temporary objects to the asynchronous functions
|
||||
shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(m_io_service));
|
||||
|
||||
acceptor.async_accept(*socket, [this, socket](const boost::system::error_code& ec) {
|
||||
//Immediately start accepting a new connection
|
||||
accept();
|
||||
|
||||
if(!ec) {
|
||||
process_request_and_respond(socket);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void HTTPServer::process_request_and_respond(shared_ptr<ip::tcp::socket> socket) {
|
||||
//Create new read_buffer for async_read_until()
|
||||
//Shared_ptr is used to pass temporary objects to the asynchronous functions
|
||||
shared_ptr<boost::asio::streambuf> read_buffer(new boost::asio::streambuf);
|
||||
|
||||
async_read_until(*socket, *read_buffer, "\r\n\r\n",
|
||||
[this, socket, read_buffer](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
if(!ec) {
|
||||
//read_buffer->size() is not necessarily the same as bytes_transferred, from Boost-docs:
|
||||
//"After a successful async_read_until operation, the streambuf may contain additional data beyond the delimiter"
|
||||
//The chosen solution is to extract lines from the stream directly when parsing the header. What is left of the
|
||||
//read_buffer (maybe some bytes of the content) is appended to in the async_read-function below (for retrieving content).
|
||||
size_t total=read_buffer->size();
|
||||
|
||||
//Convert to istream to extract string-lines
|
||||
istream stream(read_buffer.get());
|
||||
|
||||
shared_ptr<Request> request(new Request());
|
||||
*request=parse_request(stream);
|
||||
|
||||
size_t num_additional_bytes=total-bytes_transferred;
|
||||
|
||||
//If content, read that as well
|
||||
if(request->header.count("Content-Length")>0) {
|
||||
async_read(*socket, *read_buffer, transfer_exactly(stoull(request->header["Content-Length"])-num_additional_bytes),
|
||||
[this, socket, read_buffer, request](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
if(!ec) {
|
||||
//Store pointer to read_buffer as istream object
|
||||
request->content=shared_ptr<istream>(new istream(read_buffer.get()));
|
||||
|
||||
respond(socket, request);
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
respond(socket, request);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Request HTTPServer::parse_request(istream& stream) {
|
||||
Request request;
|
||||
|
||||
regex e("^([^ ]*) ([^ ]*) HTTP/([^ ]*)$");
|
||||
|
||||
smatch sm;
|
||||
|
||||
//First parse request method, path, and HTTP-version from the first line
|
||||
string line;
|
||||
getline(stream, line);
|
||||
line.pop_back();
|
||||
if(regex_match(line, sm, e)) {
|
||||
request.method=sm[1];
|
||||
request.path=sm[2];
|
||||
request.http_version=sm[3];
|
||||
|
||||
bool matched;
|
||||
e="^([^:]*): ?(.*)$";
|
||||
//Parse the rest of the header
|
||||
do {
|
||||
getline(stream, line);
|
||||
line.pop_back();
|
||||
matched=regex_match(line, sm, e);
|
||||
if(matched) {
|
||||
request.header[sm[1]]=sm[2];
|
||||
}
|
||||
|
||||
} while(matched==true);
|
||||
}
|
||||
|
||||
return request;
|
||||
}
|
||||
|
||||
void HTTPServer::respond(shared_ptr<ip::tcp::socket> socket, shared_ptr<Request> request) {
|
||||
//Find path- and method-match, and generate response
|
||||
for(auto& res: resources) {
|
||||
regex e(res.first);
|
||||
smatch sm_res;
|
||||
if(regex_match(request->path, sm_res, e)) {
|
||||
if(res.second.count(request->method)>0) {
|
||||
shared_ptr<boost::asio::streambuf> write_buffer(new boost::asio::streambuf);
|
||||
ostream response(write_buffer.get());
|
||||
res.second[request->method](response, *request, sm_res);
|
||||
|
||||
//Capture write_buffer in lambda so it is not destroyed before async_write is finished
|
||||
async_write(*socket, *write_buffer, [this, socket, request, write_buffer](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
//HTTP persistent connection (HTTP 1.1):
|
||||
if(!ec && stof(request->http_version)>1.05)
|
||||
process_request_and_respond(socket);
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
#ifndef HTTPSERVER_HPP
|
||||
#define HTTPSERVER_HPP
|
||||
|
||||
#include <boost/asio.hpp>
|
||||
|
||||
#include <regex>
|
||||
#include <unordered_map>
|
||||
#include <thread>
|
||||
|
||||
using namespace std;
|
||||
using namespace boost::asio;
|
||||
|
||||
struct Request {
|
||||
string method, path, http_version;
|
||||
|
||||
shared_ptr<istream> content;
|
||||
|
||||
unordered_map<string, string> header;
|
||||
};
|
||||
|
||||
class HTTPServer {
|
||||
public:
|
||||
unordered_map<string, unordered_map<string, function<void(ostream&, const Request&, const smatch&)> > > resources;
|
||||
|
||||
HTTPServer(unsigned short, size_t);
|
||||
|
||||
void start();
|
||||
|
||||
private:
|
||||
io_service m_io_service;
|
||||
ip::tcp::endpoint endpoint;
|
||||
ip::tcp::acceptor acceptor;
|
||||
size_t num_threads;
|
||||
vector<thread> threads;
|
||||
|
||||
void accept();
|
||||
|
||||
void process_request_and_respond(shared_ptr<ip::tcp::socket> socket);
|
||||
|
||||
Request parse_request(istream& stream);
|
||||
|
||||
void respond(shared_ptr<ip::tcp::socket> socket, shared_ptr<Request> request);
|
||||
};
|
||||
|
||||
#endif /* HTTPSERVER_HPP */
|
||||
|
||||
5
main.cpp
5
main.cpp
|
|
@ -1,16 +1,17 @@
|
|||
#include "httpserver.hpp"
|
||||
#include "server.hpp"
|
||||
|
||||
//Added for the json-example:
|
||||
#include <boost/property_tree/ptree.hpp>
|
||||
#include <boost/property_tree/json_parser.hpp>
|
||||
|
||||
using namespace std;
|
||||
using namespace SimpleWeb;
|
||||
//Added for the json-example:
|
||||
using namespace boost::property_tree;
|
||||
|
||||
int main() {
|
||||
//HTTP-server at port 8080 using 4 threads
|
||||
HTTPServer httpserver(8080, 4);
|
||||
Server<HTTP> httpserver(8080, 4);
|
||||
|
||||
//Add resources using regular expression for path, a method-string, and an anonymous function
|
||||
//POST-example for the path /string, responds the posted string
|
||||
|
|
|
|||
172
server.hpp
Normal file
172
server.hpp
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
#ifndef SERVER_HPP
|
||||
#define SERVER_HPP
|
||||
|
||||
#include <boost/asio.hpp>
|
||||
|
||||
#include <regex>
|
||||
#include <unordered_map>
|
||||
#include <thread>
|
||||
|
||||
using namespace std;
|
||||
using namespace boost::asio;
|
||||
|
||||
namespace SimpleWeb {
|
||||
typedef ip::tcp::socket HTTP;
|
||||
|
||||
struct Request {
|
||||
string method, path, http_version;
|
||||
|
||||
shared_ptr<istream> content;
|
||||
|
||||
unordered_map<string, string> header;
|
||||
};
|
||||
|
||||
template <class type>
|
||||
class Server {
|
||||
public:
|
||||
unordered_map<string, unordered_map<string, function<void(ostream&, const Request&, const smatch&)> > > resources;
|
||||
|
||||
Server(unsigned short port, size_t num_threads=1) : endpoint(ip::tcp::v4(), port),
|
||||
acceptor(m_io_service, endpoint), num_threads(num_threads) {}
|
||||
|
||||
void start() {
|
||||
accept();
|
||||
|
||||
//If num_threads>1, start m_io_service.run() in (num_threads-1) threads for thread-pooling
|
||||
for(size_t c=1;c<num_threads;c++) {
|
||||
threads.emplace_back([this](){
|
||||
m_io_service.run();
|
||||
});
|
||||
}
|
||||
|
||||
//Main thread
|
||||
m_io_service.run();
|
||||
|
||||
//Wait for the rest of the threads, if any, to finish as well
|
||||
for(thread& t: threads) {
|
||||
t.join();
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
io_service m_io_service;
|
||||
ip::tcp::endpoint endpoint;
|
||||
ip::tcp::acceptor acceptor;
|
||||
size_t num_threads;
|
||||
vector<thread> threads;
|
||||
|
||||
void accept() {
|
||||
//Create new socket for this connection
|
||||
//Shared_ptr is used to pass temporary objects to the asynchronous functions
|
||||
shared_ptr<type> socket(new type(m_io_service));
|
||||
|
||||
acceptor.async_accept(*socket, [this, socket](const boost::system::error_code& ec) {
|
||||
//Immediately start accepting a new connection
|
||||
accept();
|
||||
|
||||
if(!ec) {
|
||||
process_request_and_respond(socket);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void process_request_and_respond(shared_ptr<type> socket) {
|
||||
//Create new read_buffer for async_read_until()
|
||||
//Shared_ptr is used to pass temporary objects to the asynchronous functions
|
||||
shared_ptr<boost::asio::streambuf> read_buffer(new boost::asio::streambuf);
|
||||
|
||||
async_read_until(*socket, *read_buffer, "\r\n\r\n",
|
||||
[this, socket, read_buffer](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
if(!ec) {
|
||||
//read_buffer->size() is not necessarily the same as bytes_transferred, from Boost-docs:
|
||||
//"After a successful async_read_until operation, the streambuf may contain additional data beyond the delimiter"
|
||||
//The chosen solution is to extract lines from the stream directly when parsing the header. What is left of the
|
||||
//read_buffer (maybe some bytes of the content) is appended to in the async_read-function below (for retrieving content).
|
||||
size_t total=read_buffer->size();
|
||||
|
||||
//Convert to istream to extract string-lines
|
||||
istream stream(read_buffer.get());
|
||||
|
||||
shared_ptr<Request> request(new Request());
|
||||
*request=parse_request(stream);
|
||||
|
||||
size_t num_additional_bytes=total-bytes_transferred;
|
||||
|
||||
//If content, read that as well
|
||||
if(request->header.count("Content-Length")>0) {
|
||||
async_read(*socket, *read_buffer, transfer_exactly(stoull(request->header["Content-Length"])-num_additional_bytes),
|
||||
[this, socket, read_buffer, request](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
if(!ec) {
|
||||
//Store pointer to read_buffer as istream object
|
||||
request->content=shared_ptr<istream>(new istream(read_buffer.get()));
|
||||
|
||||
respond(socket, request);
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
respond(socket, request);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Request parse_request(istream& stream) {
|
||||
Request request;
|
||||
|
||||
regex e("^([^ ]*) ([^ ]*) HTTP/([^ ]*)$");
|
||||
|
||||
smatch sm;
|
||||
|
||||
//First parse request method, path, and HTTP-version from the first line
|
||||
string line;
|
||||
getline(stream, line);
|
||||
line.pop_back();
|
||||
if(regex_match(line, sm, e)) {
|
||||
request.method=sm[1];
|
||||
request.path=sm[2];
|
||||
request.http_version=sm[3];
|
||||
|
||||
bool matched;
|
||||
e="^([^:]*): ?(.*)$";
|
||||
//Parse the rest of the header
|
||||
do {
|
||||
getline(stream, line);
|
||||
line.pop_back();
|
||||
matched=regex_match(line, sm, e);
|
||||
if(matched) {
|
||||
request.header[sm[1]]=sm[2];
|
||||
}
|
||||
|
||||
} while(matched==true);
|
||||
}
|
||||
|
||||
return request;
|
||||
}
|
||||
|
||||
void respond(shared_ptr<type> socket, shared_ptr<Request> request) {
|
||||
//Find path- and method-match, and generate response
|
||||
for(auto& res: resources) {
|
||||
regex e(res.first);
|
||||
smatch sm_res;
|
||||
if(regex_match(request->path, sm_res, e)) {
|
||||
if(res.second.count(request->method)>0) {
|
||||
shared_ptr<boost::asio::streambuf> write_buffer(new boost::asio::streambuf);
|
||||
ostream response(write_buffer.get());
|
||||
res.second[request->method](response, *request, sm_res);
|
||||
|
||||
//Capture write_buffer in lambda so it is not destroyed before async_write is finished
|
||||
async_write(*socket, *write_buffer, [this, socket, request, write_buffer](const boost::system::error_code& ec, size_t bytes_transferred) {
|
||||
//HTTP persistent connection (HTTP 1.1):
|
||||
if(!ec && stof(request->http_version)>1.05)
|
||||
process_request_and_respond(socket);
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
#endif /* SERVER_HPP */
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue