12 Commits

Author SHA1 Message Date
Frank
de4b7bca6a Verification done 2026-01-07 20:06:28 +01:00
c6adb00219 Merge pull request 'continue-puzzle-progress' (#6) from continue-puzzle-progress into main
Reviewed-on: #6
2026-01-07 16:50:36 +00:00
Frank
5f6ea89179 ls 2026-01-07 17:45:17 +01:00
Frank
c384fc3dd5 Sudo, rm and setup for ls 2026-01-07 15:00:28 +01:00
Frank
78b570bd75 Hint for first part 2026-01-07 14:33:10 +01:00
74f52db002 Merge pull request 'Created a dashboard and created an invite code for game sessions.' (#5) from game-pages into main
Reviewed-on: #5
2026-01-06 19:24:15 +00:00
Frank
56590a901f Created a dashboard and created an invite code for game sessions. 2026-01-06 20:23:46 +01:00
49045bc696 Merge pull request 'Game1-layout' (#4) from Game1-layout into main
Reviewed-on: #4
2026-01-06 19:21:58 +00:00
Frank
28ee969c29 Message on reload to hopefully stop the user. 2026-01-06 20:20:33 +01:00
Frank
7230520551 Layout done, probably need rework later on 2026-01-06 20:20:33 +01:00
Frank
59c1d97d84 Rechten van setup.sh 2026-01-06 20:20:17 +01:00
Frank van den Berg
3de1e907f2 Made it workable on docker containers 2026-01-06 19:48:33 +01:00
19 changed files with 1559 additions and 71 deletions

View File

@@ -1,6 +1,9 @@
/* Game1 entry point built with Webpack Encore */ /* Game1 entry point built with Webpack Encore */
import './styles/game1.css'; import './styles/game1.css';
let sequenceFinished = false;
let stillPlayingSound = true;
function subscribeToMercure(mercurePublicUrl, topic) { function subscribeToMercure(mercurePublicUrl, topic) {
try { try {
const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic); const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
@@ -10,6 +13,25 @@ function subscribeToMercure(mercurePublicUrl, topic) {
try { try {
const data = JSON.parse(event.data); const data = JSON.parse(event.data);
console.log('[Mercure][game1] Update:', data); console.log('[Mercure][game1] Update:', data);
// data is [sendTo, message]
if (Array.isArray(data) && data.length >= 2) {
const messageContainer = document.getElementById('message-container');
if (messageContainer) {
const msgEl = document.createElement('div');
msgEl.className = 'message';
msgEl.textContent = data[1];
msgEl.style.color = '#0F0'; // Green for incoming messages
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
if(stillPlayingSound)
playSound();
console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
if (sequenceFinished) {
flashRed();
}
}
}
} catch (e) { } catch (e) {
console.log('[Mercure][game1] Raw event:', event.data); console.log('[Mercure][game1] Raw event:', event.data);
} }
@@ -25,6 +47,28 @@ function subscribeToMercure(mercurePublicUrl, topic) {
} }
} }
function playSound() {
const sound = document.getElementById('message-sound');
if (sound) {
sound.currentTime = 0;
sound.play().catch(e => console.warn('[Audio] Playback failed:', e));
}
}
function flashRed() {
console.log('[Game1] Triggering flashRed');
const body = document.body;
body.classList.remove('flash-red');
void body.offsetWidth; // Trigger reflow to restart animation
body.classList.add('flash-red');
// Also remove it after animation finishes so it's clean for inspection
setTimeout(() => {
body.classList.remove('flash-red');
console.log('[Game1] Removed flash-red class');
}, 150);
}
async function fetchJson(url, options = {}) { async function fetchJson(url, options = {}) {
const opts = { ...options }; const opts = { ...options };
const headers = new Headers(opts.headers || {}); const headers = new Headers(opts.headers || {});
@@ -60,6 +104,15 @@ document.addEventListener('DOMContentLoaded', async () => {
// Look for config injected by Twig in the page // Look for config injected by Twig in the page
const cfgEl = document.getElementById('mercure-config'); const cfgEl = document.getElementById('mercure-config');
// Prevent/warn on page reload
window.addEventListener('beforeunload', (event) => {
// Standard way to trigger the browser's confirmation dialog
event.preventDefault();
// Included for compatibility with older browsers
event.returnValue = '';
});
if (!cfgEl) { if (!cfgEl) {
console.warn('[Mercure][game1] #mercure-config element not found on page'); console.warn('[Mercure][game1] #mercure-config element not found on page');
return; return;
@@ -69,7 +122,6 @@ document.addEventListener('DOMContentLoaded', async () => {
const topic = cfgEl.dataset.topic; const topic = cfgEl.dataset.topic;
const apiPingUrl = cfgEl.dataset.apiPingUrl; const apiPingUrl = cfgEl.dataset.apiPingUrl;
const apiEchoUrl = cfgEl.dataset.apiEchoUrl; const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
const userId = cfgEl.dataset.userId;
if (mercurePublicUrl && topic) { if (mercurePublicUrl && topic) {
subscribeToMercure(mercurePublicUrl, topic); subscribeToMercure(mercurePublicUrl, topic);
@@ -89,7 +141,7 @@ document.addEventListener('DOMContentLoaded', async () => {
if (apiEchoUrl) { if (apiEchoUrl) {
const echo = await fetchJson(apiEchoUrl, { const echo = await fetchJson(apiEchoUrl, {
method: 'POST', method: 'POST',
body: { message: 'from game1.js', ts: new Date().toISOString(), user: userId }, body: { message: 'from game1.js', ts: new Date().toISOString() },
}); });
console.log('[API][game1] echo →', echo); console.log('[API][game1] echo →', echo);
} else { } else {
@@ -98,4 +150,81 @@ document.addEventListener('DOMContentLoaded', async () => {
} catch (e) { } catch (e) {
console.error('[API][game1] Request failed:', e); console.error('[API][game1] Request failed:', e);
} }
// Add messages to message-container
const messageContainer = document.getElementById('message-container');
if (messageContainer) {
let messages = [
['System initializing...', 500],
['Connection established.', 200],
['Welcome agent to the mainframe.', 1000],
['Scanning...', 3000],
['Virus detected.', 500],
['Starting Mainframe help modus...', 2000],
['Help modus activated.', 500],
['Blocking virus activated', 0]
];
let currentMessageIndex = 0;
const printNextMessage = () => {
if (currentMessageIndex < messages.length) {
const msg = messages[currentMessageIndex];
const msgEl = document.createElement('div');
let extraClass = '';
if(msg[2])
extraClass = msg[2];
msgEl.className = 'message ' + extraClass;
msgEl.textContent = msg[0];
msgEl.style.marginBottom = '10px';
messageContainer.appendChild(msgEl);
playSound();
currentMessageIndex++;
setTimeout(printNextMessage, msg[1]);
if (sequenceFinished) {
flashRed();
}
} else {
// After it has printed a set of messages, it has to start a timer of 2 seconds
console.log('[Game1] All messages printed. Starting 2s timer to expand message-container height...');
setTimeout(() => {
messageContainer.style.height = '400vh';
const inputField = document.getElementById('input-message');
inputField.disabled = false;
// Add event listener for Enter key
inputField.addEventListener('keypress', async (e) => {
if (e.key === 'Enter') {
stillPlayingSound = false;
sequenceFinished = false;
const message = inputField.value.trim();
if (message && apiEchoUrl) {
inputField.value = '';
try {
const response = await fetchJson(apiEchoUrl, {
method: 'POST',
body: { message, ts: new Date().toISOString() },
});
console.log('[API][game1] message sent →', response);
} catch (err) {
console.error('[API][game1] Failed to send message:', err);
}
}
}
});
console.log('[Game1] message-container height changed to 400vh and input enabled');
sequenceFinished = true;
console.log('[Game1] sequenceFinished is now TRUE');
}, 2000);
}
};
printNextMessage();
}
}); });

View File

@@ -1,17 +1,89 @@
/* Styles specific to Game1 */ /* Styles specific to Game1 */
/* page-level indicator to confirm CSS is loaded */ /* page-level indicator to confirm CSS is loaded */
body.game1-page { /* Custom scrollbar for WebKit browsers */
/* subtle background tint so you can visually confirm on /game */ html::-webkit-scrollbar,
background-color: #f9fbff; body::-webkit-scrollbar {
width: 1px;
} }
/* example component style */ html::-webkit-scrollbar-track,
.game1-banner { body::-webkit-scrollbar-track {
padding: 1rem 1.25rem; background: #000;
border: 1px solid #cfe2ff; }
background: #e9f2ff;
color: #0b5ed7; html::-webkit-scrollbar-thumb,
border-radius: 8px; body::-webkit-scrollbar-thumb {
margin: 1rem 0; background: #F00;
}
/* Standard properties for Firefox */
body {
background-color: #000;
min-height: 100vh;
font-family: monospace;
margin: 0;
scrollbar-width: thin;
scrollbar-color: #F00 #000;
}
div#game-timer {
position: fixed;
top: 20px;
left: 20px;
color: #F00;
font-size: 28px;
z-index: 100;
}
div#message-container {
padding: 20px;
padding-top: 60px; /* Space for fixed timer */
display: flex;
flex-direction: column;
justify-content: flex-end;
min-height: calc(100vh - 100px); /* Fill most of the viewport initially */
box-sizing: border-box;
font-size: 20px;
}
div.message {
color: #C0C0C0;
}
div#input {
padding: 20px;
}
input#input-message {
width: 100%;
padding: 10px;
background: #111;
border: 1px solid #A00000;
color: #C0C0C0;
font-size: 18px;
box-sizing: border-box;
font-family: monospace;
}
.flash-red::after {
content: '';
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 100px;
pointer-events: none;
background: linear-gradient(to top, rgba(255, 0, 0, 0.8), transparent);
animation: flash-red-anim 0.1s linear forwards;
z-index: 9999;
}
@keyframes flash-red-anim {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
} }

View File

@@ -5,7 +5,7 @@ services:
php: php:
build: build:
context: .. context: ..
dockerfile: php/Dockerfile dockerfile: docker/php/Dockerfile
container_name: escapepage-php container_name: escapepage-php
volumes: volumes:
- ../:/var/www/html:delegated - ../:/var/www/html:delegated
@@ -18,6 +18,23 @@ services:
- backend - backend
restart: unless-stopped restart: unless-stopped
php-worker:
build:
context: ..
dockerfile: docker/php/Dockerfile
container_name: escapepage-php-worker
volumes:
- ../:/var/www/html:delegated
environment:
APP_ENV: dev
depends_on:
- database
- mercure
command: ["php", "bin/console", "messenger:consume", "async", "-vv"]
networks:
- backend
restart: unless-stopped
nginx: nginx:
image: nginx:1.29.4-alpine image: nginx:1.29.4-alpine
container_name: escapepage-nginx container_name: escapepage-nginx

View File

@@ -1,11 +1,20 @@
FROM php:8.5.1-fpm-alpine3.23 FROM php:8.3-fpm-alpine
# Install system deps # Install system deps
RUN apk add --no-cache bash git icu-dev libzip-dev oniguruma-dev RUN apk add --no-cache \
bash \
git \
icu-dev \
libzip-dev \
oniguruma-dev \
g++ \
make \
nodejs \
npm
# Install PHP extensions # Install PHP extensions
RUN docker-php-ext-configure intl \ RUN docker-php-ext-configure intl \
&& docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache && docker-php-ext-install -j$(nproc) intl pdo pdo_mysql opcache zip
# Install composer # Install composer
ENV COMPOSER_ALLOW_SUPERUSER=1 \ ENV COMPOSER_ALLOW_SUPERUSER=1 \
@@ -13,7 +22,7 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
# Configure PHP # Configure PHP
COPY php.ini $PHP_INI_DIR/conf.d/zz-custom.ini COPY docker/php/php.ini $PHP_INI_DIR/conf.d/zz-custom.ini
WORKDIR /var/www/html WORKDIR /var/www/html

View File

@@ -66,12 +66,15 @@ dc up "${BUILD_ARGS[@]}"
# Helper to run commands in php container # Helper to run commands in php container
pexec() { dc exec -T php "$@"; } pexec() { dc exec -T php "$@"; }
# Wait for database to be healthy (mariadb) # Wait for database to be healthy (mariadb/mysql)
printf "Waiting for database to be healthy..." printf "Waiting for database to be healthy..."
# Use docker inspect health status # Use docker inspect health status
DB_HEALTH="" DB_HEALTH=""
for i in {1..60}; do for i in {1..60}; do
DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$(docker ps --filter name=_database_ --format '{{.ID}}' | head -n1)" 2>/dev/null || true) DB_ID=$(dc ps -q database 2>/dev/null || true)
if [ -n "$DB_ID" ]; then
DB_HEALTH=$(docker inspect -f '{{.State.Health.Status}}' "$DB_ID" 2>/dev/null || true)
fi
if [ "$DB_HEALTH" = "healthy" ]; then if [ "$DB_HEALTH" = "healthy" ]; then
echo " OK" echo " OK"
break break
@@ -79,7 +82,7 @@ for i in {1..60}; do
printf "." printf "."
sleep 2 sleep 2
if [ "$i" -eq 60 ]; then if [ "$i" -eq 60 ]; then
echo "\nWarning: database health check not healthy yet, continuing anyway." echo -e "\nWarning: database health check not healthy yet, continuing anyway."
fi fi
done done
@@ -100,11 +103,23 @@ if grep -q '^APP_SECRET=$' "$ROOT_DIR/.env" 2>/dev/null; then
fi fi
# Prepare DB # Prepare DB
pexec php bin/console doctrine:database:create --if-not-exists || true echo "Creating database if it doesn't exist..."
pexec php bin/console doctrine:migrations:migrate -n || true pexec php bin/console doctrine:database:create --if-not-exists
echo "Running migrations..."
pexec php bin/console doctrine:migrations:migrate -n
# Import JS deps (Importmap/Asset Mapper) # Import JS deps (Importmap/Asset Mapper)
pexec php bin/console importmap:install || true if [ -f "$ROOT_DIR/importmap.php" ]; then
pexec php bin/console importmap:install || true
fi
# Build assets if using Webpack Encore
if [ -f "$ROOT_DIR/package.json" ]; then
echo "Installing npm dependencies..."
pexec npm install
echo "Building assets..."
pexec npm run build
fi
APP_URL=http://localhost:8080 APP_URL=http://localhost:8080
MAILPIT_URL=http://localhost:8025 MAILPIT_URL=http://localhost:8025
@@ -117,10 +132,12 @@ Open the app: $APP_URL
Mailpit (dev): $MAILPIT_URL Mailpit (dev): $MAILPIT_URL
Common commands: Common commands:
(cd docker && $DOCKER_COMPOSE logs -f nginx) (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f nginx)
(cd docker && $DOCKER_COMPOSE logs -f php) (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php)
(cd docker && $DOCKER_COMPOSE exec php bash) (cd "$DOCKER_DIR" && $DOCKER_COMPOSE logs -f php-worker)
(cd docker && $DOCKER_COMPOSE down) (cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php bash)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE exec php npm run watch)
(cd "$DOCKER_DIR" && $DOCKER_COMPOSE down)
You can re-run this script any time. Use --no-build to skip rebuilding images. You can re-run this script any time. Use --no-build to skip rebuilding images.
EOT EOT

BIN
public/audio/message.mp3 Normal file

Binary file not shown.

View File

@@ -3,17 +3,90 @@ declare(strict_types=1);
namespace App\Game\Controller; namespace App\Game\Controller;
use App\Game\Entity\Session;
use App\Game\Repository\GameRepository;
use App\Game\Repository\SessionRepository;
use App\Game\Service\GameDashboardService;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Http\Attribute\IsGranted;
use Symfony\Component\ExpressionLanguage\Expression;
final class GameController extends AbstractController final class GameController extends AbstractController
{ {
#[Route(path: '', name: 'game')] #[Route(path: '', name: 'game_dashboard', methods: ['GET', 'POST'])]
public function index(): Response #[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
{ public function dashboard(
return $this->render('game/index.html.twig', [ Request $request,
'user_id' => $this->getUser()?->getId(), GameRepository $gameRepository,
SessionRepository $sessionRepository,
GameDashboardService $dashboardService,
Security $security
): Response {
$user = $security->getUser();
$isAdmin = $this->isGranted('ROLE_ADMIN');
if ($request->isMethod('POST')) {
if ($request->request->has('create_session')) {
$gameId = $request->request->get('game_id');
$game = $gameRepository->find($gameId);
if ($game) {
if ($dashboardService->createSession($game, $user, $isAdmin)) {
$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);
if (!$session) {
$this->addFlash('error', 'Session not found.');
return $this->redirectToRoute('game_dashboard');
}
$inviteCode = $dashboardService->generateInviteCode($session, $user, $isAdmin);
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');
}
return $this->render('game/dashboard.html.twig', [
'sessions' => $dashboardService->getSessionsForUser($user),
'availableGames' => $dashboardService->getAvailableGames($isAdmin),
]); ]);
} }
#[Route(path: '/{session}', name: 'game')]
#[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
#[IsGranted('SESSION_VIEW', subject: 'session')]
public function index(
Session $session): Response
{
return $this->render('game/index.html.twig', ['session' => $session]);
}
} }

View File

@@ -10,4 +10,15 @@ enum SessionSettingType: string
case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1'; case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2'; case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3'; 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';
} }

View File

@@ -0,0 +1,48 @@
<?php
namespace App\Game\Security\Voter;
use App\Game\Entity\Session;
use App\Tech\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
class SessionVoter extends Voter
{
public const VIEW = 'SESSION_VIEW';
public function __construct(
private readonly Security $security,
) {
}
protected function supports(string $attribute, mixed $subject): bool
{
return $attribute === self::VIEW && $subject instanceof Session;
}
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
{
$user = $token->getUser();
if (!$user instanceof User) {
return false;
}
if ($this->security->isGranted('ROLE_ADMIN')) {
return true;
}
/** @var Session $session */
$session = $subject;
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
return true;
}
}
return false;
}
}

View File

@@ -0,0 +1,298 @@
<?php
declare(strict_types=1);
namespace App\Game\Service;
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\Enum\SessionStatus;
use App\Game\Repository\GameRepository;
use App\Game\Repository\SessionRepository;
use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Security\Core\User\UserInterface;
final class GameDashboardService
{
public function __construct(
private readonly GameRepository $gameRepository,
private readonly SessionRepository $sessionRepository,
private readonly EntityManagerInterface $entityManager,
) {
}
/**
* @return Session[]
*/
public function getSessionsForUser(UserInterface $user): array
{
return $this->sessionRepository->createQueryBuilder('s')
->innerJoin('s.players', 'p')
->where('p.user = :user')
->setParameter('user', $user)
->getQuery()
->getResult();
}
/**
* @return Game[]
*/
public function getAvailableGames(bool $isAdmin): array
{
if ($isAdmin) {
return $this->gameRepository->findAll();
}
return $this->gameRepository->findBy(['status' => GameStatus::OPEN]);
}
public function createSession(Game $game, UserInterface $user, bool $isAdmin): ?Session
{
if ($game->getStatus() !== GameStatus::OPEN && !$isAdmin) {
return null;
}
if(!$user instanceof User)
return null;
$session = new Session();
$session->setGame($game);
$session->setStatus(SessionStatus::CREATED);
$session->setTimer(0);
$player = new Player();
$player->setUser($user);
$player->setSession($session);
$player->setScreen(1);
$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?
$isPlayer = false;
foreach ($session->getPlayers() as $player) {
if ($player->getUser() === $user) {
$isPlayer = true;
break;
}
}
if (!$isPlayer && !$isAdmin) {
return null;
}
$inviteCode = bin2hex(random_bytes(4));
$setting = null;
foreach ($session->getSettings() as $s) {
if ($s->getName() === SessionSettingType::INVITE_CODE) {
$setting = $s;
break;
}
}
if (!$setting) {
$setting = new SessionSetting();
$setting->setSession($session);
$setting->setName(SessionSettingType::INVITE_CODE);
}
$setting->setValue($inviteCode);
$this->entityManager->persist($setting);
$this->entityManager->flush();
return $inviteCode;
}
}

View File

@@ -5,9 +5,13 @@ namespace App\Game\Service;
use App\Game\Enum\DecodeMessage; use App\Game\Enum\DecodeMessage;
use App\Game\Enum\SessionSettingType; use App\Game\Enum\SessionSettingType;
use App\Game\Entity\Player; use App\Game\Entity\Player;
use App\Game\Entity\SessionSetting;
use App\Game\Repository\SessionSettingRepository; use App\Game\Repository\SessionSettingRepository;
use App\Tech\Entity\User; use App\Tech\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\SecurityBundle\Security; use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Mercure\HubInterface;
use Symfony\Component\Mercure\Update;
class GameResponseService class GameResponseService
{ {
@@ -15,10 +19,12 @@ class GameResponseService
private Security $security, private Security $security,
private PlayerService $playerService, private PlayerService $playerService,
private SessionSettingRepository $sessionSettingRepository, private SessionSettingRepository $sessionSettingRepository,
private HubInterface $hub,
private EntityManagerInterface $entityManager,
) { ) {
} }
public function getGameResponse(string $raw) public function getGameResponse(string $raw) : array
{ {
$info = json_decode($raw, true); $info = json_decode($raw, true);
@@ -83,8 +89,10 @@ class GameResponseService
if(!in_array('chat', $rechten)) if(!in_array('chat', $rechten))
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
$this->handleChatMessage($message); if($this->handleChatMessage($message, $player))
break; return ['result' => ['succesfully send']];
else
return ['result' => ['Error sending']];
case '/help': case '/help':
return ['result' => $this->getHelpCommand($rechten)]; return ['result' => $this->getHelpCommand($rechten)];
case '/decode': case '/decode':
@@ -96,12 +104,11 @@ class GameResponseService
if(!in_array('verify', $rechten)) if(!in_array('verify', $rechten))
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
$result = $this->handleVerifyMessage($message); $result = $this->handleVerifyMessage($message, $player);
return ['result' => [$result]]; return ['result' => [$result]];
default: default:
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
} }
return [];
} }
private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array private function checkConsoleCommando(string $message, Player $player, bool $sudo = false) : array
@@ -112,8 +119,15 @@ class GameResponseService
case 'help': case 'help':
return ['result' => $this->getHelpCommand($rechten)]; return ['result' => $this->getHelpCommand($rechten)];
case 'ls': case 'ls':
break; if(!in_array('ls', $rechten))
return ['result' => ['Unknown command']];
$files = $this->getAllCurrentFilesInDirectory($player);
return ['result' => $files];
case 'cd': case 'cd':
if(!in_array('cd', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player); $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if(!$pwd) if(!$pwd)
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
@@ -124,14 +138,43 @@ class GameResponseService
$this->playerService->saveCurrentPwdOfPlayer($player, $newLocation); $this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
return ['result' => ['Path: ' . $newLocation]]; return ['result' => ['Path: ' . $newLocation]];
case 'pwd':
if(!in_array('pwd', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
return ['result' => ['Path: ' . $pwd]];
case 'rm': case 'rm':
break; if(!in_array('rm', $rechten))
return ['result' => ['Unknown command']];
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if(!$pwd)
return ['result' => ['Unknown command']];
if (!isset($messagePart[1])) {
return ['result' => ['Usage: rm {filename}']];
}
$filename = $messagePart[1];
$fullPath = ($pwd === '/' ? '' : $pwd) . '/' . $filename;
if(!$this->isAllowedToRemove($fullPath, $player, $sudo))
return ['result' => ['You are not allowed to remove this file.']];
$this->playerService->addDeletedFileToSession($player, $fullPath);
return ['result' => ['File removed: ' . $filename]];
case 'sudo': case 'sudo':
break; if(!in_array('sudo', $rechten))
return ['result' => ['Unknown command']];
$sudo = array_shift($messagePart);
$message = implode(' ', $messagePart);
return $this->checkConsoleCommando($message, $player, true);
default: default:
return ['result' => ['Unknown command']]; return ['result' => ['Unknown command']];
} }
return [];
} }
private function getHelpCommand(mixed $rechten) : array private function getHelpCommand(mixed $rechten) : array
@@ -161,6 +204,13 @@ class GameResponseService
$messages[] = ' USAGE: /decode {message}'; $messages[] = ' USAGE: /decode {message}';
$messages[] = ''; $messages[] = '';
break; break;
case 'pwd':
$messages[] = 'pwd';
$messages[] = ' This message will let you know what your current location is.';
$messages[] = ' It will show you the folder you are in so you can continue navigating the server.';
$messages[] = ' USAGE: pwd';
$messages[] = '';
break;
case 'cat': case 'cat':
$messages[] = 'cat'; $messages[] = 'cat';
$messages[] = ' To read a file, use cat {filename}.'; $messages[] = ' To read a file, use cat {filename}.';
@@ -210,9 +260,180 @@ class GameResponseService
return $messages; return $messages;
} }
private function handleChatMessage(string $message) private function handleChatMessage(string $message, Player $player) : bool
{ {
$messageParts = explode(' ', $message);
$toSingle = false;
if (isset($messageParts[1]) &&
is_numeric($messageParts[1]) &&
$messageParts[1] >= 1 &&
$messageParts[1] <= 3) {
$toSingle = true;
}
$chatMessage = array_shift($messageParts);
$sendTo = 0;
if ($toSingle) {
$sendTo = array_shift($messageParts);
$chatMessage = array_shift($messageParts);
}
$message = $player->getUser()->getUsername() . ': ' . $chatMessage . ' ';
foreach($messageParts as $messagePart) {
$message .= $messagePart . ' ';
}
$message = trim($message);
$activeGame = $player->getSession()?->getId();
if(is_null($activeGame))
return false;
$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) private function handleDecodeMessage(string $message, Player $player)
@@ -247,9 +468,123 @@ class GameResponseService
return $randomString; 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();
}
} }
private function goToNewDir(string $pwd, string $newPwd, Player $player) : string|bool private function goToNewDir(string $pwd, string $newPwd, Player $player) : string|bool
@@ -329,4 +664,119 @@ class GameResponseService
return $paths; return $paths;
} }
private function isAllowedToRemove(string $file, Player $player, bool $sudo) : bool
{
if(!$this->fileExists($file, $player))
return false;
if(str_starts_with($file, '/var/rapports/'))
return false;
$rights = $this->getRechten($player);
if(in_array('sudo', $rights) || $sudo)
return true;
$sudoFiles = [
'/var/arrest/handle.sh',
'/var/arrest/cell.sh',
'/var/marriage/divorce.sh',
];
return !in_array($file, $sudoFiles);
}
private function fileExists(string $file, Player $player) : bool
{
$files = $this->getAllPossibleFiles($player);
if(in_array($file, $files))
return true;
return false;
}
private function getAllPossibleFiles(Player $player = null) : array
{
$files = [];
$files[] = '/var/arrest/handle.sh';
$files[] = '/var/arrest/bars.sh';
$files[] = '/var/arrest/cell.sh';
$files[] = '/var/marriage/share.sh';
$files[] = '/var/marriage/divorce.sh';
$files[] = '/var/rapports/095_07-14.txt';
$files[] = '/var/rapports/007_19-52.txt';
$files[] = '/var/rapports/083_25-39.txt';
$files[] = '/var/rapports/019_31-11.txt';
$files[] = '/var/rapports/075_46-77.txt';
$files[] = '/var/rapports/031_53-28.txt';
$files[] = '/var/rapports/072_61-05.txt';
$files[] = '/var/rapports/064_72-90.txt';
$files[] = '/var/rapports/091_81-33.txt';
$files[] = '/var/rapports/079_89-47.txt';
$files[] = '/var/rapports/098_92-14.txt';
$files[] = '/var/rapports/012_94-31.txt';
$files[] = '/var/rapports/016_98-07.txt';
$files[] = '/var/rapports/087_102-45.txt';
$files[] = '/var/rapports/094_110-19.txt';
$files[] = '/var/rapports/063_117-56.txt';
$files[] = '/var/rapports/017_123-88.txt';
$files[] = '/var/rapports/093_138-24.txt';
$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;
}
private function getAllCurrentFilesInDirectory(Player $player) : array
{
$pwd = $this->playerService->getCurrentPwdOfPlayer($player);
if (!$pwd) {
return [];
}
$allPaths = $this->getAllPossiblePaths($player);
$allFiles = $this->getAllPossibleFiles();
$deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
$entries = [];
// Find directories in current pwd
foreach ($allPaths as $path) {
if ($path === $pwd) {
continue;
}
// Check if $path is a direct child of $pwd
$parent = $this->getPrevPath($path);
if ($parent === $pwd) {
$parts = explode('/', $path);
$entries[] = [end($parts) . '/', 'dir'];
}
}
// Find files in current pwd
foreach ($allFiles as $file) {
if (in_array($file, $deletedFiles)) {
continue;
}
$parent = $this->getPrevPath($file);
if ($parent === $pwd) {
$parts = explode('/', $file);
$entries[] = [end($parts), 'file'];
}
}
sort($entries);
return $entries;
}
} }

