Skip to content

Only allow requesting new CSRF tokens if it passes the SameSite Cooki… #18644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jan 7, 2020
+17 −1
Merged

Only allow requesting new CSRF tokens if it passes the SameSite Cooki… #18644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/Controller/CSRFTokenController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

use OC\Security\CSRF\CsrfTokenManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;

Expand All @@ -54,6 +55,10 @@ public function __construct(string $appName, IRequest $request,
* @return JSONResponse
*/
public function index(): JSONResponse {
if (!$this->request->passesStrictCookieCheck()) {
return new JSONResponse([], Http::STATUS_FORBIDDEN);
}

$requestToken = $this->tokenManager->getToken();

return new JSONResponse([
Expand Down
13 changes: 12 additions & 1 deletion tests/Core/Controller/CSRFTokenControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ protected function setUp(): void {
$this->tokenManager);
}

public function testGetToken() {
public function testGetToken(): void {
$this->request->method('passesStrictCookieCheck')->willReturn(true);

$token = $this->createMock(CsrfToken::class);
$this->tokenManager->method('getToken')->willReturn($token);
$token->method('getEncryptedValue')->willReturn('toktok123');
Expand All @@ -68,4 +70,13 @@ public function testGetToken() {
], $response->getData());
}

public function testGetTokenNoStrictSameSiteCookie(): void {
$this->request->method('passesStrictCookieCheck')->willReturn(false);

$response = $this->controller->index();

$this->assertInstanceOf(JSONResponse::class, $response);
$this->assertSame(Http::STATUS_FORBIDDEN, $response->getStatus());
}

}