diff --git a/src/core/execution/SpawnExecution.ts b/src/core/execution/SpawnExecution.ts index 10b7e963f..c554f873c 100644 --- a/src/core/execution/SpawnExecution.ts +++ b/src/core/execution/SpawnExecution.ts @@ -47,6 +47,15 @@ export class SpawnExecution implements Execution { player = this.mg.addPlayer(this.playerInfo); } + // Security: a spawn intent may only place or relocate a player's starting + // territory during the spawn phase. Once the game is underway, an + // already-spawned player who sends a spawn intent is attempting to + // teleport — relinquishing their territory and re-conquering it elsewhere. + // Ignore it so the intent is a deterministic no-op on every client. + if (!this.mg.inSpawnPhase() && player.hasSpawned()) { + return; + } + // Security: If random spawn is enabled, prevent players from re-rolling their spawn location if (this.mg.config().isRandomSpawn() && player.hasSpawned()) { return; diff --git a/tests/core/execution/SpawnExecution.test.ts b/tests/core/execution/SpawnExecution.test.ts index 8f277ffcd..4671c7c19 100644 --- a/tests/core/execution/SpawnExecution.test.ts +++ b/tests/core/execution/SpawnExecution.test.ts @@ -94,14 +94,45 @@ describe("Spawn execution", () => { const game = await setup("half_land_half_ocean", {}, [playerInfo]); - game.addExecution(new SpawnExecution("game_id", playerInfo, 10)); game.addExecution(new SpawnExecution("game_id", playerInfo, 20)); game.executeNextTick(); game.executeNextTick(); - expect(game.playerByClientID("client_id")?.spawnTile()).toBe(20); - // Previous territory from first spawn should be relinquished - expect(game.owner(10).isPlayer()).toBe(false); + const player = game.playerByClientID("client_id")!; + expect(player.spawnTile()).toBe(20); + expect(player.numTilesOwned()).toBeGreaterThan(0); + }); + + test("Spawn intent after the spawn phase cannot relocate territory (anti-teleport)", async () => { + const playerInfo = new PlayerInfo( + `player`, + PlayerType.Human, + `client_id`, + `player_id`, + ); + + // setup() ends the spawn phase by default, so the game is already underway. + const game = await setup("half_land_half_ocean", {}, [playerInfo]); + + // Establish the player's territory with a legitimate first spawn. + game.addExecution(new SpawnExecution("game_id", playerInfo, 20)); + game.executeNextTick(); + game.executeNextTick(); + + const player = game.playerByClientID("client_id")!; + expect(player.spawnTile()).toBe(20); + const tilesBefore = player.numTilesOwned(); + expect(tilesBefore).toBeGreaterThan(0); + + // Malicious "teleport": a spawn intent to a new tile after the game has + // started must be a deterministic no-op — the player keeps their original + // spawn location and territory rather than relinquishing and re-conquering. + game.addExecution(new SpawnExecution("game_id", playerInfo, 10)); + game.executeNextTick(); + game.executeNextTick(); + + expect(player.spawnTile()).toBe(20); + expect(player.numTilesOwned()).toBe(tilesBefore); }); test("Random spawn ignores client-specified tile", async () => {