mirror of
https://github.com/werkraum-media/watchlist.git
synced 2024-05-20 05:04:09 +02:00
Daniel Siepmann
ca9d22298e
Fix broken cookie path within middleware. For some reason we used the `/typo3/` path while storing cookies server side. But we used `/` in JavaScript. That didn't play together and was fixed to always be `/` for now, but it should be configurable in general. The fix revealed that the detection of whether to store a cookie was broken, which was fixed within the corresponding service. Furthermore the dates how long the cookie should be stored was different. We now always use 7 days.
115 lines
3.5 KiB
PHP
115 lines
3.5 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
/*
|
|
* Copyright (C) 2022 Daniel Siepmann <coding@daniel-siepmann.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301, USA.
|
|
*/
|
|
|
|
namespace WerkraumMedia\Watchlist\Middleware;
|
|
|
|
use Psr\Http\Message\ResponseInterface;
|
|
use Psr\Http\Message\ServerRequestInterface;
|
|
use Psr\Http\Server\MiddlewareInterface;
|
|
use Psr\Http\Server\RequestHandlerInterface;
|
|
use Symfony\Component\HttpFoundation\Cookie;
|
|
use TYPO3\CMS\Core\Http\NormalizedParams;
|
|
use WerkraumMedia\Watchlist\Session\CookieSessionService;
|
|
|
|
class CookieSessionMiddleware implements MiddlewareInterface
|
|
{
|
|
private CookieSessionService $cookieSession;
|
|
|
|
public function __construct(
|
|
CookieSessionService $cookieSession
|
|
) {
|
|
$this->cookieSession = $cookieSession;
|
|
}
|
|
|
|
public function process(
|
|
ServerRequestInterface $request,
|
|
RequestHandlerInterface $handler
|
|
): ResponseInterface {
|
|
$response = $handler->handle($request);
|
|
|
|
if ($this->shouldAddCookie($request)) {
|
|
return $this->addCookie($response, $request);
|
|
}
|
|
if ($this->shouldRemoveCookie($request)) {
|
|
return $this->removeCookie($response, $request);
|
|
}
|
|
|
|
return $response;
|
|
}
|
|
|
|
private function shouldAddCookie(ServerRequestInterface $request): bool
|
|
{
|
|
return $this->cookieSession->getCookieValue() !== '';
|
|
}
|
|
|
|
private function addCookie(
|
|
ResponseInterface $response,
|
|
ServerRequestInterface $request
|
|
): ResponseInterface {
|
|
return $response->withAddedHeader(
|
|
'Set-Cookie',
|
|
$this->getCookie($request)->__toString()
|
|
);
|
|
}
|
|
|
|
private function shouldRemoveCookie(ServerRequestInterface $request): bool
|
|
{
|
|
$cookieName = $this->cookieSession->getCookieName();
|
|
|
|
return $this->cookieSession->getCookieValue() === ''
|
|
&& isset($request->getCookieParams()[$cookieName])
|
|
;
|
|
}
|
|
|
|
private function removeCookie(
|
|
ResponseInterface $response,
|
|
ServerRequestInterface $request
|
|
): ResponseInterface {
|
|
$cookie = $this->getCookie($request)
|
|
->withExpires(-1);
|
|
return $response->withAddedHeader('Set-Cookie', $cookie->__toString());
|
|
}
|
|
|
|
private function getCookie(ServerRequestInterface $request): Cookie
|
|
{
|
|
$normalizedParams = $request->getAttribute('normalizedParams');
|
|
if (!$normalizedParams instanceof NormalizedParams) {
|
|
throw new \Exception('Could not retrieve normalized params from request.', 1664357339);
|
|
}
|
|
|
|
$days = 7;
|
|
|
|
return new Cookie(
|
|
$this->cookieSession->getCookieName(),
|
|
$this->cookieSession->getCookieValue(),
|
|
$GLOBALS['EXEC_TIME'] + 24 * 60 * 60 * $days,
|
|
$normalizedParams->getSitePath(),
|
|
'',
|
|
false,
|
|
false,
|
|
false,
|
|
Cookie::SAMESITE_STRICT
|
|
);
|
|
}
|
|
}
|