View File

@@ -4,6 +4,7 @@ namespace App\Game\Service;
use App\Game\Entity\Game; use App\Game\Entity\Game;
use App\Game\Entity\Player; use App\Game\Entity\Player;
use App\Game\Entity\SessionSetting;
use App\Game\Enum\SessionSettingType; use App\Game\Enum\SessionSettingType;
use App\Game\Enum\SessionStatus; use App\Game\Enum\SessionStatus;
use App\Game\Repository\PlayerRepository; use App\Game\Repository\PlayerRepository;
@@ -73,4 +74,33 @@ class PlayerService
$this->entityManager->persist($setting); $this->entityManager->persist($setting);
$this->entityManager->flush(); $this->entityManager->flush();
} }
public function getDeletedFilesOfSession(Player $player): array
{
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
if (!$setting || !$setting->getValue()) {
return [];
}
return json_decode($setting->getValue(), true) ?? [];
}
public function addDeletedFileToSession(Player $player, string $filename): void
{
$setting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::SET_OF_DELETED_FILES);
if (!$setting) {
$setting = new SessionSetting();
$setting->setSession($player->getSession());
$setting->setName(SessionSettingType::SET_OF_DELETED_FILES);
}
$deletedFiles = json_decode($setting->getValue() ?? '[]', true) ?? [];
if (!in_array($filename, $deletedFiles)) {
$deletedFiles[] = $filename;
$setting->setValue(json_encode($deletedFiles));
$this->entityManager->persist($setting);
$this->entityManager->flush();
}
}
} }

