thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CLOUD: Handle paths in marked places

Browse source 
Paths containing '../' are forbidden to use in Files Manager. There is
also a special inner black list of paths which are not used and a check
that specified path is under "savepath" or "rootpath" (from "cloud"
domain).
This commit is contained in:
Alexander Tkachev 2016-08-01 14:55:58 +06:00
parent dd9e5a95dc
commit acfa1d1f10
9 changed files with 132 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
backends/networking/sdl_net/uploadfileclienthandler.cpp
View file

@ -127,13 +127,18 @@ void UploadFileClientHandler::handleBlockHeaders(Client *client) {
if (filename.empty())
return;
// TODO: handle <filename>, <path> + <filename>
if (HandlerUtils::hasForbiddenCombinations(filename))
return;
// check that <path>/<filename> doesn't exist
Common::String path = _parentDirectoryPath;
if (path.lastChar() != '/' && path.lastChar() != '\\')
path += '/';
AbstractFSNode *originalNode = g_system->getFilesystemFactory()->makeFileNodePath(path + filename);
if (!HandlerUtils::permittedPath(originalNode->getPath())) {
setErrorMessageHandler(*client, _("Invalid path!"));
return;
}
if (originalNode->exists()) {
setErrorMessageHandler(*client, _("There is a file with that name in the parent directory!"));
return;