优化文件上传速度，增加请求头预校验功能
This commit is contained in:
UnknownObject
+228
-165
@@ -1,4 +1,4 @@
|
||||
#include "webcc/connection.h"
|
||||
#include "webcc/connection.h"
|
||||
|
||||
#include <utility>
|
||||
|
||||
@@ -10,225 +10,288 @@
|
||||
|
||||
using boost::asio::ip::tcp;
|
||||
|
||||
namespace webcc {
|
||||
namespace webcc
|
||||
{
|
||||
|
||||
Connection::Connection(tcp::socket socket, ConnectionPool* pool,
|
||||
Queue<ConnectionPtr>* queue, ViewMatcher&& view_matcher,
|
||||
std::size_t buffer_size)
|
||||
: socket_(std::move(socket)), pool_(pool), queue_(queue),
|
||||
view_matcher_(std::move(view_matcher)), buffer_(buffer_size) {
|
||||
}
|
||||
Connection::Connection(tcp::socket socket, ConnectionPool* pool,
|
||||
Queue<ConnectionPtr>* queue, ViewMatcher&& view_matcher,
|
||||
std::size_t buffer_size)
|
||||
: socket_(std::move(socket)), pool_(pool), queue_(queue),
|
||||
view_matcher_(std::move(view_matcher)), buffer_(buffer_size)
|
||||
{
|
||||
}
|
||||
|
||||
void Connection::Start() {
|
||||
request_.reset(new Request{});
|
||||
void Connection::Start()
|
||||
{
|
||||
request_.reset(new Request{});
|
||||
|
||||
boost::system::error_code ec;
|
||||
auto endpoint = socket_.remote_endpoint(ec);
|
||||
if (!ec) {
|
||||
request_->set_address(endpoint.address().to_string());
|
||||
}
|
||||
boost::system::error_code ec;
|
||||
auto endpoint = socket_.remote_endpoint(ec);
|
||||
if (!ec)
|
||||
{
|
||||
request_->set_address(endpoint.address().to_string());
|
||||
}
|
||||
|
||||
request_parser_.Init(request_.get(), view_matcher_);
|
||||
request_parser_.Init(request_.get(), view_matcher_);
|
||||
|
||||
AsyncRead();
|
||||
}
|
||||
AsyncRead();
|
||||
}
|
||||
|
||||
void Connection::Close() {
|
||||
LOG_INFO("Shutdown socket");
|
||||
void Connection::Close()
|
||||
{
|
||||
LOG_INFO("Shutdown socket");
|
||||
|
||||
// Initiate graceful connection closure.
|
||||
// Socket close VS. shutdown:
|
||||
// https://stackoverflow.com/questions/4160347/close-vs-shutdown-socket
|
||||
boost::system::error_code ec;
|
||||
socket_.shutdown(tcp::socket::shutdown_both, ec);
|
||||
// Initiate graceful connection closure.
|
||||
// Socket close VS. shutdown:
|
||||
// https://stackoverflow.com/questions/4160347/close-vs-shutdown-socket
|
||||
boost::system::error_code ec;
|
||||
socket_.shutdown(tcp::socket::shutdown_both, ec);
|
||||
|
||||
if (ec) {
|
||||
LOG_WARN("Socket shutdown error (%s)", ec.message().c_str());
|
||||
ec.clear();
|
||||
// Don't return, try to close the socket anywhere.
|
||||
}
|
||||
if (ec)
|
||||
{
|
||||
LOG_WARN("Socket shutdown error (%s)", ec.message().c_str());
|
||||
ec.clear();
|
||||
// Don't return, try to close the socket anywhere.
|
||||
}
|
||||
|
||||
LOG_INFO("Close socket");
|
||||
LOG_INFO("Close socket");
|
||||
|
||||
socket_.close(ec);
|
||||
socket_.close(ec);
|
||||
|
||||
if (ec) {
|
||||
LOG_ERRO("Socket close error (%s)", ec.message().c_str());
|
||||
}
|
||||
}
|
||||
if (ec)
|
||||
{
|
||||
LOG_ERRO("Socket close error (%s)", ec.message().c_str());
|
||||
}
|
||||
|
||||
void Connection::SendResponse(ResponsePtr response, bool no_keep_alive) {
|
||||
assert(response);
|
||||
header_validated_ = false;
|
||||
}
|
||||
|
||||
response_ = response;
|
||||
void Connection::SendResponse(ResponsePtr response, bool no_keep_alive)
|
||||
{
|
||||
assert(response);
|
||||
|
||||
if (!no_keep_alive && request_->IsConnectionKeepAlive()) {
|
||||
response_->SetHeader(headers::kConnection, "Keep-Alive");
|
||||
} else {
|
||||
response_->SetHeader(headers::kConnection, "Close");
|
||||
}
|
||||
response_ = response;
|
||||
|
||||
response_->Prepare();
|
||||
if (!no_keep_alive && request_->IsConnectionKeepAlive())
|
||||
{
|
||||
response_->SetHeader(headers::kConnection, "Keep-Alive");
|
||||
}
|
||||
else
|
||||
{
|
||||
response_->SetHeader(headers::kConnection, "Close");
|
||||
}
|
||||
|
||||
AsyncWrite();
|
||||
}
|
||||
response_->Prepare();
|
||||
|
||||
void Connection::SendResponse(Status status, bool no_keep_alive) {
|
||||
auto response = std::make_shared<Response>(status);
|
||||
header_validated_ = false;
|
||||
|
||||
// According to the testing based on HTTPie (and Chrome), the `Content-Length`
|
||||
// header is expected for a response with status like 404 even when the body
|
||||
// is empty.
|
||||
response->SetBody(std::make_shared<Body>(), true);
|
||||
AsyncWrite();
|
||||
}
|
||||
|
||||
SendResponse(response, no_keep_alive);
|
||||
}
|
||||
void Connection::SendResponse(Status status, bool no_keep_alive)
|
||||
{
|
||||
auto response = std::make_shared<Response>(status);
|
||||
|
||||
void Connection::SendResponse(Status status, std::string server_name,
|
||||
bool no_keep_alive) {
|
||||
auto response = std::make_shared<Response>(status);
|
||||
// According to the testing based on HTTPie (and Chrome), the `Content-Length`
|
||||
// header is expected for a response with status like 404 even when the body
|
||||
// is empty.
|
||||
response->SetBody(std::make_shared<Body>(), true);
|
||||
|
||||
// According to the testing based on HTTPie (and Chrome), the `Content-Length`
|
||||
// header is expected for a response with status like 404 even when the body
|
||||
// is empty.
|
||||
response->SetBody(std::make_shared<Body>(), true);
|
||||
response->SetHeader(headers::kServer, server_name);
|
||||
SendResponse(response, no_keep_alive);
|
||||
}
|
||||
|
||||
SendResponse(response, no_keep_alive);
|
||||
}
|
||||
void Connection::SendResponse(Status status, std::string server_name,
|
||||
bool no_keep_alive)
|
||||
{
|
||||
auto response = std::make_shared<Response>(status);
|
||||
|
||||
void Connection::AsyncRead() {
|
||||
// According to the testing based on HTTPie (and Chrome), the `Content-Length`
|
||||
// header is expected for a response with status like 404 even when the body
|
||||
// is empty.
|
||||
response->SetBody(std::make_shared<Body>(), true);
|
||||
response->SetHeader(headers::kServer, server_name);
|
||||
|
||||
SendResponse(response, no_keep_alive);
|
||||
}
|
||||
|
||||
void Connection::AsyncRead()
|
||||
{
|
||||
#if WEBCC_STUDY_SERVER_THREADING
|
||||
LOG_USER("[%u] AsyncRead()", (unsigned int)this);
|
||||
LOG_USER("[%u] AsyncRead()", (unsigned int)this);
|
||||
#endif
|
||||
|
||||
socket_.async_read_some(boost::asio::buffer(buffer_),
|
||||
std::bind(&Connection::OnRead, shared_from_this(),
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
}
|
||||
socket_.async_read_some(boost::asio::buffer(buffer_),
|
||||
std::bind(&Connection::OnRead, shared_from_this(),
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
}
|
||||
|
||||
void Connection::OnRead(boost::system::error_code ec, std::size_t length) {
|
||||
void Connection::OnRead(boost::system::error_code ec, std::size_t length)
|
||||
{
|
||||
#if WEBCC_STUDY_SERVER_THREADING
|
||||
LOG_USER("[%u] OnRead()", (unsigned int)this);
|
||||
LOG_USER("[%u] OnRead()", (unsigned int)this);
|
||||
#endif
|
||||
|
||||
if (ec) {
|
||||
if (ec == boost::asio::error::eof) {
|
||||
LOG_INFO("Socket read EOF (%s)", ec.message().c_str());
|
||||
} else if (ec == boost::asio::error::operation_aborted) {
|
||||
// The socket of this connection has been closed.
|
||||
// This happens, e.g., when the server was stopped by a signal (Ctrl-C).
|
||||
LOG_WARN("Socket operation aborted (%s)", ec.message().c_str());
|
||||
} else {
|
||||
LOG_ERRO("Socket read error (%s)", ec.message().c_str());
|
||||
}
|
||||
if (ec)
|
||||
{
|
||||
if (ec == boost::asio::error::eof)
|
||||
{
|
||||
LOG_INFO("Socket read EOF (%s)", ec.message().c_str());
|
||||
}
|
||||
else if (ec == boost::asio::error::operation_aborted)
|
||||
{
|
||||
// The socket of this connection has been closed.
|
||||
// This happens, e.g., when the server was stopped by a signal (Ctrl-C).
|
||||
LOG_WARN("Socket operation aborted (%s)", ec.message().c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_ERRO("Socket read error (%s)", ec.message().c_str());
|
||||
}
|
||||
|
||||
// Don't try to send any response back.
|
||||
// Don't try to send any response back.
|
||||
|
||||
if (ec != boost::asio::error::operation_aborted) {
|
||||
pool_->Close(shared_from_this());
|
||||
} // else: The socket of this connection has already been closed.
|
||||
if (ec != boost::asio::error::operation_aborted)
|
||||
{
|
||||
pool_->Close(shared_from_this());
|
||||
} // else: The socket of this connection has already been closed.
|
||||
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!request_parser_.Parse(buffer_.data(), length)) {
|
||||
LOG_ERRO("Failed to parse request");
|
||||
// Send Bad Request (400) to the client and no Keep-Alive.
|
||||
SendResponse(Status::kBadRequest, true);
|
||||
// Close the socket connection.
|
||||
pool_->Close(shared_from_this());
|
||||
return;
|
||||
}
|
||||
if (!request_parser_.Parse(buffer_.data(), length))
|
||||
{
|
||||
LOG_ERRO("Failed to parse request");
|
||||
// Send Bad Request (400) to the client and no Keep-Alive.
|
||||
SendResponse(Status::kBadRequest, true);
|
||||
// Close the socket connection.
|
||||
pool_->Close(shared_from_this());
|
||||
return;
|
||||
}
|
||||
|
||||
if (!request_parser_.finished()) {
|
||||
// Continue to read the request.
|
||||
AsyncRead();
|
||||
return;
|
||||
}
|
||||
// =================== 【最小改动：仅插入这 8 行】 ===================
|
||||
if (request_parser_.IsHeaderParsed() && !header_validated_)
|
||||
{
|
||||
header_validated_ = true;
|
||||
if (auto view = request_parser_.MatchedView())
|
||||
{
|
||||
if (!view->ValidateHeader(request_))
|
||||
{
|
||||
LOG_ERRO("Header validation failed, closing connection.");
|
||||
pool_->Close(shared_from_this());
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
// =================================================================
|
||||
|
||||
LOG_VERB("Request:\n%s", request_->Dump().c_str());
|
||||
if (!request_parser_.finished())
|
||||
{
|
||||
// Continue to read the request.
|
||||
AsyncRead();
|
||||
return;
|
||||
}
|
||||
|
||||
// Enqueue this connection once the request has been read.
|
||||
// Some worker thread will handle the request later.
|
||||
queue_->Push(shared_from_this());
|
||||
}
|
||||
LOG_VERB("Request:\n%s", request_->Dump().c_str());
|
||||
|
||||
void Connection::AsyncWrite() {
|
||||
// Enqueue this connection once the request has been read.
|
||||
// Some worker thread will handle the request later.
|
||||
queue_->Push(shared_from_this());
|
||||
}
|
||||
|
||||
void Connection::AsyncWrite()
|
||||
{
|
||||
#if WEBCC_STUDY_SERVER_THREADING
|
||||
LOG_USER("[%u] AsyncWrite()", (unsigned int)this);
|
||||
LOG_USER("[%u] AsyncWrite()", (unsigned int)this);
|
||||
#endif
|
||||
|
||||
LOG_VERB("Response:\n%s", response_->Dump().c_str());
|
||||
LOG_VERB("Response:\n%s", response_->Dump().c_str());
|
||||
|
||||
// Firstly, write the headers.
|
||||
boost::asio::async_write(socket_, response_->GetPayload(),
|
||||
std::bind(&Connection::OnWriteHeaders,
|
||||
shared_from_this(), std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
}
|
||||
// Firstly, write the headers.
|
||||
boost::asio::async_write(socket_, response_->GetPayload(),
|
||||
std::bind(&Connection::OnWriteHeaders,
|
||||
shared_from_this(), std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
}
|
||||
|
||||
void Connection::OnWriteHeaders(boost::system::error_code ec,
|
||||
std::size_t length) {
|
||||
void Connection::OnWriteHeaders(boost::system::error_code ec,
|
||||
std::size_t length)
|
||||
{
|
||||
#if WEBCC_STUDY_SERVER_THREADING
|
||||
LOG_USER("[%u] OnWriteHeaders()", (unsigned int)this);
|
||||
LOG_USER("[%u] OnWriteHeaders()", (unsigned int)this);
|
||||
#endif
|
||||
|
||||
if (ec) {
|
||||
HandleWriteError(ec);
|
||||
} else {
|
||||
// Write the body payload by payload.
|
||||
response_->body()->InitPayload();
|
||||
AsyncWriteBody();
|
||||
}
|
||||
}
|
||||
if (ec)
|
||||
{
|
||||
HandleWriteError(ec);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Write the body payload by payload.
|
||||
response_->body()->InitPayload();
|
||||
AsyncWriteBody();
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::AsyncWriteBody() {
|
||||
auto payload = response_->body()->NextPayload();
|
||||
void Connection::AsyncWriteBody()
|
||||
{
|
||||
auto payload = response_->body()->NextPayload();
|
||||
|
||||
if (!payload.empty()) {
|
||||
boost::asio::async_write(socket_, payload,
|
||||
std::bind(&Connection::OnWriteBody,
|
||||
shared_from_this(),
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
} else {
|
||||
// No more body payload left, we're done.
|
||||
HandleWriteOK();
|
||||
}
|
||||
}
|
||||
if (!payload.empty())
|
||||
{
|
||||
boost::asio::async_write(socket_, payload,
|
||||
std::bind(&Connection::OnWriteBody,
|
||||
shared_from_this(),
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2));
|
||||
}
|
||||
else
|
||||
{
|
||||
// No more body payload left, we're done.
|
||||
HandleWriteOK();
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::OnWriteBody(boost::system::error_code ec, std::size_t length) {
|
||||
void Connection::OnWriteBody(boost::system::error_code ec, std::size_t length)
|
||||
{
|
||||
#if WEBCC_STUDY_SERVER_THREADING
|
||||
LOG_USER("[%u] OnWriteBody()", (unsigned int)this);
|
||||
LOG_USER("[%u] OnWriteBody()", (unsigned int)this);
|
||||
#endif
|
||||
|
||||
if (ec) {
|
||||
HandleWriteError(ec);
|
||||
} else {
|
||||
AsyncWriteBody();
|
||||
}
|
||||
}
|
||||
if (ec)
|
||||
{
|
||||
HandleWriteError(ec);
|
||||
}
|
||||
else
|
||||
{
|
||||
AsyncWriteBody();
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::HandleWriteOK() {
|
||||
LOG_INFO("Response has been sent back");
|
||||
void Connection::HandleWriteOK()
|
||||
{
|
||||
LOG_INFO("Response has been sent back");
|
||||
|
||||
if (request_->IsConnectionKeepAlive()) {
|
||||
LOG_INFO("The client asked for a keep-alive connection");
|
||||
LOG_INFO("Continue to read the next request");
|
||||
Start();
|
||||
} else {
|
||||
pool_->Close(shared_from_this());
|
||||
}
|
||||
}
|
||||
if (request_->IsConnectionKeepAlive())
|
||||
{
|
||||
LOG_INFO("The client asked for a keep-alive connection");
|
||||
LOG_INFO("Continue to read the next request");
|
||||
Start();
|
||||
}
|
||||
else
|
||||
{
|
||||
pool_->Close(shared_from_this());
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::HandleWriteError(boost::system::error_code ec) {
|
||||
LOG_ERRO("Socket write error (%s)", ec.message().c_str());
|
||||
void Connection::HandleWriteError(boost::system::error_code ec)
|
||||
{
|
||||
LOG_ERRO("Socket write error (%s)", ec.message().c_str());
|
||||
|
||||
if (ec != boost::asio::error::operation_aborted) {
|
||||
pool_->Close(shared_from_this());
|
||||
}
|
||||
}
|
||||
if (ec != boost::asio::error::operation_aborted)
|
||||
{
|
||||
pool_->Close(shared_from_this());
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace webcc
|
||||
|
||||
Reference in New Issue
Block a user