mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/OATHAuth
synced 2024-12-18 02:50:33 +00:00
6ef3d2418a
This adds new database tables to support storing multiple authentication factors for a single user. The current approach taken is to use a single database row per 2fa method and key. The current module/key abstraction will have to be updated to support having multiple module types for a single user (for example for having a separate module for recovery codes), but this patch does not address that and instead keeps the existing limitations, however the needed updates for that should be doable with this database schema. I've decided to add a new table instead of modifying the existing oathauth_users table. This is mainly because adding an auto_increment column to the existing table would be difficult, but also allows us to update the table definition to follow MW conventions (namely the column name prefixes). I've also used the opportunity to normalize the device types onto a separate table. The migration stage variable is set to SCHEMA_COMPAT_NEW so that third-party wikis can use update.php normally and don't have to adjust anything. This means that it needs to be manually set to _OLD on wmf-config before merging this patch. Since we're already working with the database schema, this add a new, currently unused column for the creation data, so that T242847 will not require a new schema change. Bug: T242031 Bug: T242847 Change-Id: I6aa69c089340434737b55201b80398708a70c355
42 lines
1.2 KiB
PHP
42 lines
1.2 KiB
PHP
<?php
|
|
|
|
use MediaWiki\Config\ServiceOptions;
|
|
use MediaWiki\Extension\OATHAuth\OATHAuthDatabase;
|
|
use MediaWiki\Extension\OATHAuth\OATHAuthModuleRegistry;
|
|
use MediaWiki\Extension\OATHAuth\OATHUserRepository;
|
|
use MediaWiki\Logger\LoggerFactory;
|
|
use MediaWiki\MediaWikiServices;
|
|
|
|
return [
|
|
'OATHAuthDatabase' => static function ( MediaWikiServices $services ) {
|
|
return new OATHAuthDatabase(
|
|
new ServiceOptions(
|
|
OATHAuthDatabase::CONSTRUCTOR_OPTIONS,
|
|
$services->getMainConfig(),
|
|
),
|
|
$services->getDBLoadBalancerFactory(),
|
|
);
|
|
},
|
|
'OATHAuthModuleRegistry' => static function ( MediaWikiServices $services ) {
|
|
return new OATHAuthModuleRegistry(
|
|
$services->getService( 'OATHAuthDatabase' ),
|
|
ExtensionRegistry::getInstance()->getAttribute( 'OATHAuthModules' ),
|
|
);
|
|
},
|
|
'OATHUserRepository' => static function ( MediaWikiServices $services ) {
|
|
return new OATHUserRepository(
|
|
new ServiceOptions(
|
|
OATHUserRepository::CONSTRUCTOR_OPTIONS,
|
|
$services->getMainConfig(),
|
|
),
|
|
$services->getService( 'OATHAuthDatabase' ),
|
|
new HashBagOStuff( [
|
|
'maxKey' => 5
|
|
] ),
|
|
$services->getService( 'OATHAuthModuleRegistry' ),
|
|
$services->getCentralIdLookupFactory(),
|
|
LoggerFactory::getInstance( 'authentication' )
|
|
);
|
|
}
|
|
];
|