Skip to content

Commit 7c4dc98

Browse files
committed
Middlware: Prevented caching of all app requests
Previously we'd prevent caching of authed responses for security (prevent back cache or proxy caching) but caching could still be an issue in non-auth scenarios due to CSRF (eg. returning to login screen after session expiry). For #4600
1 parent 9b4f1fb commit 7c4dc98

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

app/Http/Kernel.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Kernel extends HttpKernel
1515
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
1616
\BookStack\Http\Middleware\TrimStrings::class,
1717
\BookStack\Http\Middleware\TrustProxies::class,
18+
\BookStack\Http\Middleware\PreventResponseCaching::class,
1819
];
1920

2021
/**
@@ -30,7 +31,6 @@ class Kernel extends HttpKernel
3031
\Illuminate\Session\Middleware\StartSession::class,
3132
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
3233
\BookStack\Http\Middleware\VerifyCsrfToken::class,
33-
\BookStack\Http\Middleware\PreventAuthenticatedResponseCaching::class,
3434
\BookStack\Http\Middleware\CheckEmailConfirmed::class,
3535
\BookStack\Http\Middleware\RunThemeActions::class,
3636
\BookStack\Http\Middleware\Localization::class,
@@ -40,7 +40,6 @@ class Kernel extends HttpKernel
4040
\BookStack\Http\Middleware\EncryptCookies::class,
4141
\BookStack\Http\Middleware\StartSessionIfCookieExists::class,
4242
\BookStack\Http\Middleware\ApiAuthenticate::class,
43-
\BookStack\Http\Middleware\PreventAuthenticatedResponseCaching::class,
4443
\BookStack\Http\Middleware\CheckEmailConfirmed::class,
4544
],
4645
];

app/Http/Middleware/PreventAuthenticatedResponseCaching.php renamed to app/Http/Middleware/PreventResponseCaching.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Closure;
66
use Symfony\Component\HttpFoundation\Response;
77

8-
class PreventAuthenticatedResponseCaching
8+
class PreventResponseCaching
99
{
1010
/**
1111
* Handle an incoming request.
@@ -20,11 +20,8 @@ public function handle($request, Closure $next)
2020
/** @var Response $response */
2121
$response = $next($request);
2222

23-
if (!user()->isGuest()) {
24-
$response->headers->set('Cache-Control', 'max-age=0, no-store, private');
25-
$response->headers->set('Pragma', 'no-cache');
26-
$response->headers->set('Expires', 'Sun, 12 Jul 2015 19:01:00 GMT');
27-
}
23+
$response->headers->set('Cache-Control', 'no-cache, no-store, private');
24+
$response->headers->set('Expires', 'Sun, 12 Jul 2015 19:01:00 GMT');
2825

2926
return $response;
3027
}

tests/SecurityHeaderTest.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,17 @@ public function test_frame_src_csp_header_has_drawio_host_added()
139139
$this->assertEquals('frame-src \'self\' https://example.com https://diagrams.example.com', $scriptHeader);
140140
}
141141

142-
public function test_cache_control_headers_are_strict_on_responses_when_logged_in()
142+
public function test_cache_control_headers_are_set_on_responses()
143143
{
144+
// Public access
145+
$resp = $this->get('/');
146+
$resp->assertHeader('Cache-Control', 'no-cache, no-store, private');
147+
$resp->assertHeader('Expires', 'Sun, 12 Jul 2015 19:01:00 GMT');
148+
149+
// Authed access
144150
$this->asEditor();
145151
$resp = $this->get('/');
146-
$resp->assertHeader('Cache-Control', 'max-age=0, no-store, private');
147-
$resp->assertHeader('Pragma', 'no-cache');
152+
$resp->assertHeader('Cache-Control', 'no-cache, no-store, private');
148153
$resp->assertHeader('Expires', 'Sun, 12 Jul 2015 19:01:00 GMT');
149154
}
150155

0 commit comments

Comments
 (0)