Ticket #3552: t3552_prevent_commands_for_others_in_rated_games_v1.patch

source/network/NetServer.cpp

@@ -24 +24 @@
 #include "NetSession.h"
 #include "NetStats.h"
 #include "NetTurnManager.h"
 
 #include "lib/external_libraries/enet.h"
+#include "lobby/IXmppClient.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptRuntime.h"
 #include "simulation2/Simulation2.h"
@@ -881 +882 @@
     CNetMessage* message = (CNetMessage*)event->GetParamRef();
     if (message->GetType() == (uint)NMT_SIMULATION_COMMAND)
     {
         CSimulationMessage* simMessage = static_cast<CSimulationMessage*> (message);
 
+        // Clients may not send commands on behalf of others in rated games
+        if (g_rankedGame && server.m_PlayerAssignments[session->GetGUID()].m_PlayerID != simMessage->m_Player)
+            return true;
+
         // Send it back to all clients immediately
         server.Broadcast(simMessage);
 
         // Save all the received commands
         if (server.m_SavedCommands.size() < simMessage->m_Turn + 1)
             server.m_SavedCommands.resize(simMessage->m_Turn + 1);
         server.m_SavedCommands[simMessage->m_Turn].push_back(*simMessage);
 
-        // TODO: we should do some validation of ownership (clients can't send commands on behalf of opposing players)
-
         // TODO: we shouldn't send the message back to the client that first sent it
     }
     else if (message->GetType() == (uint)NMT_SYNC_CHECK)
     {
         CSyncCheckMessage* syncMessage = static_cast<CSyncCheckMessage*> (message);