6 Commits

Author SHA1 Message Date
Frank
e42966e618 Message when everyone is verified 2026-01-08 15:34:43 +01:00
Frank
e4976e51fa JWT token in env file 2026-01-08 14:40:51 +01:00
Frank van den Berg
65070688ec Make mercure work correctly 2026-01-08 13:05:40 +01:00
Frank
e54c870f05 Post return messages 2026-01-08 11:41:46 +01:00
f5aabafcc5 Merge pull request 'Verification done' (#7) from Rechten into main
Reviewed-on: #7
2026-01-07 19:53:58 +00:00
Frank
de4b7bca6a Verification done 2026-01-07 20:06:28 +01:00
14 changed files with 832 additions and 22 deletions

2
.env
View File

@@ -57,7 +57,7 @@ MERCURE_URL=http://mercure/.well-known/mercure
# Public hub URL used by browsers
MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
MERCURE_JWT_SECRET=!ChangeThisMercureJWT!
MERCURE_JWT_SECRET=!ChangeThisMercureJWTSignedBySymfonySecretKey!
# Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
MERCURE_TOPIC_BASE=https://escapepage.dev
###< mercure ###

View File

@@ -4,7 +4,7 @@ import './styles/game1.css';
let sequenceFinished = false;
let stillPlayingSound = true;
function subscribeToMercure(mercurePublicUrl, topic) {
function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
try {
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
const es = new EventSource(url);
@@ -16,6 +16,13 @@ function subscribeToMercure(mercurePublicUrl, topic) {
// data is [sendTo, message]
if (Array.isArray(data) && data.length >= 2) {
const sendTo = parseInt(data[0]);
// Filter: 0 means everyone, otherwise must match myScreen
if (sendTo !== 0 && sendTo !== parseInt(myScreen)) {
console.log('[Mercure][game1] Message not for this player, skipping.');
return;
}
const messageContainer = document.getElementById('message-container');
if (messageContainer) {
const msgEl = document.createElement('div');
@@ -24,6 +31,7 @@ function subscribeToMercure(mercurePublicUrl, topic) {
msgEl.style.color = '#0F0'; // Green for incoming messages
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
window.scrollTo(0, document.body.scrollHeight);
if(stillPlayingSound)
playSound();
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
@@ -120,11 +128,12 @@ document.addEventListener('DOMContentLoaded', async () => {
const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
const topic = cfgEl.dataset.topic;
const screen = cfgEl.dataset.screen;
const apiPingUrl = cfgEl.dataset.apiPingUrl;
const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
if (mercurePublicUrl && topic) {
subscribeToMercure(mercurePublicUrl, topic);
subscribeToMercure(mercurePublicUrl, topic, screen);
} else {
console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
}
@@ -181,6 +190,7 @@ document.addEventListener('DOMContentLoaded', async () => {
msgEl.textContent = msg[0];
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
window.scrollTo(0, document.body.scrollHeight);
playSound();
@@ -203,6 +213,13 @@ document.addEventListener('DOMContentLoaded', async () => {
stillPlayingSound = false;
sequenceFinished = false;
const message = inputField.value.trim();
const msgEl = document.createElement('div');
msgEl.className = 'message';
msgEl.textContent = message;
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
if (message && apiEchoUrl) {
inputField.value = '';
try {
@@ -211,6 +228,16 @@ document.addEventListener('DOMContentLoaded', async () => {
body: { message, ts: new Date().toISOString() },
});
console.log('[API][game1] message sent →', response);
if (response && response.result && Array.isArray(response.result.result)) {
response.result.result.forEach(text => {
const msgEl = document.createElement('div');
msgEl.className = 'message';
msgEl.textContent = text;
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
});
window.scrollTo(0, document.body.scrollHeight);
}
} catch (err) {
console.error('[API][game1] Failed to send message:', err);
}

View File

@@ -29,8 +29,11 @@ body {
div#game-timer {
position: fixed;
top: 20px;
left: 20px;
top: 0;
left: 0;
width: 100%;
padding: 20px;
background-color: #000;
color: #F00;
font-size: 28px;
z-index: 100;
@@ -38,7 +41,7 @@ div#game-timer {
div#message-container {
padding: 20px;
padding-top: 60px; /* Space for fixed timer */
padding-top: 80px; /* Space for fixed timer */
display: flex;
flex-direction: column;
justify-content: flex-end;
@@ -49,6 +52,7 @@ div#message-container {
div.message {
color: #C0C0C0;
white-space: pre-wrap;
}
div#input {

View File

@@ -7,11 +7,11 @@ services:
environment:
# Uncomment the following line to disable HTTPS,
#SERVER_NAME: ':80'
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
# Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
MERCURE_EXTRA_DIRECTIVES: |
cors_origins http://127.0.0.1:8000
cors_origins http://localhost:8080
# Comment the following line to disable the development mode
command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
healthcheck:

View File

@@ -3,4 +3,6 @@ mercure:
default:
url: '%env(MERCURE_URL)%'
public_url: '%env(MERCURE_PUBLIC_URL)%'
jwt: '%env(MERCURE_JWT_SECRET)%'
jwt:
secret: '%env(MERCURE_JWT_SECRET)%'
publish: ['*']

View File

@@ -63,8 +63,8 @@ services:
container_name: escapepage-mercure
environment:
SERVER_NAME: ":80"
MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
MERCURE_EXTRA_DIRECTIVES: |

View File

@@ -39,6 +39,13 @@ final class GameController extends AbstractController
$this->addFlash('success', 'New session created!');
}
}
} elseif ($request->request->has('join_session')) {
$inviteCode = $request->request->get('invite_code');
if ($dashboardService->joinSession($inviteCode, $user)) {
$this->addFlash('success', 'Joined session successfully!');
} else {
$this->addFlash('error', 'Invalid invite code or session full.');
}
} elseif ($request->request->has('create_invite')) {
$sessionId = $request->request->get('session_id');
$session = $sessionRepository->find($sessionId);
@@ -52,6 +59,17 @@ final class GameController extends AbstractController
if ($inviteCode) {
$this->addFlash('success', 'Invite link created: ' . $inviteCode);
}
} elseif ($request->request->has('leave_session')) {
$sessionId = $request->request->get('session_id');
$session = $sessionRepository->find($sessionId);
if ($session) {
if ($dashboardService->leaveSession($session, $user)) {
$this->addFlash('success', 'Left session successfully.');
} else {
$this->addFlash('error', 'Could not leave session (game might have started).');
}
}
}
return $this->redirectToRoute('game_dashboard');
@@ -67,8 +85,18 @@ final class GameController extends AbstractController
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
#[IsGranted('SESSION_VIEW', subject: 'session')]
public function index(
Session $session): Response
Session $session,
Security $security,
\App\Game\Repository\PlayerRepository $playerRepository
): Response
{
return $this->render('game/index.html.twig', ['session' => $session]);
$user = $security->getUser();
$player = $playerRepository->findOneBy(['session' => $session, 'user' => $user]);
$screen = $player ? $player->getScreen() : 0;
return $this->render('game/index.html.twig', [
'session' => $session,
'screen' => $screen,
]);
}
}

View File

@@ -12,4 +12,14 @@ enum SessionSettingType: string
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
case INVITE_CODE = 'InviteCode';
case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
case EVERYONE_VERIFIED = 'EveryoneVerified';
}

View File

@@ -71,11 +71,193 @@ final class GameDashboardService
$this->entityManager->persist($session);
$this->entityManager->persist($player);
$this->initializePlayerSettings($player);
$this->entityManager->flush();
return $session;
}
public function joinSession(string $inviteCode, UserInterface $user): bool
{
if (!$user instanceof User) {
return false;
}
$setting = $this->entityManager->getRepository(SessionSetting::class)->findOneBy([
'name' => SessionSettingType::INVITE_CODE,
'value' => $inviteCode,
]);
if (!$setting) {
return false;
}
$session = $setting->getSession();
// Check if user is already in this session
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
return true; // Already joined
}
}
$playerCount = count($session->getPlayers());
if ($playerCount >= 3) {
return false; // Session full
}
$player = new Player();
$player->setUser($user);
$player->setSession($session);
$player->setScreen($playerCount + 1);
$this->entityManager->persist($player);
$this->initializePlayerSettings($player);
$this->entityManager->flush();
return true;
}
public function leaveSession(Session $session, UserInterface $user): bool
{
if (!$user instanceof User) {
return false;
}
if ($session->getStatus() !== SessionStatus::CREATED || $session->getTimer() > 0) {
return false;
}
$playerToDelete = null;
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
$playerToDelete = $player;
break;
}
}
if (!$playerToDelete) {
return false;
}
// Remove player specific settings (like rights)
foreach ($session->getSettings() as $setting) {
if ($setting->getPlayer() === $playerToDelete) {
$session->removeSetting($setting);
$this->entityManager->remove($setting);
}
}
$session->removePlayer($playerToDelete);
$this->entityManager->remove($playerToDelete);
// If no players left, we might want to delete the session and its remaining settings
if ($session->getPlayers()->isEmpty()) {
foreach ($session->getSettings() as $setting) {
$this->entityManager->remove($setting);
}
$this->entityManager->remove($session);
}
$this->entityManager->flush();
return true;
}
private function initializePlayerSettings(Player $player): void
{
$screen = $player->getScreen();
$rightsSettingName = match ($screen) {
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
default => null,
};
if ($rightsSettingName) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($rightsSettingName);
$setting->setValue(json_encode(['chat', 'help', 'ls', 'pwd']));
$this->entityManager->persist($setting);
}
$pwdSettingName = match ($screen) {
1 => SessionSettingType::PWD_FOR_PLAYER1,
2 => SessionSettingType::PWD_FOR_PLAYER2,
3 => SessionSettingType::PWD_FOR_PLAYER3,
default => null,
};
if ($pwdSettingName) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($pwdSettingName);
$setting->setValue('home/' . $player->getUser()->getUserIdentifier());
$this->entityManager->persist($setting);
}
$chatTrackingSettingName = match ($screen) {
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
default => null,
};
if ($chatTrackingSettingName) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($chatTrackingSettingName);
$setting->setValue(json_encode([]));
$this->entityManager->persist($setting);
}
$verifyCodesSettingName = match ($screen) {
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
default => null,
};
if ($verifyCodesSettingName) {
$codes = [];
for ($i = 1; $i <= 3; $i++) {
if ($i !== $screen) {
$codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
}
}
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($verifyCodesSettingName);
$setting->setValue(json_encode($codes));
$this->entityManager->persist($setting);
}
$verificationProgressSettingName = match ($screen) {
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
default => null,
};
if ($verificationProgressSettingName) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($verificationProgressSettingName);
$setting->setValue(json_encode([]));
$this->entityManager->persist($setting);
}
}
public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
{
// Security check: is user part of this session?

View File

@@ -5,8 +5,10 @@ namespace App\Game\Service;
use App\Game\Enum\DecodeMessage;
use App\Game\Enum\SessionSettingType;
use App\Game\Entity\Player;
use App\Game\Entity\SessionSetting;
use App\Game\Repository\SessionSettingRepository;
use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Mercure\HubInterface;
use Symfony\Component\Mercure\Update;
@@ -18,6 +20,7 @@ class GameResponseService
private PlayerService $playerService,
private SessionSettingRepository $sessionSettingRepository,
private HubInterface $hub,
private EntityManagerInterface $entityManager,
) {
}
@@ -101,7 +104,7 @@ class GameResponseService
if(!in_array('verify', $rechten))
return ['result' => ['Unknown command']];
$result = $this->handleVerifyMessage($message);
$result = $this->handleVerifyMessage($message, $player);
return ['result' => [$result]];
default:
return ['result' => ['Unknown command']];
@@ -186,6 +189,7 @@ class GameResponseService
$messages[] = ' If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
$messages[] = ' This will send the message only to agent with id 6.';
$messages[] = ' USAGE: /chat {message}';
$messages[] = ' USAGE: /chat 6 {message}';
$messages[] = '';
break;
case 'help':
@@ -275,9 +279,10 @@ class GameResponseService
if ($toSingle) {
$sendTo = array_shift($messageParts);
$chatMessage = array_shift($messageParts);
}
$message = $player->getUser()->getUsername() . ': ' . $chatMessage;
$message = $player->getUser()->getUsername() . ': ' . $chatMessage . ' ';
foreach($messageParts as $messagePart) {
$message .= $messagePart . ' ';
}
@@ -292,9 +297,146 @@ class GameResponseService
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $activeGame;
$this->hub->publish(new Update($topic, json_encode([$sendTo, $message])));
$this->updateChatTracking($player, (int)$sendTo);
$this->checkAndRegenerateVerifyCodes($player, $chatMessage . ' ' . implode(' ', $messageParts));
return true;
}
private function checkAndRegenerateVerifyCodes(Player $player, string $messageContent): void
{
$screen = $player->getScreen();
$session = $player->getSession();
$verifyCodesSettingName = match ($screen) {
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
default => null,
};
if (!$verifyCodesSettingName) {
return;
}
$setting = $this->sessionSettingRepository->getSetting($session, $verifyCodesSettingName, $player);
if (!$setting) {
return;
}
$codes = json_decode($setting->getValue() ?? '[]', true) ?? [];
$regenerated = false;
foreach ($codes as $targetPlayerScreen => $code) {
if (str_contains($messageContent, (string)$code)) {
$codes[$targetPlayerScreen] = bin2hex(random_bytes(3));
$regenerated = true;
}
}
if ($regenerated) {
$setting->setValue(json_encode($codes));
$this->entityManager->persist($setting);
$this->entityManager->flush();
// Notify the player that their codes have changed
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
$notification = "Security Alert: One of your verify codes was shared and has been regenerated.";
// We send it only to this player (screen)
$this->hub->publish(new Update($topic, json_encode([$screen, $notification])));
}
}
private function updateChatTracking(Player $player, int $sendTo): void
{
$rights = $this->getRechten($player);
if(in_array('verify', $rights))
return;
$trackingSettingName = match ($player->getScreen()) {
1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
default => null,
};
if (!$trackingSettingName) {
return;
}
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), $trackingSettingName, $player);
if (!$setting) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setPlayer($player);
$setting->setName($trackingSettingName);
$setting->setValue(json_encode([]));
}
$tracking = json_decode($setting->getValue() ?? '[]', true) ?? [];
if (!in_array($sendTo, $tracking)) {
$tracking[] = $sendTo;
$setting->setValue(json_encode($tracking));
$this->entityManager->persist($setting);
$this->entityManager->flush();
$this->checkAndGrantVerifyRight($player, $tracking);
}
}
private function checkAndGrantVerifyRight(Player $player, array $tracking): void
{
$screen = $player->getScreen();
$requiredTargets = [0]; // Everyone
for ($i = 1; $i <= 3; $i++) {
if ($i !== $screen) {
$requiredTargets[] = $i;
}
}
// Check if all required targets are in tracking
foreach ($requiredTargets as $target) {
if (!in_array($target, $tracking)) {
return;
}
}
// Grant verify right
$rightsSettingName = match ($screen) {
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
default => null,
};
if (!$rightsSettingName) {
return;
}
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), $rightsSettingName, $player);
if (!$setting) {
return; // Should have been initialized
}
$rights = json_decode($setting->getValue() ?? '[]', true) ?? [];
$newRights = ['verify', 'cat'];
$updated = false;
foreach ($newRights as $newRight) {
if (!in_array($newRight, $rights)) {
$rights[] = $newRight;
$updated = true;
}
}
if ($updated) {
$setting->setValue(json_encode($rights));
$this->entityManager->persist($setting);
$this->entityManager->flush();
}
}
private function handleDecodeMessage(string $message, Player $player)
{
$userNumber = $player->getScreen();
@@ -327,9 +469,169 @@ class GameResponseService
return $randomString;
}
private function handleVerifyMessage(string $message) : string
private function handleVerifyMessage(string $message, Player $player) : string
{
return '';
$messageParts = explode(' ', $message);
if (count($messageParts) < 2) {
return 'Usage: /verify {code}';
}
$code = $messageParts[1];
$screen = $player->getScreen();
$session = $player->getSession();
$progressSettingName = match ($screen) {
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
default => null,
};
if (!$progressSettingName) {
return 'Error: Invalid player screen.';
}
$progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
if (!$progressSetting) {
return 'Error: Verification progress setting not found.';
}
$progress = json_decode($progressSetting->getValue() ?? '[]', true) ?? [];
$verifiedBy = null;
foreach ($session->getPlayers() as $otherPlayer) {
if ($otherPlayer->getId() === $player->getId()) {
continue;
}
$otherScreen = $otherPlayer->getScreen();
$codesSettingName = match ($otherScreen) {
1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
default => null,
};
if (!$codesSettingName) {
continue;
}
$codesSetting = $this->sessionSettingRepository->getSetting($session, $codesSettingName, $otherPlayer);
if (!$codesSetting) {
continue;
}
$codes = json_decode($codesSetting->getValue() ?? '[]', true) ?? [];
if (isset($codes[$screen]) && $codes[$screen] === $code) {
$verifiedBy = $otherScreen;
break;
}
}
if ($verifiedBy !== null) {
if (!in_array($verifiedBy, $progress)) {
$progress[] = $verifiedBy;
$progressSetting->setValue(json_encode($progress));
$this->entityManager->persist($progressSetting);
$this->entityManager->flush();
$response = 'You have been successfully verified by Agent ' . $verifiedBy . '.';
if (count($progress) >= 2) {
$this->grantVerificationRights($player);
$response .= ' You have received additional rights!';
}
return $response;
} else {
return 'You were already verified by Agent ' . $verifiedBy . '.';
}
}
return 'Invalid verification code.';
}
private function grantVerificationRights(Player $player): void
{
$screen = $player->getScreen();
$rightsSettingName = match ($screen) {
1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
default => null,
};
if (!$rightsSettingName) {
return;
}
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), $rightsSettingName, $player);
if (!$setting) {
return;
}
$rights = json_decode($setting->getValue() ?? '[]', true) ?? [];
$newRights = ['cd', 'decode'];
$updated = false;
foreach ($newRights as $newRight) {
if (!in_array($newRight, $rights)) {
$rights[] = $newRight;
$updated = true;
}
}
if ($updated) {
$setting->setValue(json_encode($rights));
$this->entityManager->persist($setting);
$this->entityManager->flush();
$this->checkIfAllPlayersVerified($player);
}
}
private function checkIfAllPlayersVerified(Player $player): void
{
$session = $player->getSession();
$everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($session, SessionSettingType::EVERYONE_VERIFIED, $player);
if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
return;
}
$allVerified = true;
foreach ([1, 2, 3] as $screen) {
$progressSettingName = match ($screen) {
1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
default => null,
};
$progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
$progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
if (count($progress) < 2) {
$allVerified = false;
break;
}
}
if ($allVerified) {
if (!$everyoneVerifiedSetting) {
$everyoneVerifiedSetting = new SessionSetting();
$everyoneVerifiedSetting->setSession($session);
$everyoneVerifiedSetting->setPlayer($player);
$everyoneVerifiedSetting->setName(SessionSettingType::EVERYONE_VERIFIED);
}
$everyoneVerifiedSetting->setValue('true');
$this->entityManager->persist($everyoneVerifiedSetting);
$this->entityManager->flush();
$topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
$message = "Mainframe Help Modus: Agents Doyle, Vega and Lennox rapports have been updated with coded messages.";
$this->hub->publish(new Update($topic, json_encode([0, $message])));
}
}
private function goToNewDir(string $pwd, string $newPwd, Player $player) : string|bool
@@ -412,7 +714,7 @@ class GameResponseService
private function isAllowedToRemove(string $file, Player $player, bool $sudo) : bool
{
if(!$this->fileExists($file))
if(!$this->fileExists($file, $player))
return false;
if(str_starts_with($file, '/var/rapports/'))
@@ -432,9 +734,9 @@ class GameResponseService
return !in_array($file, $sudoFiles);
}
private function fileExists(string $file)
private function fileExists(string $file, Player $player) : bool
{
$files = $this->getAllPossibleFiles();
$files = $this->getAllPossibleFiles($player);
if(in_array($file, $files))
return true;
@@ -442,7 +744,7 @@ class GameResponseService
return false;
}
private function getAllPossibleFiles()
private function getAllPossibleFiles(Player $player = null) : array
{
$files = [];
@@ -472,6 +774,12 @@ class GameResponseService
$files[] = '/var/rapports/001_145-93.txt';
$files[] = '/var/rapports/index.txt';
$players = $player->getSession()->getPlayers();
foreach($players as $player) {
$files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
}
return $files;
}

