Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "createAndPromote: use AuthManager::autoCreateUser"

Browse source
This commit is contained in:
jenkins-bot 2019-01-10 15:51:14 +00:00 committed by Gerrit Code Review
commit 5bba9d230c
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/auth/AuthManager.php
View file

@ -54,7 +54,8 @@ use Wikimedia\ObjectFactory;
* Code that is related to some SessionProvider or PrimaryAuthenticationProvider can
* create a (non-reserved) user by calling AuthManager::autoCreateUser(); it is then the provider's
* responsibility to ensure that the user can authenticate somehow (see especially
* PrimaryAuthenticationProvider::autoCreatedAccount()).
* PrimaryAuthenticationProvider::autoCreatedAccount()). The same functionality can also be used
* from Maintenance scripts such as createAndPromote.php.
* If you are writing code that is not associated with such a provider and needs to create accounts
* programmatically for real users, you should rethink your architecture. There is no good way to
* do that as such code has no knowledge of what authentication methods are enabled on the wiki and
@ -113,6 +114,9 @@ class AuthManager implements LoggerAwareInterface {
/** Auto-creation is due to SessionManager */
const AUTOCREATE_SOURCE_SESSION = \MediaWiki\Session\SessionManager::class;
/** Auto-creation is due to a Maintenance script */
const AUTOCREATE_SOURCE_MAINT = '::Maintenance::';
/** @var AuthManager|null */
private static $instance = null;
@ -1542,13 +1546,16 @@ class AuthManager implements LoggerAwareInterface {
* explicitly (e.g. from a maintenance script) is also fine.
*
* @param User $user User to auto-create
* @param string $source What caused the auto-creation? This must be the ID
* of a PrimaryAuthenticationProvider or the constant self::AUTOCREATE_SOURCE_SESSION.
* @param string $source What caused the auto-creation? This must be one of:
* - the ID of a PrimaryAuthenticationProvider,
* - the constant self::AUTOCREATE_SOURCE_SESSION, or
* - the constant AUTOCREATE_SOURCE_MAINT.
* @param bool $login Whether to also log the user in
* @return Status Good if user was created, Ok if user already existed, otherwise Fatal
*/
public function autoCreateUser( User $user, $source, $login = true ) {
if ( $source !== self::AUTOCREATE_SOURCE_SESSION &&
$source !== self::AUTOCREATE_SOURCE_MAINT &&
!$this->getAuthenticationProvider( $source ) instanceof PrimaryAuthenticationProvider
) {
throw new \InvalidArgumentException( "Unknown auto-creation source: $source" );

13
maintenance/createAndPromote.php
View file

@ -112,9 +112,16 @@ class CreateAndPromote extends Maintenance {
}
if ( !$exists ) {
# Insert the account into the database
$user->addToDatabase();
$user->saveSettings();
// Create the user via AuthManager as there may be various side
// effects that are perfomed by the configured AuthManager chain.
$status = MediaWiki\Auth\AuthManager::singleton()->autoCreateUser(
$user,
MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_MAINT,
false
);
if ( !$status->isGood() ) {
$this->fatalError( $status->getWikiText( null, null, 'en' ) );
}
}
if ( $password ) {