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

loolwsd: improved WopiStorage with working PutFile

Browse source 
Change-Id: I2bba701ca0c89783851757e91e9336a64f6f6c52
Reviewed-on: https://gerrit.libreoffice.org/23208
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2016-03-11 13:45:13 -05:00 committed by Ashod Nakashian
parent e014b0b22f
commit 52d9e2033c
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
loolwsd/Storage.hpp
View file

@ -15,6 +15,7 @@
#include <fstream> #include <fstream>
#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/HTTPResponse.h>
#include <Poco/StreamCopier.h>
#include "Common.hpp" #include "Common.hpp"
#include "Auth.hpp" #include "Auth.hpp"
@ -61,11 +62,18 @@ public:
/// Writes the contents of the file back to the source. /// Writes the contents of the file back to the source.
virtual bool saveLocalFileToStorage() = 0; virtual bool saveLocalFileToStorage() = 0;
static
size_t getFileSize(const std::string& filename)
{
return std::ifstream(filename, std::ifstream::ate | std::ifstream::binary).tellg();
}
protected: protected:
const std::string _localStorePath; const std::string _localStorePath;
const std::string _jailPath; const std::string _jailPath;
const std::string _uri; const std::string _uri;
std::string _jailedFilePath; std::string _jailedFilePath;
std::string _filename;
}; };
/// Trivial implementation of local storage that does not need do anything. /// Trivial implementation of local storage that does not need do anything.
@ -168,10 +176,7 @@ public:
Poco::Net::HTTPResponse response; Poco::Net::HTTPResponse response;
std::istream& rs = session.receiveResponse(response); std::istream& rs = session.receiveResponse(response);
Log::info() << "WOPI::GetFile Status for URI [" << _uri << "]: " auto logger = Log::trace();
<< response.getStatus() << " " << response.getReason() << Log::end;
auto logger = Log::debug();
logger << "WOPI::GetFile header for URI [" << _uri << "]:\n"; logger << "WOPI::GetFile header for URI [" << _uri << "]:\n";
for (auto& pair : response) for (auto& pair : response)
{ {
@ -181,31 +186,50 @@ public:
logger << Log::end; logger << Log::end;
//TODO: Get proper filename. //TODO: Get proper filename.
const auto filename = "filename"; _filename = "filename";
_jailedFilePath = Poco::Path(getLocalRootPath(), filename).toString(); _jailedFilePath = Poco::Path(getLocalRootPath(), _filename).toString();
std::ofstream ofs(_jailedFilePath); std::ofstream ofs(_jailedFilePath);
std::copy(std::istreambuf_iterator<char>(rs), std::copy(std::istreambuf_iterator<char>(rs),
std::istreambuf_iterator<char>(), std::istreambuf_iterator<char>(),
std::ostreambuf_iterator<char>(ofs)); std::ostreambuf_iterator<char>(ofs));
const auto size = getFileSize(_jailedFilePath);
Log::info() << "WOPI::GetFile downloaded " << size << " bytes from [" << _uri
<< "] -> " << _jailedFilePath << ": "
<< response.getStatus() << " " << response.getReason() << Log::end;
// Now return the jailed path. // Now return the jailed path.
return Poco::Path(_jailPath, filename).toString(); return Poco::Path(_jailPath, _filename).toString();
} }
bool saveLocalFileToStorage() override bool saveLocalFileToStorage() override
{ {
Log::info("Uploading URI [" + _uri + "] from [" + _jailedFilePath + "].");
const auto size = getFileSize(_jailedFilePath);
Poco::URI uriObject(_uri); Poco::URI uriObject(_uri);
Poco::Net::HTTPClientSession session(uriObject.getHost(), uriObject.getPort()); Poco::Net::HTTPClientSession session(uriObject.getHost(), uriObject.getPort());
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, _uri, Poco::Net::HTTPMessage::HTTP_1_1); Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, uriObject.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
request.set("X-WOPIOverride", "PUT");
request.setContentType("application/octet-stream");
request.setContentLength(size);
std::ostream& os = session.sendRequest(request);
std::ifstream ifs(_jailedFilePath); std::ifstream ifs(_jailedFilePath);
request.read(ifs); Poco::StreamCopier::copyStream(ifs, os);
Poco::Net::HTTPResponse response; Poco::Net::HTTPResponse response;
session.sendRequest(request); std::istream& rs = session.receiveResponse(response);
Log::info() << "WOPI::PutFile Status: " << response.getStatus() << " " << response.getReason() << Log::end; std::ostringstream oss;
Poco::StreamCopier::copyStream(rs, oss);
return (response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK); Log::info("WOPI::PutFile response: " + oss.str());
const auto success = (response.getStatus() == Poco::Net::HTTPResponse::HTTP_OK);
Log::info() << "WOPI::PutFile uploaded " << size << " bytes from [" << _jailedFilePath << "]:"
<< "] -> [" << _uri << "]: "
<< response.getStatus() << " " << response.getReason() << Log::end;
return success;
} }
}; };