View File

@@ -24,6 +24,12 @@
<p>No games available to start.</p>
{% endif %}
<h2>Join Session</h2>
<form method="post">
<input type="text" name="invite_code" placeholder="Enter Invite Code" required>
<button type="submit" name="join_session">Join Session</button>
</form>
<h2>Your Sessions</h2>
{% if sessions is not empty %}
<table>
@@ -63,6 +69,12 @@
</td>
<td>
<a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
{% if session.status.value == 'created' and session.timer == 0 %}
<form method="post" style="display:inline;">
<input type="hidden" name="session_id" value="{{ session.id }}">
<button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
</form>
{% endif %}
</td>
</tr>
{% endfor %}

View File

@@ -18,6 +18,7 @@
data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
data-screen="{{ screen|e('html_attr') }}"
style="display:none">
</div>

View File

@@ -0,0 +1,135 @@
<?php
declare(strict_types=1);
namespace App\Tests\Game;
use App\Game\Entity\Game;
use App\Game\Entity\Player;
use App\Game\Entity\Session;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\GameStatus;
use App\Game\Enum\SessionSettingType;
use App\Game\Service\GameDashboardService;
use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use App\Game\Repository\GameRepository;
use App\Game\Repository\SessionRepository;
use PHPUnit\Framework\TestCase;
class GameDashboardServiceTest extends TestCase
{
private $entityManager;
private $gameRepository;
private $sessionRepository;
private $service;
protected function setUp(): void
{
$this->entityManager = $this->createMock(EntityManagerInterface::class);
$this->gameRepository = $this->createMock(GameRepository::class);
$this->sessionRepository = $this->createMock(SessionRepository::class);
$this->service = new GameDashboardService(
$this->gameRepository,
$this->sessionRepository,
$this->entityManager
);
}
public function testCreateSessionInitializesRightsAndPwd(): void
{
$game = new Game();
$game->setStatus(GameStatus::OPEN);
$user = new User();
$user->setUsername('testuser');
$this->entityManager->expects($this->exactly(7))
->method('persist');
// 1. Session, 2. Player, 3. SessionSetting (rights), 4. SessionSetting (pwd), 5. SessionSetting (chat tracking), 6. SessionSetting (verify codes), 7. SessionSetting (verification progress)
$session = $this->service->createSession($game, $user, false);
$this->assertInstanceOf(Session::class, $session);
}
public function testJoinSessionInitializesRightsAndPwd(): void
{
$user = new User();
$user->setUsername('testuser');
$session = new Session();
$setting = new SessionSetting();
$setting->setSession($session);
$setting->setName(SessionSettingType::INVITE_CODE);
$setting->setValue('abc-123');
$repo = $this->createMock(\Doctrine\ORM\EntityRepository::class);
$this->entityManager->method('getRepository')
->willReturn($repo);
$repo->method('findOneBy')
->willReturn($setting);
$this->entityManager->expects($this->exactly(6))
->method('persist');
// 1. Player, 2. SessionSetting (rights), 3. SessionSetting (pwd), 4. SessionSetting (chat tracking), 5. SessionSetting (verify codes), 6. SessionSetting (verification progress)
$result = $this->service->joinSession('abc-123', $user);
$this->assertTrue($result);
}
public function testLeaveSession(): void
{
$user = new User();
$session = new Session();
$session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
$session->setTimer(0);
$player1 = new Player();
$player1->setUser($user);
$player1->setSession($session);
$session->addPlayer($player1);
$player2 = new Player();
$player2->setUser(new User());
$player2->setSession($session);
$session->addPlayer($player2);
$setting = new SessionSetting();
$setting->setPlayer($player1);
$setting->setSession($session);
$session->addSetting($setting);
$this->entityManager->expects($this->exactly(2))
->method('remove');
// 1. SessionSetting, 2. Player
$result = $this->service->leaveSession($session, $user);
$this->assertTrue($result);
$this->assertCount(1, $session->getPlayers());
}
public function testLeaveSessionDeletesSessionIfLastPlayer(): void
{
$user = new User();
$session = new Session();
$session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
$session->setTimer(0);
$player = new Player();
$player->setUser($user);
$player->setSession($session);
$session->addPlayer($player);
$this->entityManager->expects($this->exactly(2))
->method('remove');
// 1. Player, 2. Session
$result = $this->service->leaveSession($session, $user);
$this->assertTrue($result);
}
}

