Fix #237 - use the right cookie name and value for FE user login check

lochmueller · Feb 11, 2020 · 29d07c0 · 29d07c0
1 parent 59706f7
commit 29d07c0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Classes/Middleware/FallbackMiddleware.php b/Classes/Middleware/FallbackMiddleware.php
@@ -16,6 +16,7 @@
 use SFC\Staticfilecache\Cache\Rule\AbstractRule;
 use SFC\Staticfilecache\Service\CacheService;
 use SFC\Staticfilecache\Service\ConfigurationService;
+use SFC\Staticfilecache\Service\CookieService;
 use SFC\Staticfilecache\Service\ObjectFactoryService;
 use TYPO3\CMS\Core\Http\HtmlResponse;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -66,7 +67,7 @@ protected function handleViaFallback(ServerRequestInterface $request): ResponseI
             }
         }
 
-        if (isset($_COOKIE['staticfilecache']) && $_COOKIE['staticfilecache'] === 'fe_typo_user_logged_in') {
+        if (isset($_COOKIE[CookieService::FE_COOKIE_NAME]) && $_COOKIE[CookieService::FE_COOKIE_NAME] === 'typo_user_logged_in') {
             throw new \Exception('StaticFileCache Cookie is set', 12738912);
         }
 

diff --git a/Classes/Middleware/GenerateMiddleware.php b/Classes/Middleware/GenerateMiddleware.php
@@ -15,6 +15,7 @@
 use SFC\Staticfilecache\Cache\UriFrontend;
 use SFC\Staticfilecache\Service\CacheService;
 use SFC\Staticfilecache\Service\ConfigurationService;
+use SFC\Staticfilecache\Service\CookieService;
 use SFC\Staticfilecache\Service\DateTimeService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -62,7 +63,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         $uri = (string)$request->getUri();
         if (!$response->hasHeader('X-SFC-Explanation')) {
-            if ($this->hasValidCacheEntry($uri) && !isset($_COOKIE['staticfilecache'])) {
+            if ($this->hasValidCacheEntry($uri) && !isset($_COOKIE[CookieService::FE_COOKIE_NAME])) {
                 $response = $response->withHeader('X-SFC-State', 'TYPO3 - already in cache');
                 return $this->removeSfcHeaders($response);
             }

diff --git a/Classes/Service/ClientService.php b/Classes/Service/ClientService.php
@@ -58,7 +58,7 @@ protected function getCallableClient(string $domain): Client
     {
         $jar = GeneralUtility::makeInstance(CookieJar::class);
         $cookie = GeneralUtility::makeInstance(SetCookie::class);
-        $cookie->setName('staticfilecache');
+        $cookie->setName(CookieService::FE_COOKIE_NAME);
         $cookie->setValue('1');
         $cookie->setPath('/');
         $cookie->setExpires((new DateTimeService())->getCurrentTime() + 3600);

diff --git a/Documentation/Configuration/Nginx.rst b/Documentation/Configuration/Nginx.rst
@@ -50,7 +50,7 @@ By the following configuration:
        }
 
        # We can't serve static files for logged-in BE/FE users
-       if ($cookie_staticfilecache = 'fe_typo_user_logged_in') {
+       if ($cookie_staticfilecache = 'typo_user_logged_in') {
            return 405;
        }
        if ($cookie_be_typo_user != '') {