KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

fix: ensure proper unlocking of user session locks in game actions

Browse Source
This commit is contained in:
Janis
2025-11-05 11:29:41 +01:00
parent 96c38466d2
commit 5dc1521d15
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
knockoutwhistweb/app/controllers/IngameController.scala
View File

@@ -4,6 +4,7 @@ import auth.{AuthAction, AuthenticatedRequest}
import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak} import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException} import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException}
import logic.PodManager import logic.PodManager
import model.sessions.{PlayerSession, UserSession}
import play.api.* import play.api.*
import play.api.mvc.* import play.api.mvc.*
@@ -110,12 +111,14 @@ class IngameController @Inject()(
val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption)) val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
cardIdOpt match { cardIdOpt match {
case Some(cardId) => case Some(cardId) =>
var optSession: Option[UserSession] = None
val result = Try { val result = Try {
val session = g.getUserSession(request.user.id) val session = g.getUserSession(request.user.id)
optSession = Some(session)
session.lock.lock() session.lock.lock()
g.playCard(session, cardId.toInt) g.playCard(session, cardId.toInt)
session.lock.unlock()
} }
optSession.foreach(_.lock.unlock())
if (result.isSuccess) { if (result.isSuccess) {
NoContent NoContent
} else { } else {
@@ -146,22 +149,24 @@ class IngameController @Inject()(
game match { game match {
case Some(g) => { case Some(g) => {
val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption)) val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
var optSession: Option[UserSession] = None
val result = Try { val result = Try {
cardIdOpt match { cardIdOpt match {
case Some(cardId) if cardId == "skip" => case Some(cardId) if cardId == "skip" =>
val session = g.getUserSession(request.user.id) val session = g.getUserSession(request.user.id)
optSession = Some(session)
session.lock.lock() session.lock.lock()
g.playDogCard(session, -1) g.playDogCard(session, -1)
session.lock.unlock()
case Some(cardId) => case Some(cardId) =>
val session = g.getUserSession(request.user.id) val session = g.getUserSession(request.user.id)
optSession = Some(session)
session.lock.lock() session.lock.lock()
g.playDogCard(session, cardId.toInt) g.playDogCard(session, cardId.toInt)
session.lock.unlock()
case None => case None =>
throw new IllegalArgumentException("cardId parameter is missing") throw new IllegalArgumentException("cardId parameter is missing")
} }
} }
optSession.foreach(_.lock.unlock())
if (result.isSuccess) { if (result.isSuccess) {
NoContent NoContent
} else { } else {
@@ -192,12 +197,14 @@ class IngameController @Inject()(
val trumpOpt = request.body.asFormUrlEncoded.flatMap(_.get("trump").flatMap(_.headOption)) val trumpOpt = request.body.asFormUrlEncoded.flatMap(_.get("trump").flatMap(_.headOption))
trumpOpt match { trumpOpt match {
case Some(trump) => case Some(trump) =>
var optSession: Option[UserSession] = None
val result = Try { val result = Try {
val session = g.getUserSession(request.user.id) val session = g.getUserSession(request.user.id)
optSession = Some(session)
session.lock.lock() session.lock.lock()
g.selectTrump(session, trump.toInt) g.selectTrump(session, trump.toInt)
session.lock.unlock()
} }
optSession.foreach(_.lock.unlock())
if (result.isSuccess) { if (result.isSuccess) {
NoContent NoContent
} else { } else {
@@ -227,12 +234,14 @@ class IngameController @Inject()(
val tieOpt = request.body.asFormUrlEncoded.flatMap(_.get("tie").flatMap(_.headOption)) val tieOpt = request.body.asFormUrlEncoded.flatMap(_.get("tie").flatMap(_.headOption))
tieOpt match { tieOpt match {
case Some(tie) => case Some(tie) =>
var optSession: Option[UserSession] = None
val result = Try { val result = Try {
val session = g.getUserSession(request.user.id) val session = g.getUserSession(request.user.id)
optSession = Some(session)
session.lock.lock() session.lock.lock()
g.selectTie(g.getUserSession(request.user.id), tie.toInt) g.selectTie(g.getUserSession(request.user.id), tie.toInt)
session.lock.unlock()
} }
optSession.foreach(_.lock.unlock())
if (result.isSuccess) { if (result.isSuccess) {
NoContent NoContent
} else { } else {