View File

@@ -0,0 +1,101 @@
<?php
declare(strict_types=1);
namespace App\Tests\Game;
use App\Game\Entity\Player;
use App\Game\Entity\Session;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\SessionSettingType;
use App\Game\Repository\SessionSettingRepository;
use App\Game\Service\GameResponseService;
use App\Game\Service\PlayerService;
use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Mercure\HubInterface;
use Symfony\Component\Mercure\Update;
class GameResponseServiceChatVerifyCodeTest extends TestCase
{
private $security;
private $playerService;
private $sessionSettingRepository;
private $hub;
private $entityManager;
private $service;
protected function setUp(): void
{
$this->security = $this->createMock(Security::class);
$this->playerService = $this->createMock(PlayerService::class);
$this->sessionSettingRepository = $this->createMock(SessionSettingRepository::class);
$this->hub = $this->createMock(HubInterface::class);
$this->entityManager = $this->createMock(EntityManagerInterface::class);
$this->service = new GameResponseService(
$this->security,
$this->playerService,
$this->sessionSettingRepository,
$this->hub,
$this->entityManager
);
$_ENV['MERCURE_TOPIC_BASE'] = 'http://test';
}
public function testChatRegeneratesVerifyCodesIfShared(): void
{
$user = new User();
$user->setUsername('testuser');
$session = $this->createMock(Session::class);
$session->method('getId')->willReturn(123);
$player = $this->createMock(Player::class);
$player->method('getUser')->willReturn($user);
$player->method('getScreen')->willReturn(1);
$player->method('getSession')->willReturn($session);
$this->security->method('getUser')->willReturn($user);
$this->playerService->method('GetCurrentlyActiveAsPlayer')->willReturn($player);
// Mock rights
$rightsSetting = new SessionSetting();
$rightsSetting->setValue(json_encode(['chat']));
$this->sessionSettingRepository->method('getSetting')
->willReturnMap([
[$session, SessionSettingType::RIGHTS_FOR_PLAYER1, $player, $rightsSetting],
]);
// Mock verify codes
$verifyCodesSetting = new SessionSetting();
$initialCodes = ['2' => 'secret123', '3' => 'secret456'];
$verifyCodesSetting->setValue(json_encode($initialCodes));
// Setting repository map for multiple calls
$this->sessionSettingRepository->method('getSetting')
->willReturnCallback(function($s, $t, $p = null) use ($rightsSetting, $verifyCodesSetting) {
if ($t === SessionSettingType::RIGHTS_FOR_PLAYER1) return $rightsSetting;
if ($t === SessionSettingType::VERIFY_CODES_FOR_PLAYER1) return $verifyCodesSetting;
return null;
});
// Expect Mercure updates: 1 for chat, 1 for notification
$this->hub->expects($this->exactly(2))
->method('publish');
$this->entityManager->expects($this->once())
->method('flush');
$raw = json_encode(['message' => '/chat Hello look at my code secret123', 'ts' => '123']);
$result = $this->service->getGameResponse($raw);
$this->assertEquals(['result' => ['succesfully send']], $result);
$newCodes = json_decode($verifyCodesSetting->getValue(), true);
$this->assertNotEquals('secret123', $newCodes['2']);
$this->assertEquals('secret456', $newCodes['3']);
}
}