mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/OATHAuth
synced 2024-12-12 08:35:07 +00:00
2832e97046
The current implementation of OATHUserRepository::persist() causes every
key to get a new ID when it's saved. This, combined with ::removeKey()
which compares keys by ID, means that using recovery codes to disable
TOTP is broken since TOTPKey calls persist() to mark the code as saved
just before the key is deleted.
In this patch I've chosen to add a new ::updateKey() method instead of
fixing ::persist(). This is more in line with the other new APIs in
OATHUserRepository (namely ::createKey() and ::removeKey()), and is
something I've been planning to do eventually - this bug just made that
a bit more urgent. ::persist() should be dropped once WebAuthn has been
updated too.
Tests are also updated - OATHUserRepositoryTest now updates the key
before deleting it and there's a new TOTPDisableFormTest to test the
entire disabling process.
Bug: T363548
Change-Id: I86ddc8e5bfc9cf74c587ffdff523f559c5a3c08c
(cherry picked from commit 0dad2c7031
)
369 lines
11 KiB
PHP
369 lines
11 KiB
PHP
<?php
|
|
/**
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
namespace MediaWiki\Extension\OATHAuth;
|
|
|
|
use BagOStuff;
|
|
use FormatJson;
|
|
use InvalidArgumentException;
|
|
use MediaWiki\Config\ConfigException;
|
|
use MediaWiki\Extension\OATHAuth\Notifications\Manager;
|
|
use MediaWiki\User\CentralId\CentralIdLookupFactory;
|
|
use MediaWiki\User\User;
|
|
use MWException;
|
|
use Psr\Log\LoggerAwareInterface;
|
|
use Psr\Log\LoggerInterface;
|
|
use RequestContext;
|
|
use RuntimeException;
|
|
use Wikimedia\Rdbms\IConnectionProvider;
|
|
|
|
class OATHUserRepository implements LoggerAwareInterface {
|
|
private IConnectionProvider $dbProvider;
|
|
|
|
private BagOStuff $cache;
|
|
|
|
private OATHAuthModuleRegistry $moduleRegistry;
|
|
|
|
private CentralIdLookupFactory $centralIdLookupFactory;
|
|
|
|
private LoggerInterface $logger;
|
|
|
|
public function __construct(
|
|
IConnectionProvider $dbProvider,
|
|
BagOStuff $cache,
|
|
OATHAuthModuleRegistry $moduleRegistry,
|
|
CentralIdLookupFactory $centralIdLookupFactory,
|
|
LoggerInterface $logger
|
|
) {
|
|
$this->dbProvider = $dbProvider;
|
|
$this->cache = $cache;
|
|
$this->moduleRegistry = $moduleRegistry;
|
|
$this->centralIdLookupFactory = $centralIdLookupFactory;
|
|
$this->setLogger( $logger );
|
|
}
|
|
|
|
/**
|
|
* @param LoggerInterface $logger
|
|
*/
|
|
public function setLogger( LoggerInterface $logger ) {
|
|
$this->logger = $logger;
|
|
}
|
|
|
|
/**
|
|
* @param User $user
|
|
* @return OATHUser
|
|
* @throws ConfigException
|
|
* @throws MWException
|
|
*/
|
|
public function findByUser( User $user ) {
|
|
$oathUser = $this->cache->get( $user->getName() );
|
|
if ( !$oathUser ) {
|
|
$uid = $this->centralIdLookupFactory->getLookup()
|
|
->centralIdFromLocalUser( $user );
|
|
$oathUser = new OATHUser( $user, $uid );
|
|
$this->loadKeysFromDatabase( $oathUser );
|
|
$this->cache->set( $user->getName(), $oathUser );
|
|
}
|
|
return $oathUser;
|
|
}
|
|
|
|
/**
|
|
* @param OATHUser $user
|
|
* @param string|null $clientInfo
|
|
* @throws ConfigException
|
|
* @throws MWException
|
|
*/
|
|
public function persist( OATHUser $user, $clientInfo = null ) {
|
|
if ( !$clientInfo ) {
|
|
$clientInfo = RequestContext::getMain()->getRequest()->getIP();
|
|
}
|
|
$prevUser = $this->findByUser( $user->getUser() );
|
|
$userId = $this->centralIdLookupFactory->getLookup()->centralIdFromLocalUser( $user->getUser() );
|
|
$moduleId = $this->moduleRegistry->getModuleId( $user->getModule()->getName() );
|
|
|
|
$dbw = $this->dbProvider->getPrimaryDatabase( 'virtual-oathauth' );
|
|
$dbw->startAtomic( __METHOD__ );
|
|
|
|
// TODO: only update changed rows
|
|
$dbw->newDeleteQueryBuilder()
|
|
->deleteFrom( 'oathauth_devices' )
|
|
->where( [ 'oad_user' => $userId ] )
|
|
->caller( __METHOD__ )
|
|
->execute();
|
|
|
|
foreach ( $user->getKeys() as $key ) {
|
|
$dbw->newInsertQueryBuilder()
|
|
->insertInto( 'oathauth_devices' )
|
|
->row( [
|
|
'oad_user' => $userId,
|
|
'oad_type' => $moduleId,
|
|
'oad_data' => FormatJson::encode( $key->jsonSerialize() )
|
|
] )
|
|
->caller( __METHOD__ )
|
|
->execute();
|
|
}
|
|
|
|
$dbw->endAtomic( __METHOD__ );
|
|
|
|
$this->loadKeysFromDatabase( $user );
|
|
|
|
$userName = $user->getUser()->getName();
|
|
$this->cache->set( $userName, $user );
|
|
|
|
if ( $prevUser !== false ) {
|
|
$this->logger->info( 'OATHAuth updated for {user} from {clientip}', [
|
|
'user' => $userName,
|
|
'clientip' => $clientInfo,
|
|
'oldoathtype' => $prevUser->getModule()->getName(),
|
|
'newoathtype' => $user->getModule()->getName(),
|
|
] );
|
|
} else {
|
|
// If findByUser() has returned false, there was no user row or cache entry
|
|
$this->logger->info( 'OATHAuth enabled for {user} from {clientip}', [
|
|
'user' => $userName,
|
|
'clientip' => $clientInfo,
|
|
'oathtype' => $user->getModule()->getName(),
|
|
] );
|
|
Manager::notifyEnabled( $user );
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Persists the given OAuth key in the database.
|
|
*
|
|
* @param OATHUser $user
|
|
* @param IModule $module
|
|
* @param array $keyData
|
|
* @param string $clientInfo
|
|
* @return IAuthKey
|
|
*/
|
|
public function createKey( OATHUser $user, IModule $module, array $keyData, string $clientInfo ): IAuthKey {
|
|
if ( $user->getModule() && $user->getModule()->getName() !== $module->getName() ) {
|
|
throw new InvalidArgumentException(
|
|
"User already has a key from a different module enabled ({$user->getModule()->getName()})"
|
|
);
|
|
}
|
|
|
|
$userId = $this->centralIdLookupFactory->getLookup()->centralIdFromLocalUser( $user->getUser() );
|
|
$moduleId = $this->moduleRegistry->getModuleId( $module->getName() );
|
|
|
|
$dbw = $this->dbProvider->getPrimaryDatabase( 'virtual-oathauth' );
|
|
$dbw->newInsertQueryBuilder()
|
|
->insertInto( 'oathauth_devices' )
|
|
->row( [
|
|
'oad_user' => $userId,
|
|
'oad_type' => $moduleId,
|
|
'oad_data' => FormatJson::encode( $keyData ),
|
|
] )
|
|
->caller( __METHOD__ )
|
|
->execute();
|
|
$id = $dbw->insertId();
|
|
|
|
$hasExistingKey = $user->isTwoFactorAuthEnabled();
|
|
|
|
$key = $module->newKey( $keyData + [ 'id' => $id ] );
|
|
$user->addKey( $key );
|
|
|
|
$this->logger->info( 'OATHAuth {oathtype} key {key} added for {user} from {clientip}', [
|
|
'key' => $id,
|
|
'user' => $user->getUser()->getName(),
|
|
'clientip' => $clientInfo,
|
|
'oathtype' => $module->getName(),
|
|
] );
|
|
|
|
if ( !$hasExistingKey ) {
|
|
$user->setModule( $module );
|
|
Manager::notifyEnabled( $user );
|
|
}
|
|
|
|
return $key;
|
|
}
|
|
|
|
/**
|
|
* Saves an existing key in the database.
|
|
*
|
|
* @param OATHUser $user
|
|
* @param IAuthKey $key
|
|
* @return void
|
|
*/
|
|
public function updateKey( OATHUser $user, IAuthKey $key ): void {
|
|
$keyId = $key->getId();
|
|
if ( !$keyId ) {
|
|
throw new InvalidArgumentException( 'updateKey() can only be used with already existing keys' );
|
|
}
|
|
|
|
$userId = $this->centralIdLookupFactory->getLookup()
|
|
->centralIdFromLocalUser( $user->getUser() );
|
|
|
|
$dbw = $this->dbProvider->getPrimaryDatabase( 'virtual-oathauth' );
|
|
$dbw->newUpdateQueryBuilder()
|
|
->table( 'oathauth_devices' )
|
|
->set( [ 'oad_data' => FormatJson::encode( $key->jsonSerialize() ) ] )
|
|
->where( [ 'oad_user' => $userId, 'oad_id' => $keyId ] )
|
|
->execute();
|
|
|
|
$this->logger->info( 'OATHAuth key {keyId} updated for {user}', [
|
|
'keyId' => $keyId,
|
|
'user' => $user->getUser()->getName(),
|
|
] );
|
|
}
|
|
|
|
/**
|
|
* @param OATHUser $user
|
|
* @param IAuthKey $key
|
|
* @param string $clientInfo
|
|
* @param bool $self Whether they disabled it themselves
|
|
*/
|
|
public function removeKey( OATHUser $user, IAuthKey $key, string $clientInfo, bool $self ) {
|
|
$keyId = $key->getId();
|
|
if ( !$keyId ) {
|
|
throw new InvalidArgumentException( 'A non-persisted key cannot be removed' );
|
|
}
|
|
|
|
$userId = $this->centralIdLookupFactory->getLookup()
|
|
->centralIdFromLocalUser( $user->getUser() );
|
|
$this->dbProvider->getPrimaryDatabase( 'virtual-oathauth' )
|
|
->newDeleteQueryBuilder()
|
|
->deleteFrom( 'oathauth_devices' )
|
|
->where( [ 'oad_user' => $userId, 'oad_id' => $keyId ] )
|
|
->caller( __METHOD__ )
|
|
->execute();
|
|
|
|
// TODO: figure this out from the key itself
|
|
// After calling ->disable(), getModule() will return null so this
|
|
// has to be done before.
|
|
$keyType = $user->getModule()->getName();
|
|
|
|
// Remove the key from the user object
|
|
$user->setKeys(
|
|
array_values(
|
|
array_filter(
|
|
$user->getKeys(),
|
|
static function ( IAuthKey $key ) use ( $keyId ) {
|
|
return $key->getId() !== $keyId;
|
|
}
|
|
)
|
|
)
|
|
);
|
|
|
|
if ( !$user->getKeys() ) {
|
|
$user->setModule( null );
|
|
}
|
|
|
|
$userName = $user->getUser()->getName();
|
|
$this->cache->delete( $userName );
|
|
|
|
$this->logger->info( 'OATHAuth removed {oathtype} key {key} for {user} from {clientip}', [
|
|
'key' => $keyId,
|
|
'user' => $userName,
|
|
'clientip' => $clientInfo,
|
|
'oathtype' => $keyType,
|
|
] );
|
|
|
|
Manager::notifyDisabled( $user, $self );
|
|
}
|
|
|
|
/**
|
|
* @param OATHUser $user
|
|
* @param string $clientInfo
|
|
* @param bool $self Whether the user disabled the 2FA themselves
|
|
*
|
|
* @deprecated since 1.41, use removeAll() instead
|
|
*/
|
|
public function remove( OATHUser $user, $clientInfo, bool $self ) {
|
|
$this->removeAll( $user, $clientInfo, $self );
|
|
}
|
|
|
|
/**
|
|
* @param OATHUser $user
|
|
* @param string $clientInfo
|
|
* @param bool $self Whether they disabled it themselves
|
|
*/
|
|
public function removeAll( OATHUser $user, $clientInfo, bool $self ) {
|
|
$userId = $this->centralIdLookupFactory->getLookup()
|
|
->centralIdFromLocalUser( $user->getUser() );
|
|
$this->dbProvider->getPrimaryDatabase( 'virtual-oathauth' )
|
|
->newDeleteQueryBuilder()
|
|
->deleteFrom( 'oathauth_devices' )
|
|
->where( [ 'oad_user' => $userId ] )
|
|
->caller( __METHOD__ )
|
|
->execute();
|
|
|
|
// TODO: figure this out from the key itself
|
|
// After calling ->disable(), getModule() will return null so this
|
|
// has to be done before.
|
|
$keyType = $user->getModule()->getName();
|
|
|
|
$user->disable();
|
|
|
|
$userName = $user->getUser()->getName();
|
|
$this->cache->delete( $userName );
|
|
|
|
$this->logger->info( 'OATHAuth disabled for {user} from {clientip}', [
|
|
'user' => $userName,
|
|
'clientip' => $clientInfo,
|
|
'oathtype' => $keyType,
|
|
] );
|
|
|
|
Manager::notifyDisabled( $user, $self );
|
|
}
|
|
|
|
private function loadKeysFromDatabase( OATHUser $user ): void {
|
|
$uid = $this->centralIdLookupFactory->getLookup()
|
|
->centralIdFromLocalUser( $user->getUser() );
|
|
|
|
$res = $this->dbProvider
|
|
->getReplicaDatabase( 'virtual-oathauth' )
|
|
->newSelectQueryBuilder()
|
|
->select( [
|
|
'oad_id',
|
|
'oad_data',
|
|
'oat_name',
|
|
] )
|
|
->from( 'oathauth_devices' )
|
|
->join( 'oathauth_types', null, [ 'oat_id = oad_type' ] )
|
|
->where( [ 'oad_user' => $uid ] )
|
|
->caller( __METHOD__ )
|
|
->fetchResultSet();
|
|
|
|
$module = null;
|
|
|
|
// Clear stored key list before loading keys
|
|
$user->disable();
|
|
|
|
foreach ( $res as $row ) {
|
|
if ( $module && $row->oat_name !== $module->getName() ) {
|
|
// Not supported by current application-layer code.
|
|
throw new RuntimeException( "User {$uid} has multiple different two-factor modules defined" );
|
|
}
|
|
|
|
if ( !$module ) {
|
|
$module = $this->moduleRegistry->getModuleByKey( $row->oat_name );
|
|
$user->setModule( $module );
|
|
|
|
if ( !$module ) {
|
|
throw new MWException( 'oathauth-module-invalid' );
|
|
}
|
|
}
|
|
|
|
$keyData = FormatJson::decode( $row->oad_data, true );
|
|
$user->addKey( $module->newKey( $keyData + [ 'id' => (int)$row->oad_id ] ) );
|
|
}
|
|
}
|
|
}
|