starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: tictactoe: security fix

Browse Source
This commit is contained in:
Namonay 2024-05-07 15:55:13 +02:00
parent e46d266b5b
commit ce6f00e835
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/static/js/api/game/tictactoe/TicTacToeGame.js
View File

@ -55,6 +55,7 @@ class TicTacToe
case 'game_move': case 'game_move':
if (messageData.targetMorpion === undefined || messageData.targetCase === undefined) if (messageData.targetMorpion === undefined || messageData.targetCase === undefined)
return ;
this.map[messageData.targetMorpion][messageData.targetCase] = (this.sign == "x") ? 1 : 0; this.map[messageData.targetMorpion][messageData.targetCase] = (this.sign == "x") ? 1 : 0;
this.printSign(messageData.targetMorpion, messageData.targetCase, (this.sign == "x") ? "o" : "x"); this.printSign(messageData.targetMorpion, messageData.targetCase, (this.sign == "x") ? "o" : "x");
this.setOutline(this.currentMorpion, false); this.setOutline(this.currentMorpion, false);
@ -154,6 +155,7 @@ class TicTacToe
return -1 return -1
} }
} }
onClick(event, morpion) onClick(event, morpion)
{ {
let x = event.offsetX; let x = event.offsetX;

13
games/consumers.py
View File

@ -58,25 +58,26 @@ class TicTacToeWebSocket(WebsocketConsumer):
def receive(self, text_data=None, bytes_data=None): def receive(self, text_data=None, bytes_data=None):
data = json.loads(text_data) data = json.loads(text_data)
if (data.get("targetMorpion") is not None and data.get("targetCase") is not None): if (data.get("targetMorpion") is not None and data.get("targetCase") is not None): # A move has been played
if (self.game.add(data, self.member) == False): if (self.game.add(data, self.member) == False): # If the move is invalid
return return
self.game.broadcast("game_move", data, [self.member])
if (data.get("timerIsDue") is not None and self.game.time + 20 < time.time()): if (data.get("timerIsDue") is not None and self.game.time + 20 < time.time()): # Frontend asking if the timer is due
self.winner = 'x' if self.game.turn == 'o' else 'o' self.winner = 'x' if self.game.turn == 'o' else 'o'
self.game.model.finish(self.user) self.game.model.finish(self.user)
self.game.broadcast("game_end", {"winning_sign": self.winner}) self.game.broadcast("game_end", {"winning_sign": self.winner})
if (self.game.checkWin() != False): if (self.game.checkWin() != False): # Check if after a move, the game is finished
self.winner = self.game.checkWin() self.winner = self.game.checkWin()
self.game.model.finish(self.user) self.game.model.finish(self.user)
self.game.broadcast("game_end", {"winning_sign": self.winner}) self.game.broadcast("game_end", {"winning_sign": self.winner})
self.game.broadcast("game_move", data, [self.member])
def disconnect(self, event): def disconnect(self, event):
try: try:
self.member.socket = None if (self.member is not None):
self.member.disconnect()
except: except:
pass pass