Martchus
/
arch-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling of head requests 

* Fix condition for skipping
* Open destination file only if the request is not skipped (when doing a
  head request first)
This commit is contained in:
Martchus 2022-02-02 21:18:07 +01:00
parent 90379678ad
commit 4ed645be94
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
librepomgr/webclient/session.cpp
View File

@ -41,6 +41,20 @@ void Session::setChunkHandler(ChunkHandler &&handler)
m_chunkProcessing->handler = std::move(handler);
}
bool LibRepoMgr::WebClient::Session::openDestinationFile()
{
auto &fileResponse = response.emplace<FileResponse>();
boost::beast::error_code errorCode;
fileResponse.body_limit(m_bodyLimit);
fileResponse.get().body().open(destinationFilePath.data(), file_mode::write, errorCode);
if (errorCode != boost::beast::errc::success) {
m_handler(*this, HttpClientError("opening output file", errorCode));
m_handler = decltype(m_handler)();
return false;
}
return true;
}
void Session::run(
const char *host, const char *port, http::verb verb, const char *target, std::optional<std::uint64_t> bodyLimit, unsigned int version)
{
@ -61,15 +75,11 @@ void Session::run(
request.set(http::field::host, host);
request.set(http::field::user_agent, APP_NAME " " APP_VERSION);
method = verb;
m_bodyLimit = bodyLimit.value_or(500 * 1024 * 1024);
// setup a file response
if (!destinationFilePath.empty()) {
auto &fileResponse = response.emplace<FileResponse>();
boost::beast::error_code errorCode;
fileResponse.body_limit(bodyLimit.value_or(500 * 1024 * 1024));
fileResponse.get().body().open(destinationFilePath.data(), file_mode::write, errorCode);
if (errorCode != boost::beast::errc::success) {
m_handler(*this, HttpClientError("opening output file", errorCode));
if (!m_headHandler && !openDestinationFile()) {
return;
}
} else if (m_chunkProcessing) {
@ -260,7 +270,7 @@ void Session::headReceived(boost::beast::error_code ec, std::size_t bytesTransfe
}
m_headHandler(*this);
m_headHandler = HeadHandler();
if (skip) {
if (!skip && (destinationFilePath.empty() || openDestinationFile())) {
sendRequest();
} else {
closeGracefully();
@ -285,14 +295,18 @@ void Session::closeGracefully()
sslStream->async_shutdown(std::bind(&Session::closed, shared_from_this(), std::placeholders::_1));
} else if (auto *const socket = std::get_if<RawSocket>(&m_stream)) {
socket->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
m_handler(*this, ec && ec != boost::beast::errc::not_connected ? HttpClientError("closing connection", ec) : HttpClientError());
if (m_handler) {
m_handler(*this, ec && ec != boost::beast::errc::not_connected ? HttpClientError("closing connection", ec) : HttpClientError());
}
}
}
void Session::closed(boost::beast::error_code ec)
{
// rationale regarding boost::asio::error::eof: http://stackoverflow.com/questions/25587403/boost-asio-ssl-async-shutdown-always-finishes-with-an-error
m_handler(*this, ec && ec != boost::asio::error::eof ? HttpClientError("closing connection", ec) : HttpClientError());
if (m_handler) {
m_handler(*this, ec && ec != boost::asio::error::eof ? HttpClientError("closing connection", ec) : HttpClientError());
}
}
std::variant<std::string, std::shared_ptr<Session>> runSessionFromUrl(boost::asio::io_context &ioContext, boost::asio::ssl::context &sslContext,

2
librepomgr/webclient/session.h
View File

@ -83,6 +83,7 @@ private:
RawSocket &socket();
bool openDestinationFile();
void resolved(boost::beast::error_code ec, boost::asio::ip::tcp::resolver::results_type results);
void connected(boost::beast::error_code ec);
void handshakeDone(boost::beast::error_code ec);
@ -114,6 +115,7 @@ private:
Request m_headRequest;
Handler m_handler;
HeadHandler m_headHandler;
std::uint64_t m_bodyLimit;
};
template <typename ResponseType>