Skip to content
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

Fix: Match token login name by UID or e-mail address #50254

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −4
Open

Fix: Match token login name by UID or e-mail address #50254

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
11 changes: 7 additions & 4 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,12 +780,15 @@ private function validateToken($token, $user = null) {
* Check if login names match
*/
private function validateTokenLoginName(?string $loginName, IToken $token): bool {
if ($token->getLoginName() !== $loginName) {
// TODO: this makes it impossible to use different login names on browser and client
// e.g. login by e-mail '[email protected]' on browser for generating the token will not
// allow to use the client token with the login name 'user'.
$tokenUser = $this->manager->get($token->getUID());
if (!is_null($tokenUser)) {
$tokenEmail = $tokenUser->getEMailAddress();
}

if ($token->getLoginName() !== $loginName && (is_null($tokenUser) || $tokenEmail !== $loginName)) {
$this->logger->error('App token login name does not match', [
'tokenLoginName' => $token->getLoginName(),
'tokenEmailAddress' => $tokenEmail,
'sessionLoginName' => $loginName,
'app' => 'core',
'user' => $token->getUID(),
Expand Down
39 changes: 39 additions & 0 deletions tests/lib/User/SessionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,45 @@ public function testLogClientInWithTokenPassword(): void {
$this->assertTrue($userSession->logClientIn('john', 'I-AM-AN-APP-PASSWORD', $request, $this->throttler));
}

public function testLogClientInWithEmailTokenPassword(): void {
$manager = $this->createMock(Manager::class);
$session = $this->createMock(ISession::class);
$request = $this->createMock(IRequest::class);

/** @var Session $userSession */
$userSession = $this->getMockBuilder(Session::class)
->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher])
->setMethods(['isTokenPassword', 'login', 'supportsCookies', 'createSessionToken', 'getUser'])
->getMock();

$user = $this->createMock(IUser::class);
$user
->method('getUID')
->willReturn('john');
$user
->method('getEMailAddress')
->willReturn('[email protected]');
$manager
->method('get')
->with('john')
->willReturn($user);
$userSession->expects($this->once())
->method('isTokenPassword')
->willReturn(true);
$userSession->expects($this->once())
->method('login')
->with('[email protected]')
->willReturn(false);
$token = new PublicKeyToken();
$token->setLoginName('john');
$token->setUid('john');
$this->tokenProvider
->method('getToken')
->with('I-AM-AN-APP-PASSWORD')
->willReturn($token);

$this->assertTrue($userSession->logClientIn('[email protected]', 'I-AM-AN-APP-PASSWORD', $request, $this->throttler));
}

public function testLogClientInNoTokenPasswordNo2fa(): void {
$this->expectException(PasswordLoginForbiddenException::class);
Expand Down
Loading