Merge "Log autocreation attempts in SessionManager"

diff --git a/includes/Setup.php b/includes/Setup.php
index 5b19b5f..2c78061 100644 (file)
--- 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 c3481e8..3e5ef3b 100644 (file)
--- 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();
                }