View File

@@ -31,6 +31,8 @@ class RegistrationController extends AbstractController
) )
); );
$user->setRoles(['ROLE_USER', 'ROLE_PLAYER']);
$entityManager->persist($user); $entityManager->persist($user);
$entityManager->flush(); $entityManager->flush();

View File

@@ -14,7 +14,7 @@
<nav> <nav>
{% set pathinfo = app.request.pathinfo %} {% set pathinfo = app.request.pathinfo %}
<a href="/">{{ 'nav.home'|trans }}</a> | <a href="/">{{ 'nav.home'|trans }}</a> |
<a href="/game">{{ 'nav.game'|trans }}</a> | <a href="{{ path('game_dashboard') }}">{{ 'nav.game'|trans }}</a> |
{% if app.user %} {% if app.user %}
<a href="{{ path('app_logout') }}">Logout</a> <a href="{{ path('app_logout') }}">Logout</a>
{% else %} {% else %}

View File

@@ -0,0 +1,86 @@
{% extends 'base.html.twig' %}
{% block title %}Game Dashboard{% endblock %}
{% block body %}
<h1>Game Dashboard</h1>
<h2>Create New Session</h2>
{% if availableGames is not empty %}
<form method="post">
<select name="game_id">
{% for game in availableGames %}
<option value="{{ game.id }}">
{{ game.name }} ({{ game.numberOfPlayers }} players)
{% if is_granted('ROLE_ADMIN') %}
[{{ game.status.value }}]
{% endif %}
</option>
{% endfor %}
</select>
<button type="submit" name="create_session">Create Session</button>
</form>
{% else %}
<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>
<thead>
<tr>
<th>ID</th>
<th>Game</th>
<th>Status</th>
<th>Created At</th>
<th>Invite Code</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for session in sessions %}
<tr>
<td>{{ session.id }}</td>
<td>{{ session.game.name }}</td>
<td>{{ session.status.value }}</td>
<td>{{ session.created|date('Y-m-d H:i') }}</td>
<td>
{% set inviteCode = '' %}
{% for setting in session.settings %}
{% if setting.name.value == 'InviteCode' %}
{% set inviteCode = setting.value %}
{% endif %}
{% endfor %}
{% if inviteCode %}
<code>{{ inviteCode }}</code>
{% else %}
<form method="post" style="display:inline;">
<input type="hidden" name="session_id" value="{{ session.id }}">
<button type="submit" name="create_invite">Generate Invite</button>
</form>
{% endif %}
</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 %}
</tbody>
</table>
{% else %}
<p>You are not part of any sessions.</p>
{% endif %}
{% endblock %}

