Skip to content

Regenerate session during Auth::login() #57204

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 4 commits into from
Oct 8, 2025
+9 −9
Merged

Regenerate session during Auth::login() #57204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afcf20e
Swap session migrate for regenerate in login flow
valorin Sep 28, 2025
a23ee5a
Update AuthGuard tests
valorin Sep 29, 2025
c1e4276
Update SessionGuard.php
taylorotwell Sep 30, 2025
60c95d5
Update SessionGuard.php
taylorotwell Sep 30, 2025
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
4 changes: 2 additions & 2 deletions src/Illuminate/Auth/SessionGuard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ public function login(AuthenticatableContract $user, $remember = false)
}

/**
* Update the session with the given ID.
* Update the session with the given ID and regenerate the session's token.
*
* @param string $id
* @return void
Expand All @@ -575,7 +575,7 @@ protected function updateSession($id)
{
$this->session->put($this->getName(), $id);

$this->session->migrate(true);
$this->session->regenerate(true);
}

/**
Expand Down
14 changes: 7 additions & 7 deletions tests/Auth/AuthGuardTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public function testAttemptAndWithCallbacks()
$mock->expects($this->once())->method('getName')->willReturn('foo');
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$mock->getProvider()->shouldReceive('retrieveByCredentials')->times(3)->with(['foo'])->andReturn($user);
$mock->getProvider()->shouldReceive('validateCredentials')->twice()->andReturnTrue();
$mock->getProvider()->shouldReceive('validateCredentials')->once()->andReturnFalse();
Expand Down Expand Up @@ -233,7 +233,7 @@ public function testLoginStoresIdentifierInSession()
$mock->expects($this->once())->method('getName')->willReturn('foo');
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$mock->login($user);
}

Expand Down Expand Up @@ -261,7 +261,7 @@ public function testLoginFiresLoginAndAuthenticatedEvents()
$mock->expects($this->once())->method('getName')->willReturn('foo');
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$mock->login($user);
}

Expand Down Expand Up @@ -501,7 +501,7 @@ public function testLoginMethodQueuesCookieWhenRemembering()
$cookie->shouldReceive('make')->once()->with($guard->getRecallerName(), 'foo|recaller|bar', 576000)->andReturn($foreverCookie);
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$user = m::mock(Authenticatable::class);
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
$user->shouldReceive('getAuthPassword')->andReturn('bar');
Expand All @@ -521,7 +521,7 @@ public function testLoginMethodQueuesCookieWhenRememberingAndAllowsOverride()
$cookie->shouldReceive('make')->once()->with($guard->getRecallerName(), 'foo|recaller|bar', 5000)->andReturn($foreverCookie);
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$user = m::mock(Authenticatable::class);
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
$user->shouldReceive('getAuthPassword')->andReturn('bar');
Expand All @@ -540,7 +540,7 @@ public function testLoginMethodCreatesRememberTokenIfOneDoesntExist()
$cookie->shouldReceive('make')->once()->andReturn($foreverCookie);
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$user = m::mock(Authenticatable::class);
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
$user->shouldReceive('getAuthPassword')->andReturn('foo');
Expand Down Expand Up @@ -608,7 +608,7 @@ public function testUserUsesRememberCookieIfItExists()
$guard->getProvider()->shouldReceive('retrieveByToken')->once()->with('id', 'recaller')->andReturn($user);
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
$guard->getSession()->shouldReceive('put')->with($guard->getName(), 'bar')->once();
$session->shouldReceive('migrate')->once();
$session->shouldReceive('regenerate')->once();
$this->assertSame($user, $guard->user());
$this->assertTrue($guard->viaRemember());
}
Expand Down