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

CLOUD: Add UploadFileHandler

Browse source
This commit is contained in:
Alexander Tkachev 2016-07-08 16:00:11 +06:00
parent f3ee9e3272
commit f0fc18d2ee
9 changed files with 253 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backends/module.mk
View file

@ -65,6 +65,7 @@ MODULE_OBJS += \
networking/sdl_net/handlers/filespagehandler.o \
networking/sdl_net/handlers/indexpagehandler.o \
networking/sdl_net/handlers/resourcehandler.o \
networking/sdl_net/handlers/uploadfilehandler.o \
networking/sdl_net/localwebserver.o \
networking/sdl_net/reader.o
endif

2
backends/networking/sdl_net/client.cpp
View file

@ -116,6 +116,8 @@ Common::String Client::query() const { return _reader.query(); }
Common::String Client::queryParameter(Common::String name) const { return _reader.queryParameter(name); }
Common::String Client::attachedFile(Common::String name) const { return _reader.attachedFile(name); }
Common::String Client::anchor() const { return _reader.anchor(); }
bool Client::socketIsReady() { return SDLNet_SocketReady(_socket); }

1
backends/networking/sdl_net/client.h
View file

@ -72,6 +72,7 @@ public:
Common::String path() const;
Common::String query() const;
Common::String queryParameter(Common::String name) const;
Common::String attachedFile(Common::String name) const;
Common::String anchor() const;
/**

187
backends/networking/sdl_net/handlers/uploadfilehandler.cpp Normal file
View file

@ -0,0 +1,187 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "backends/networking/sdl_net/handlers/uploadfilehandler.h"
#include "backends/networking/sdl_net/localwebserver.h"
#include "backends/fs/fs-factory.h"
#include "common/file.h"
#include "common/translation.h"
namespace Networking {
#define INDEX_PAGE_NAME ".index.html"
UploadFileHandler::UploadFileHandler() {}
UploadFileHandler::~UploadFileHandler() {}
void UploadFileHandler::handle(Client &client) {
Common::String errorMessage = "";
// show an error message if failed to upload the file
if (!uploadFile(client, errorMessage)) {
handleErrorMessage(
client,
Common::String::format(
"%s<br/><a href=\"files?path=%s\">%s</a>",
errorMessage.c_str(),
"%2F", //that's encoded "/"
_("Back to the files manager")
)
);
return;
}
Common::String response = "<html><head><title>ScummVM</title></head><body>{message}</body></html>";
// load stylish response page from the archive
Common::SeekableReadStream *const stream = getArchiveFile(INDEX_PAGE_NAME);
if (stream) response = readEverythingFromStream(stream);
replace(response, "{message}", Common::String::format(
"%s<br/><a href=\"files?path=%s\">%s</a>",
_("Uploaded successfully!"),
client.queryParameter("path").c_str(),
_("Back to parent directory")
)
);
LocalWebserver::setClientRedirectHandler(
client, response,
"/files?path=" + LocalWebserver::urlEncodeQueryParameterValue(client.queryParameter("path"))
);
}
void UploadFileHandler::handleErrorMessage(Client &client, Common::String message) {
Common::String response = "<html><head><title>ScummVM</title></head><body>{message}</body></html>";
// load stylish response page from the archive
Common::SeekableReadStream *const stream = getArchiveFile(INDEX_PAGE_NAME);
if (stream) response = readEverythingFromStream(stream);
replace(response, "{message}", message);
LocalWebserver::setClientGetHandler(client, response);
}
namespace {
bool copyStream(Common::ReadStream *from, Common::WriteStream *into) {
assert(from);
assert(into);
const uint32 BUFFER_SIZE = 1 * 1024 * 1024;
void *buffer = malloc(BUFFER_SIZE);
bool success = true;
assert(buffer);
while (!from->eos()) {
uint32 readBytes = from->read(buffer, BUFFER_SIZE);
if (from->err()) {
warning("copyStream: failed to read bytes from the stream");
success = false;
break;
}
if (readBytes != 0)
if (into->write(buffer, readBytes) != readBytes || into->err()) {
warning("copyStream: failed to write all bytes into the file");
success = false;
break;
}
}
free(buffer);
return success;
}
}
bool UploadFileHandler::uploadFile(Client &client, Common::String &errorMessage) {
Common::String path = client.queryParameter("path");
Common::String originalFilename = client.queryParameter("upload_file");
Common::String tempFilename = client.attachedFile(originalFilename);
debug("path = <%s>", path.c_str());
debug("filename = <%s>", originalFilename.c_str());
debug("tempfile = <%s>", tempFilename.c_str());
// check that <path> is not an absolute root
if (path == "" || path == "/" || path == "\\") {
errorMessage = _("Invalid path!");
return false;
}
// transform virtual path to actual file system one
Common::String prefixToRemove = "", prefixToAdd = "";
if (!transformPath(path, prefixToRemove, prefixToAdd, false) || path.empty()) {
errorMessage = _("Invalid path!");
return false;
}
// check that <path> exists and is directory
AbstractFSNode *node = g_system->getFilesystemFactory()->makeFileNodePath(path);
if (!node->exists()) {
errorMessage = _("The parent directory doesn't exist!");
return false;
}
if (!node->isDirectory()) {
errorMessage = _("Can't upload into a file!");
return false;
}
// check that <path>/<originalFilename> doesn't exist
if (path.lastChar() != '/' && path.lastChar() != '\\') path += '/';
AbstractFSNode *originalNode = g_system->getFilesystemFactory()->makeFileNodePath(path + originalFilename);
if (originalNode->exists()) {
errorMessage = _("There is a file with that name in the parent directory!");
return false;
}
// check that <tempFilename> exists
AbstractFSNode *tempNode = g_system->getFilesystemFactory()->makeFileNodePath(tempFilename);
if (!tempNode->exists() || tempNode->isDirectory()) {
errorMessage = _("Failed to upload the file!");
return false;
}
// copy <tempFilename> into <path>/<originalFilename>
// FIXME: I think we should move/rename file with some system call
// even though that might be less portable, that is much better than
// making an actual copy of data (because user might had enough place
// for one copy of the file, but not for two of them)
Common::ReadStream *tempStream = tempNode->createReadStream();
Common::WriteStream *fileStream = originalNode->createWriteStream();
if (tempStream == nullptr || fileStream == nullptr || !copyStream(tempStream, fileStream)) {
delete tempStream;
delete fileStream;
errorMessage = _("Failed to upload the file!");
return false;
}
delete tempStream;
delete fileStream;
return true;
}
/// public
ClientHandlerCallback UploadFileHandler::getHandler() {
return new Common::Callback<UploadFileHandler, Client &>(this, &UploadFileHandler::handle);
}
} // End of namespace Networking

51
backends/networking/sdl_net/handlers/uploadfilehandler.h Normal file
View file

@ -0,0 +1,51 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef BACKENDS_NETWORKING_SDL_NET_UPLOADFILEHANDLER_H
#define BACKENDS_NETWORKING_SDL_NET_UPLOADFILEHANDLER_H
#include "backends/networking/sdl_net/handlers/filesbasehandler.h"
namespace Networking {
class UploadFileHandler: public FilesBaseHandler {
void handle(Client &client);
void handleErrorMessage(Client &client, Common::String message);
/**
* Uploads file.
*
* Fills <errorMessage> on failure.
*
* Returns true on success.
*/
bool uploadFile(Client &client, Common::String &errorMessage);
public:
UploadFileHandler();
virtual ~UploadFileHandler();
virtual ClientHandlerCallback getHandler();
};
} // End of namespace Networking
#endif

