From 43265d66839c617879256e1d3e90100051b1fa96 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Fri, 10 Jul 2026 15:15:35 +0530 Subject: [PATCH] Canonicalize verified OAuth emails (#12837) * fix: canonicalize verified OAuth emails * fix: prevent canonical OAuth email collisions * fix: validate OAuth email before identity creation --- app/controllers/api/account.php | 176 ++++++++++++++++++-------------- app/controllers/mock.php | 30 ++++-- 2 files changed, 122 insertions(+), 84 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index a4df1709df..add569b4fc 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1642,14 +1642,15 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') $name = $userDecoded['name']['firstName'] . ' ' . $userDecoded['name']['lastName']; } } - $email = $oauth2->getUserEmail($accessToken); + $providerEmail = $oauth2->getUserEmail($accessToken); + $email = $providerEmail; // Check if this identity is connected to a different user if (!$user->isEmpty()) { $userId = $user->getId(); $identityWithMatchingEmail = $dbForProject->findOne('identities', [ - Query::equal('providerEmail', [$email]), + Query::equal('providerEmail', [$providerEmail]), Query::notEqual('userInternalId', $user->getSequence()), ]); if (!$identityWithMatchingEmail->isEmpty()) { @@ -1703,10 +1704,42 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') $user = $dbForProject->getDocument('users', $identity->getAttribute('userId')); } + $emailMetadata = [ + 'emailCanonical' => null, + 'emailIsCanonical' => null, + 'emailIsCorporate' => null, + 'emailIsDisposable' => null, + 'emailIsFree' => null, + ]; + $emails = [$email]; + if ($user->isEmpty()) { + try { + $parsedEmail = new Email($providerEmail); + $canonical = $parsedEmail->getCanonical(); + $canonicalize = ( + $project->getId() === 'console' + || ($plan['supportsCanonicalEmailValidation'] ?? false) + ) + && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) + && $isVerified; + $email = $canonicalize ? $canonical : $providerEmail; + $emails = array_values(array_unique([$email, $providerEmail])); + $emailMetadata = [ + 'emailCanonical' => $canonical, + 'emailIsCanonical' => $canonicalize || $parsedEmail->get() === $canonical, + 'emailIsCorporate' => $parsedEmail->isCorporate(), + 'emailIsDisposable' => $parsedEmail->isDisposable(), + 'emailIsFree' => $parsedEmail->isFree(), + ]; + } catch (\Throwable) { + $failureRedirect(Exception::GENERAL_INVALID_EMAIL); + } + } + // If user is not found, check if there is a user with the same email if ($user->isEmpty()) { $userWithEmail = $dbForProject->findOne('users', [ - Query::equal('email', [$email]), + Query::equal('email', $emails), ]); if (!$userWithEmail->isEmpty()) { if (!$isVerified) { @@ -1719,7 +1752,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') // If user is not found, check if there is an identity with the same email if ($user->isEmpty()) { $identityWithMatchingEmail = $dbForProject->findOne('identities', [ - Query::equal('providerEmail', [$email]), + Query::equal('providerEmail', [$providerEmail]), ]); if (!$identityWithMatchingEmail->isEmpty()) { if (!$isVerified) { @@ -1740,28 +1773,6 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') } } - $emailMetadata = [ - 'emailCanonical' => null, - 'emailIsCanonical' => null, - 'emailIsCorporate' => null, - 'emailIsDisposable' => null, - 'emailIsFree' => null, - ]; - - try { - $parsedEmail = new Email($email); - $canonical = $parsedEmail->getCanonical(); - $emailMetadata = [ - 'emailCanonical' => $canonical, - 'emailIsCanonical' => $parsedEmail->get() === $canonical, - 'emailIsCorporate' => $parsedEmail->isCorporate(), - 'emailIsDisposable' => $parsedEmail->isDisposable(), - 'emailIsFree' => $parsedEmail->isFree(), - ]; - } catch (\Throwable) { - $failureRedirect(Exception::GENERAL_INVALID_EMAIL); - } - if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) { $failureRedirect(Exception::USER_EMAIL_DISPOSABLE); } @@ -1838,54 +1849,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') $failureRedirect(Exception::USER_BLOCKED); // User is in status blocked } - $identity = $dbForProject->findOne('identities', [ - Query::equal('userInternalId', [$user->getSequence()]), - Query::equal('provider', [$provider]), - Query::equal('providerUid', [$oauth2ID]), - ]); - if ($identity->isEmpty()) { - // Before creating the identity, check if the email is already associated with another user - $userId = $user->getId(); - - $identitiesWithMatchingEmail = $dbForProject->find('identities', [ - Query::equal('providerEmail', [$email]), - Query::notEqual('userInternalId', $user->getSequence()), - ]); - if (!empty($identitiesWithMatchingEmail)) { - $failureRedirect(Exception::GENERAL_BAD_REQUEST); - /** Return a generic bad request to prevent exposing existing accounts */ - } - - $dbForProject->createDocument('identities', new Document([ - '$id' => ID::unique(), - '$permissions' => [ - Permission::read(Role::any()), - Permission::update(Role::user($userId)), - Permission::delete(Role::user($userId)), - ], - 'userInternalId' => $user->getSequence(), - 'userId' => $userId, - 'provider' => $provider, - 'providerUid' => $oauth2ID, - 'providerEmail' => $email, - 'providerAccessToken' => $accessToken, - 'providerRefreshToken' => $refreshToken, - 'providerAccessTokenExpiry' => DateTime::addSeconds(new \DateTime(), (int) $accessTokenExpiry), - ])); - } else { - $identity - ->setAttribute('providerAccessToken', $accessToken) - ->setAttribute('providerRefreshToken', $refreshToken) - ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int) $accessTokenExpiry)); - $dbForProject->updateDocument('identities', $identity->getId(), new Document([ - 'providerAccessToken' => $identity->getAttribute('providerAccessToken'), - 'providerRefreshToken' => $identity->getAttribute('providerRefreshToken'), - 'providerAccessTokenExpiry' => $identity->getAttribute('providerAccessTokenExpiry'), - ])); - } - if (empty($user->getAttribute('email'))) { - $email = $oauth2->getUserEmail($accessToken); $emailMetadata = [ 'emailCanonical' => null, 'emailIsCanonical' => null, @@ -1895,11 +1859,19 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') ]; try { - $parsedEmail = new Email($email); + $parsedEmail = new Email($providerEmail); $canonical = $parsedEmail->getCanonical(); + $canonicalize = ( + $project->getId() === 'console' + || ($plan['supportsCanonicalEmailValidation'] ?? false) + ) + && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) + && $oauth2->isEmailVerified($accessToken); + $email = $canonicalize ? $canonical : $providerEmail; + $emails = array_values(array_unique([$email, $providerEmail])); $emailMetadata = [ 'emailCanonical' => $canonical, - 'emailIsCanonical' => $parsedEmail->get() === $canonical, + 'emailIsCanonical' => $canonicalize || $parsedEmail->get() === $canonical, 'emailIsCorporate' => $parsedEmail->isCorporate(), 'emailIsDisposable' => $parsedEmail->isDisposable(), 'emailIsFree' => $parsedEmail->isFree(), @@ -1908,6 +1880,14 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') $failureRedirect(Exception::GENERAL_INVALID_EMAIL); } + $userWithMatchingEmail = $dbForProject->find('users', [ + Query::equal('email', $emails), + Query::notEqual('$id', $user->getId()), + ]); + if (!empty($userWithMatchingEmail)) { + $failureRedirect(Exception::USER_ALREADY_EXISTS); + } + if ((($project->getId() === 'console') || ($plan['supportsDisposableEmailValidation'] ?? false)) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) { $failureRedirect(Exception::USER_EMAIL_DISPOSABLE); } @@ -1932,6 +1912,52 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect') $user->setAttribute('emailIsFree', $emailMetadata['emailIsFree']); } + $identity = $dbForProject->findOne('identities', [ + Query::equal('userInternalId', [$user->getSequence()]), + Query::equal('provider', [$provider]), + Query::equal('providerUid', [$oauth2ID]), + ]); + if ($identity->isEmpty()) { + // Before creating the identity, check if the email is already associated with another user + $userId = $user->getId(); + + $identitiesWithMatchingEmail = $dbForProject->find('identities', [ + Query::equal('providerEmail', [$providerEmail]), + Query::notEqual('userInternalId', $user->getSequence()), + ]); + if (!empty($identitiesWithMatchingEmail)) { + $failureRedirect(Exception::GENERAL_BAD_REQUEST); + /** Return a generic bad request to prevent exposing existing accounts */ + } + + $dbForProject->createDocument('identities', new Document([ + '$id' => ID::unique(), + '$permissions' => [ + Permission::read(Role::any()), + Permission::update(Role::user($userId)), + Permission::delete(Role::user($userId)), + ], + 'userInternalId' => $user->getSequence(), + 'userId' => $userId, + 'provider' => $provider, + 'providerUid' => $oauth2ID, + 'providerEmail' => $providerEmail, + 'providerAccessToken' => $accessToken, + 'providerRefreshToken' => $refreshToken, + 'providerAccessTokenExpiry' => DateTime::addSeconds(new \DateTime(), (int) $accessTokenExpiry), + ])); + } else { + $identity + ->setAttribute('providerAccessToken', $accessToken) + ->setAttribute('providerRefreshToken', $refreshToken) + ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int) $accessTokenExpiry)); + $dbForProject->updateDocument('identities', $identity->getId(), new Document([ + 'providerAccessToken' => $identity->getAttribute('providerAccessToken'), + 'providerRefreshToken' => $identity->getAttribute('providerRefreshToken'), + 'providerAccessTokenExpiry' => $identity->getAttribute('providerAccessTokenExpiry'), + ])); + } + if (empty($user->getAttribute('name'))) { $user->setAttribute('name', $oauth2->getUserName($accessToken)); } diff --git a/app/controllers/mock.php b/app/controllers/mock.php index fcb17da717..9e32f8298a 100644 --- a/app/controllers/mock.php +++ b/app/controllers/mock.php @@ -69,7 +69,9 @@ Http::get('/v1/mock/tests/general/oauth2/token') ->inject('response') ->action(function (string $client_id, string $client_secret, string $grantType, string $redirectURI, string $code, string $refreshToken, Response $response) { - if ($client_id != '1') { + $canonicalEmail = \str_starts_with($client_id, 'canonical-'); + + if ($client_id != '1' && !$canonicalEmail) { throw new Exception(Exception::GENERAL_MOCK, 'Invalid client ID'); } @@ -78,7 +80,7 @@ Http::get('/v1/mock/tests/general/oauth2/token') } $responseJson = [ - 'access_token' => '123456', + 'access_token' => $canonicalEmail ? $client_id : '123456', 'refresh_token' => 'tuvwxyz', 'expires_in' => 14400 ]; @@ -109,16 +111,26 @@ Http::get('/v1/mock/tests/general/oauth2/user') ->inject('response') ->action(function (string $token, Response $response) { - if ($token != '123456') { + if ($token === '123456') { + $user = [ + 'id' => 1, + 'name' => 'User Name', + 'email' => 'useroauth@localhost.test', + 'verified' => true, + ]; + } elseif (\str_starts_with($token, 'canonical-')) { + $id = \substr($token, \strlen('canonical-')); + $user = [ + 'id' => $id, + 'name' => 'Canonical Email User', + 'email' => 'oauth.' . $id . '@gmail.com', + 'verified' => true, + ]; + } else { throw new Exception(Exception::GENERAL_MOCK, 'Invalid token'); } - $response->json([ - 'id' => 1, - 'name' => 'User Name', - 'email' => 'useroauth@localhost.test', - 'verified' => true, - ]); + $response->json($user); }); Http::get('/v1/mock/tests/general/oauth2/user-unverified')