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

loolwsd: invert this condition, so it's possible to add other cases

Browse source
This commit is contained in:
Miklos Vajna 2015-10-16 15:47:39 +02:00
parent 700b7d08b7
commit 63bf9a1329
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
loolwsd/LOOLWSD.cpp
View file

@ -201,26 +201,29 @@ public:
{
// The user might request a file to download
StringTokenizer tokens(request.getURI(), "/");
if (tokens.count() != 4)
if (tokens.count() == 4)
{
response.setStatus(HTTPResponse::HTTP_BAD_REQUEST);
response.setContentLength(0);
response.send();
}
std::string dirPath = LOOLWSD::childRoot + "/" + tokens[1] + LOOLSession::jailDocumentURL + "/" + tokens[2];
std::string filePath = dirPath + "/" + tokens[3];
std::cout << Util::logPrefix() << "HTTP request for: " << filePath << std::endl;
File file(filePath);
if (file.exists())
{
response.set("Access-Control-Allow-Origin", "*");
response.sendFile(filePath, "application/octet-stream");
File dir(dirPath);
dir.remove(true);
std::string dirPath = LOOLWSD::childRoot + "/" + tokens[1] + LOOLSession::jailDocumentURL + "/" + tokens[2];
std::string filePath = dirPath + "/" + tokens[3];
std::cout << Util::logPrefix() << "HTTP request for: " << filePath << std::endl;
File file(filePath);
if (file.exists())
{
response.set("Access-Control-Allow-Origin", "*");
response.sendFile(filePath, "application/octet-stream");
File dir(dirPath);
dir.remove(true);
}
else
{
response.setStatus(HTTPResponse::HTTP_NOT_FOUND);
response.setContentLength(0);
response.send();
}
}
else
{
response.setStatus(HTTPResponse::HTTP_NOT_FOUND);
response.setStatus(HTTPResponse::HTTP_BAD_REQUEST);
response.setContentLength(0);
response.send();
}