1
backends/networking/sdl_net/localwebserver.cpp
View file

@ -47,6 +47,7 @@ LocalWebserver::LocalWebserver(): _set(nullptr), _serverSocket(nullptr), _timerS
addPathHandler("/files", _filesPageHandler.getHandler());
addPathHandler("/create", _createDirectoryHandler.getHandler());
addPathHandler("/download", _downloadFileHandler.getHandler());
addPathHandler("/upload", _uploadFileHandler.getHandler());
_defaultHandler = _resourceHandler.getHandler();
}

2
backends/networking/sdl_net/localwebserver.h
View file

@ -30,6 +30,7 @@
#include "backends/networking/sdl_net/handlers/filespagehandler.h"
#include "backends/networking/sdl_net/handlers/indexpagehandler.h"
#include "backends/networking/sdl_net/handlers/resourcehandler.h"
#include "backends/networking/sdl_net/handlers/uploadfilehandler.h"
#include "common/hash-str.h"
#include "common/mutex.h"
#include "common/singleton.h"
@ -63,6 +64,7 @@ class LocalWebserver : public Common::Singleton<LocalWebserver> {
FilesPageHandler _filesPageHandler;
CreateDirectoryHandler _createDirectoryHandler;
DownloadFileHandler _downloadFileHandler;
UploadFileHandler _uploadFileHandler;
ResourceHandler _resourceHandler;
uint32 _idlingFrames;
Common::Mutex _handleMutex;

6
backends/networking/sdl_net/reader.cpp
View file

@ -51,6 +51,7 @@ Reader::Reader(): _randomSource("Networking::Reader") {
_headers = "";
_stream = nullptr;
_firstBlock = true;
_contentLength = 0;
_availableBytes = 0;
@ -98,6 +99,7 @@ Reader &Reader::operator=(Reader &r) {
_headers = r._headers;
_stream = r._stream;
_firstBlock = r._firstBlock;
r._stream = nullptr;
_headers = r._headers;
@ -383,6 +385,7 @@ Common::String generateTempFileName(Common::String originalFilename, Common::Ran
bool Reader::readContent() {
Common::String boundary = "--" + _boundary;
if (!_firstBlock) boundary = "\r\n" + boundary;
if (_window == nullptr) {
makeWindow(boundary.size());
@ -403,6 +406,7 @@ bool Reader::readContent() {
if (!bytesLeft()) return false;
}
_firstBlock = false;
if (_isFileField) {
if (_stream != nullptr) {
_stream->flush();
@ -514,6 +518,8 @@ Common::String Reader::query() const { return _query; }
Common::String Reader::queryParameter(Common::String name) const { return _queryParameters[name]; }
Common::String Reader::attachedFile(Common::String name) const { return _attachedFiles[name]; }
Common::String Reader::anchor() const { return _anchor; }
} // End of namespace Networking

2
backends/networking/sdl_net/reader.h
View file

@ -53,6 +53,7 @@ class Reader {
Common::String _headers;
Common::WriteStream *_stream;
bool _firstBlock;
///Common::String _headers;
Common::String _method, _path, _query, _anchor;
@ -99,6 +100,7 @@ public:
Common::String path() const;
Common::String query() const;
Common::String queryParameter(Common::String name) const;
Common::String attachedFile(Common::String name) const;
Common::String anchor() const;
};