From b71e6664540152201d7742479df91e8ec1b16d50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Thu, 11 Feb 2016 00:12:45 -0800 Subject: [PATCH] Log autocreation attempts in SessionManager Also fix a typo. Bug: T125184 Change-Id: I7e5ebcfdfd3aa37e131454855f4b7142e24906c4 --- includes/Setup.php | 11 ++++++++--- includes/session/SessionManager.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index e57b96a8b6..10fa21230e 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -850,15 +850,20 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { if ( $sessionUser->getId() === 0 && User::isValidUserName( $sessionUser->getName() ) ) { $ps_autocreate = Profiler::instance()->scopedProfileIn( $fname . '-autocreate' ); if ( $wgDisableAuthManager ) { - MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser ); + $res = MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser ); } else { - MediaWiki\Auth\AuthManager::singleton()->autoCreateUser( + $res = MediaWiki\Auth\AuthManager::singleton()->autoCreateUser( $sessionUser, - MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSSION, + MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSION, true ); } Profiler::instance()->scopedProfileOut( $ps_autocreate ); + \MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Autocreation attempt', [ + 'event' => 'autocreate', + 'status' => $res, + ] ); + unset( $res ); } unset( $sessionUser ); } diff --git a/includes/session/SessionManager.php b/includes/session/SessionManager.php index c3481e80ed..3e5ef3b668 100644 --- a/includes/session/SessionManager.php +++ b/includes/session/SessionManager.php @@ -383,7 +383,7 @@ final class SessionManager implements SessionManagerInterface { wfDeprecated( __METHOD__, '1.27' ); return \MediaWiki\Auth\AuthManager::singleton()->autoCreateUser( $user, - \MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSSION, + \MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSION, false )->isGood(); } -- 2.20.1