strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsd: storage: GetFileInfo with http::Request

Browse source 
Change-Id: Id04ece6918b084f5192ca357220afff6bf9fc987
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
This commit is contained in:
Ashod Nakashian 2020-12-05 18:41:16 -05:00 committed by Ashod Nakashian
parent f5f1a64591
commit 550bddc27b
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
wsd/Storage.cpp
View file

@ -649,19 +649,16 @@ std::unique_ptr<WopiStorage::WOPIFileInfo> WopiStorage::getWOPIFileInfo(const Au
std::chrono::milliseconds callDurationMs;
try
{
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
uriObject.getPathAndQuery(),
Poco::Net::HTTPMessage::HTTP_1_1);
initHttpRequest(request, uriObject, auth, cookies);
std::shared_ptr<http::Session> httpSession = getHttpSession(uriObject);
http::Request httpRequest = initHttpRequest(uriObject, auth, cookies);
const auto startTime = std::chrono::steady_clock::now();
std::unique_ptr<Poco::Net::HTTPClientSession> psession(getHTTPClientSession(uriObject));
Log::StreamLogger logger = Log::trace();
if (logger.enabled())
{
logger << "WOPI::CheckFileInfo request header for URI [" << uriAnonym << "]:\n";
for (const auto& pair : request)
for (const auto& pair : httpRequest.header())
{
logger << '\t' << pair.first << ": " << pair.second << " / ";
}
@ -669,33 +666,39 @@ std::unique_ptr<WopiStorage::WOPIFileInfo> WopiStorage::getWOPIFileInfo(const Au
LOG_END(logger, true);
}
psession->sendRequest(request);
httpSession->syncRequest(httpRequest);
std::shared_ptr<const http::Response> httpResponse = httpSession->response();
Poco::Net::HTTPResponse response;
std::istream& rs = psession->receiveResponse(response);
callDurationMs = std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - startTime);
Log::StreamLogger logRes = Log::trace();
// Note: we don't log the response if obfuscation is enabled, except for failures.
wopiResponse = httpResponse->getBody();
const bool failed
= (httpResponse->statusLine().statusCode() != Poco::Net::HTTPResponse::HTTP_OK);
Log::StreamLogger logRes = failed ? Log::error() : Log::trace();
if (logRes.enabled())
{
logRes << "WOPI::CheckFileInfo response header for URI [" << uriAnonym
<< "]: " << response.getStatus() << '\n';
for (const auto& pair : response)
logRes << "WOPI::CheckFileInfo " << (failed ? "failed" : "returned") << " for URI ["
<< uriAnonym << "]: " << httpResponse->statusLine().statusCode() << ' '
<< httpResponse->statusLine().reasonPhrase() << ". Headers: ";
for (const auto& pair : httpResponse->header())
{
logRes << '\t' << pair.first << ": " << pair.second << " / ";
}
if (failed)
logRes << "\tBody: [" << wopiResponse << "]";
LOG_END(logRes, true);
}
if (response.getStatus() != Poco::Net::HTTPResponse::HTTP_OK)
if (failed)
{
LOG_ERR("WOPI::CheckFileInfo failed with " << response.getStatus() << ' ' << response.getReason());
throw StorageConnectionException("WOPI::CheckFileInfo failed");
throw StorageConnectionException("WOPI::CheckFileInfo failed: " + wopiResponse);
}
Poco::StreamCopier::copyToString(rs, wopiResponse);
}
catch (const Poco::Exception& pexc)
{