Skip to content

fix: RememberMe cookie does not work with Cookie prefix #212

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
merged 1 commit into from
Jun 8, 2022
Merged

fix: RememberMe cookie does not work with Cookie prefix #212

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
17 changes: 14 additions & 3 deletions src/Authentication/Authenticators/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,12 @@ private function checkRememberMe(): bool

private function getRememberMeToken(): ?string
{
helper('cookie');
/** @var IncomingRequest $request */
$request = service('request');

return get_cookie('remember');
$cookieName = setting('Cookie.prefix') . setting('Auth.sessionConfig')['rememberCookieName'];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a good candidate for a Config method, like we did with redirect URL. At this point it looks like this is the only place it is used.


return $request->getCookie($cookieName);
}

/**
Expand Down Expand Up @@ -627,8 +630,16 @@ private function issueRememberMeToken(): void
// Reset so it doesn't mess up future calls.
$this->shouldRemember = false;
} elseif ($this->getRememberMeToken()) {
/** @var Response $response */
$response = service('response');

// Remove incoming remember-me token
delete_cookie(setting('Auth.sessionConfig')['rememberCookieName']);
$response->deleteCookie(
setting('Auth.sessionConfig')['rememberCookieName'],
setting('Cookie.domain'),
setting('Cookie.path'),
setting('Cookie.prefix')
);

// @TODO delete the token record.
}
Expand Down
11 changes: 9 additions & 2 deletions tests/Authentication/Authenticators/SessionAuthenticatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ public function testLoggedInTrue(): void
public function testLoggedInWithRememberCookie(): void
{
unset($_SESSION['user']);
// Set Cookie.prefix
$cookiePrefix = 'prefix_';
setting('Cookie.prefix', $cookiePrefix);

$this->user->createEmailIdentity(['email' => 'foo@example.com', 'password' => 'secret']);

Expand All @@ -77,15 +80,19 @@ public function testLoggedInWithRememberCookie(): void
$rememberModel->rememberUser($this->user, $selector, hash('sha256', $validator), $expires);

// Set Cookie value for remember-me.
$token = $selector . ':' . $validator;
$_COOKIE['remember'] = $token;
$token = $selector . ':' . $validator;
$cookieName = $cookiePrefix . setting('Auth.sessionConfig')['rememberCookieName'];
$_COOKIE[$cookieName] = $token;

$this->assertTrue($this->auth->loggedIn());

$authUser = $this->auth->getUser();

$this->assertInstanceOf(User::class, $authUser);
$this->assertSame($this->user->id, $authUser->id);

// Forget Cookie.prefix
setting()->forget('Cookie.prefix');
}

public function testLoginNoRemember(): void
Expand Down