View File

@@ -1,33 +1,43 @@
{% extends 'base.html.twig' %} <!DOCTYPE html>
<html lang="{{ app.request.locale|default(app.request.defaultLocale|default('en')) }}">
{% block title %}{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}{% endblock %} <head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ 'game.title'|trans({'%site%': ('site.name'|trans)}) }}</title>
{# Include Game1-specific CSS in addition to the base app assets #} {# Include Game1-specific CSS in addition to the base app assets #}
{% block stylesheets %} {% block stylesheets %}
{{ parent() }} {{ encore_entry_link_tags('app') }}
{{ encore_entry_link_tags('game1') }} {{ encore_entry_link_tags('game1') }}
{% endblock %} {% endblock %}
</head>
<body>
<div id="game-container">
<div id="mercure-config"
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}"
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') }}"
style="display:none">
</div>
{% block body %} <div id="game-timer">
<h1>{{ 'game.h1'|trans }}</h1> 00:30:00
<p>{{ 'game.description'|trans }}</p> </div>
<div class="game1-banner">Game 1 assets are active. Enjoy the challenge!</div> <div id="message-container">
{# Hidden config element read by assets/game1.js #} </div>
<div id="mercure-config" <audio id="message-sound" style="display:none">
data-mercure-public-url="{{ mercure_public_url|e('html_attr') }}" <source src="{{ asset('audio/message.mp3') }}" type="audio/mpeg">
data-topic="{{ (mercure_topic_base ~ '/game/hub')|e('html_attr') }}" </audio>
data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}" <div id="input">
data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}" <input type="text" disabled id="input-message">
data-user-id="{{ user_id|e('html_attr') }}" </div>
style="display:none"> </div>
</div> </body>
<p><a href="{{ path('website_home') }}">{{ 'link.back_to_website'|trans }}</a></p>
{% endblock %}
{# Include Game1-specific JS in addition to the base app assets #} {# Include Game1-specific JS in addition to the base app assets #}
{% block javascripts %} {% block javascripts %}
{{ parent() }} {{ encore_entry_script_tags('app') }}
{{ encore_entry_script_tags('game1') }} {{ encore_entry_script_tags('game1') }}
{% endblock %} {% endblock %}

View File

@@ -5,5 +5,5 @@
{% block body %} {% block body %}
<h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1> <h1>{{ 'home.h1'|trans({'%site%': ('site.name'|trans)}) }}</h1>
<p>{{ 'home.description'|trans }}</p> <p>{{ 'home.description'|trans }}</p>
<p><a href="{{ path('game') }}">{{ 'link.enter_game'|trans }}</a></p> <p><a href="{{ path('game_dashboard') }}">{{ 'link.enter_game'|trans }}</a></p>
{% endblock %} {% endblock %}

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']);
}
}