games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Lobby server will now validate incoming messages

Browse Source
This commit is contained in:
Ivan Savenko 2024-03-04 14:12:15 +02:00
parent 5b1549200a
commit 6120fd2faa
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lobby/LobbyServer.cpp
View File

@ -12,7 +12,9 @@
#include "LobbyDatabase.h"
#include "../lib/json/JsonFormatException.h"
#include "../lib/json/JsonNode.h"
#include "../lib/json/JsonUtils.h"
#include <boost/uuid/uuid_generators.hpp>
#include <boost/uuid/uuid_io.hpp>
@ -230,6 +232,44 @@ void LobbyServer::onDisconnected(const NetworkConnectionPtr & connection, const
broadcastActiveGameRooms();
}
JsonNode LobbyServer::parseAndValidateMessage(const std::vector<std::byte> & message) const
{
JsonParsingSettings parserSettings;
parserSettings.mode = JsonParsingSettings::JsonFormatMode::JSON;
parserSettings.maxDepth = 2;
parserSettings.strict = true;
JsonNode json;
try
{
JsonNode jsonTemp(message.data(), message.size());
json = std::move(jsonTemp);
}
catch (const JsonFormatException & e)
{
logGlobal->info(std::string("Json parsing error encountered: ") + e.what());
return JsonNode();
}
std::string messageType = json["type"].String();
if (messageType.empty())
{
logGlobal->info("Json parsing error encountered: Message type not set!");
return JsonNode();
}
std::string schemaName = "vcmi:lobbyProtocol/" + messageType;
if (!JsonUtils::validate(json, schemaName, "network"))
{
logGlobal->info("Json validation error encountered!");
return JsonNode();
}
return json;
}
void LobbyServer::onPacketReceived(const NetworkConnectionPtr & connection, const std::vector<std::byte> & message)
{
// proxy connection - no processing, only redirect
@ -242,10 +282,7 @@ void LobbyServer::onPacketReceived(const NetworkConnectionPtr & connection, cons
logGlobal->info("Received unexpected message for inactive proxy!");
}
JsonNode json(message.data(), message.size());
// TODO: check for json parsing errors
// TODO: validate json based on received message type
JsonNode json = parseAndValidateMessage(message);
std::string messageType = json["type"].String();

4
lobby/LobbyServer.h
View File

@ -61,6 +61,10 @@ class LobbyServer final : public INetworkServerListener
JsonNode prepareActiveGameRooms();
/// Attempts to load json from incoming byte stream and validate it
/// Returns parsed json on success or empty json node on failure
JsonNode parseAndValidateMessage(const std::vector<std::byte> & message) const;
void sendChatMessage(const NetworkConnectionPtr & target, const std::string & roomMode, const std::string & roomName, const std::string & accountID, const std::string & displayName, const std::string & messageText);
void sendAccountCreated(const NetworkConnectionPtr & target, const std::string & accountID, const std::string & accountCookie);
void sendOperationFailed(const NetworkConnectionPtr & target, const std::string & reason);