mirror/liberty-bikes
2
0
Fork 0
mirror of https://github.com/OpenLiberty/liberty-bikes.git synced 2024-11-21 00:51:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #243 from aguibert/ai-defensive-coding

Browse Source 
Additional defensive checks for game-service
This commit is contained in:
Andrew Guibert 2019-10-09 12:42:23 -05:00 committed by GitHub
commit 3b90fcf6b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game-service/src/main/java/org/libertybikes/game/core/GameRound.java
View File

@ -146,10 +146,12 @@ public class GameRound implements Runnable {
sendToClient(s, new OutboundMessage.AwaitPlayersCountdown(lobbyCountdown.roundStartCountdown));
}
public void updatePlayerDirection(Session playerSession, InboundMessage msg) {
public boolean updatePlayerDirection(Session playerSession, InboundMessage msg) {
Client c = clients.get(playerSession);
if (c != null)
c.player.ifPresent((p) -> p.setDirection(msg.direction));
if (c == null)
return false;
c.player.ifPresent((p) -> p.setDirection(msg.direction));
return true;
}
public boolean addPlayer(Session s, String playerId, String playerName, Boolean hasGameBoard) {

10
game-service/src/main/java/org/libertybikes/game/round/service/GameRoundService.java
View File

@ -9,7 +9,9 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import javax.enterprise.concurrent.ManagedScheduledExecutorService;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.NotAcceptableException;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@ -17,12 +19,17 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.libertybikes.game.core.GameRound;
@Path("/round")
@ApplicationScoped
public class GameRoundService {
@Inject
@ConfigProperty(name = "singleParty", defaultValue = "true")
private boolean isSingleParty;
@Resource
ManagedScheduledExecutorService exec;
@ -58,6 +65,9 @@ public class GameRoundService {
@GET
@Path("/available")
public String getAvailableRound() {
if (isSingleParty)
throw new NotAcceptableException("Cannot call this endpoint when game service is in single party mode");
Optional<GameRound> availableRound = allRounds.values()
.stream()
.filter(r -> r.isOpen())

28
game-service/src/main/java/org/libertybikes/game/round/service/GameRoundWebsocket.java
View File

@ -84,11 +84,10 @@ public class GameRoundWebsocket {
if (round == null || round.getGameState() == State.FINISHED) {
log(roundId, "[onMessage] Received message for round that did not exist or has completed. Closing this websocket connection.");
if (round == null)
sendToClient(session, new OutboundMessage.ErrorEvent("Round " + roundId + " did not exist."));
closeWithError(session, roundId, "Round " + roundId + " did not exist.");
// don't boot out players that may keep sending messages a few seconds after the game is done
else if (!round.isPlayer(session))
sendToClient(session, new OutboundMessage.ErrorEvent("Round " + roundId + " has already completed."));
session.close();
closeWithError(session, roundId, "Round " + roundId + " has already completed.");
return;
}
//log(roundId, "[onMessage] msg=" + message);
@ -96,23 +95,22 @@ public class GameRoundWebsocket {
if (GameEvent.GAME_START == msg.event) {
round.startGame();
} else if (msg.direction != null) {
round.updatePlayerDirection(session, msg);
boolean updated = round.updatePlayerDirection(session, msg);
if (!updated)
closeWithError(session, roundId, "Unable to update direction because client was not joined to round");
} else if (msg.playerJoinedId != null && !msg.playerJoinedId.isEmpty()) {
// Call playerserver for player in DB
org.libertybikes.restclient.Player playerResponse = getPlayer(msg.playerJoinedId);
if (playerResponse == null)
closeWithError(session, "Unable to add player " + msg.playerJoinedId +
" to game. This is probably because the player has not been registered with the game service yet.");
closeWithError(session, roundId, "Unable to add player " + msg.playerJoinedId +
" to game. This is probably because the player has not been registered yet");
else if (!round.addPlayer(session, msg.playerJoinedId, playerResponse.name, msg.hasGameBoard == null ? true : msg.hasGameBoard))
closeWithError(session, "Unable to add player " + playerResponse.name
+ " to game. This is probably because someone else with the same name is already in the game.");
closeWithError(session, roundId, "Unable to add player " + playerResponse.name
+ " to game. This is probably because someone else with the same name is already in the game.");
} else if (Boolean.TRUE == msg.isSpectator) {
round.addSpectator(session);
} else {
String invalidMsg = jsonb.toJson(msg);
log(roundId, "ERR: Unrecognized message: " + invalidMsg);
session.close(new CloseReason(CloseCodes.UNEXPECTED_CONDITION, "Unrecognized message: " + invalidMsg));
closeWithError(session, roundId, jsonb.toJson(msg));
}
} catch (Exception e) {
log(roundId, "ERR: " + e.getMessage());
@ -120,8 +118,12 @@ public class GameRoundWebsocket {
}
}
private void closeWithError(Session session, String msg) throws IOException {
private void closeWithError(Session session, String roundId, String msg) throws IOException {
log(roundId, msg);
sendToClient(session, new OutboundMessage.ErrorEvent(msg));
// close reason phrase cannot exceed 123 UTF-8 encoded bytes
if (msg.length() > 123)
msg = msg.substring(0, 122);
session.close(new CloseReason(CloseCodes.UNEXPECTED_CONDITION, msg));
}