Avoid session double-start in Setup.php

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 3e37c9c..7b7cafc 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -249,12 +249,12 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  */
 $wgLockManagers[] = [
        'name' => 'fsLockManager',
-       'class' => 'FSLockManager',
+       'class' => FSLockManager::class,
        'lockDirectory' => "{$wgUploadDirectory}/lockdir",
 ];
 $wgLockManagers[] = [
        'name' => 'nullLockManager',
-       'class' => 'NullLockManager',
+       'class' => NullLockManager::class,
 ];
 
 /**
@@ -276,11 +276,10 @@ $wgGalleryOptions += [
  */
 if ( !$wgLocalFileRepo ) {
        $wgLocalFileRepo = [
-               'class' => 'LocalRepo',
+               'class' => LocalRepo::class,
                'name' => 'local',
                'directory' => $wgUploadDirectory,
                'scriptDirUrl' => $wgScriptPath,
-               'scriptExtension' => '.php',
                'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
                'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
                'thumbScriptUrl' => $wgThumbnailScriptPath,
@@ -295,7 +294,7 @@ if ( !$wgLocalFileRepo ) {
 if ( $wgUseSharedUploads ) {
        if ( $wgSharedUploadDBname ) {
                $wgForeignFileRepos[] = [
-                       'class' => 'ForeignDBRepo',
+                       'class' => ForeignDBRepo::class,
                        'name' => 'shared',
                        'directory' => $wgSharedUploadDirectory,
                        'url' => $wgSharedUploadPath,
@@ -315,7 +314,7 @@ if ( $wgUseSharedUploads ) {
                ];
        } else {
                $wgForeignFileRepos[] = [
-                       'class' => 'FileRepo',
+                       'class' => FileRepo::class,
                        'name' => 'shared',
                        'directory' => $wgSharedUploadDirectory,
                        'url' => $wgSharedUploadPath,
@@ -329,7 +328,7 @@ if ( $wgUseSharedUploads ) {
 }
 if ( $wgUseInstantCommons ) {
        $wgForeignFileRepos[] = [
-               'class' => 'ForeignAPIRepo',
+               'class' => ForeignAPIRepo::class,
                'name' => 'wikimediacommons',
                'apibase' => 'https://commons.wikimedia.org/w/api.php',
                'url' => 'https://upload.wikimedia.org/wikipedia/commons',
@@ -349,7 +348,7 @@ if ( !isset( $wgLocalFileRepo['backend'] ) ) {
        $wgLocalFileRepo['backend'] = $wgLocalFileRepo['name'] . '-backend';
 }
 foreach ( $wgForeignFileRepos as &$repo ) {
-       if ( !isset( $repo['directory'] ) && $repo['class'] === 'ForeignAPIRepo' ) {
+       if ( !isset( $repo['directory'] ) && $repo['class'] === ForeignAPIRepo::class ) {
                $repo['directory'] = $wgUploadDirectory; // b/c
        }
        if ( !isset( $repo['backend'] ) ) {
@@ -528,9 +527,9 @@ $wgJsMimeType = 'text/javascript';
 $wgFileExtensions = array_values( array_diff( $wgFileExtensions, $wgFileBlacklist ) );
 
 if ( $wgInvalidateCacheOnLocalSettingsChange ) {
-       MediaWiki\suppressWarnings();
+       Wikimedia\suppressWarnings();
        $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', filemtime( "$IP/LocalSettings.php" ) ) );
-       MediaWiki\restoreWarnings();
+       Wikimedia\restoreWarnings();
 }
 
 if ( $wgNewUserLog ) {
@@ -538,16 +537,16 @@ if ( $wgNewUserLog ) {
        $wgLogTypes[] = 'newusers';
        $wgLogNames['newusers'] = 'newuserlogpage';
        $wgLogHeaders['newusers'] = 'newuserlogpagetext';
-       $wgLogActionsHandlers['newusers/newusers'] = 'NewUsersLogFormatter';
-       $wgLogActionsHandlers['newusers/create'] = 'NewUsersLogFormatter';
-       $wgLogActionsHandlers['newusers/create2'] = 'NewUsersLogFormatter';
-       $wgLogActionsHandlers['newusers/byemail'] = 'NewUsersLogFormatter';
-       $wgLogActionsHandlers['newusers/autocreate'] = 'NewUsersLogFormatter';
+       $wgLogActionsHandlers['newusers/newusers'] = NewUsersLogFormatter::class;
+       $wgLogActionsHandlers['newusers/create'] = NewUsersLogFormatter::class;
+       $wgLogActionsHandlers['newusers/create2'] = NewUsersLogFormatter::class;
+       $wgLogActionsHandlers['newusers/byemail'] = NewUsersLogFormatter::class;
+       $wgLogActionsHandlers['newusers/autocreate'] = NewUsersLogFormatter::class;
 }
 
 if ( $wgPageLanguageUseDB ) {
        $wgLogTypes[] = 'pagelang';
-       $wgLogActionsHandlers['pagelang/pagelang'] = 'PageLangLogFormatter';
+       $wgLogActionsHandlers['pagelang/pagelang'] = PageLangLogFormatter::class;
 }
 
 if ( $wgCookieSecure === 'detect' ) {
@@ -698,7 +697,7 @@ if ( $wgMainWANCache === false ) {
        // Sites using multiple datacenters can configure a relayer.
        $wgMainWANCache = 'mediawiki-main-default';
        $wgWANObjectCaches[$wgMainWANCache] = [
-               'class'    => 'WANObjectCache',
+               'class'    => WANObjectCache::class,
                'cacheId'  => $wgMainCacheType,
                'channels' => [ 'purge' => 'wancache-main-default-purge' ]
        ];
@@ -717,9 +716,9 @@ wfMemoryLimit();
  * explicitly set. Inspired by phpMyAdmin's treatment of the problem.
  */
 if ( is_null( $wgLocaltimezone ) ) {
-       MediaWiki\suppressWarnings();
+       Wikimedia\suppressWarnings();
        $wgLocaltimezone = date_default_timezone_get();
-       MediaWiki\restoreWarnings();
+       Wikimedia\restoreWarnings();
 }
 
 date_default_timezone_set( $wgLocaltimezone );
@@ -736,20 +735,22 @@ if ( !$wgDBerrorLogTZ ) {
 
 // Initialize the request object in $wgRequest
 $wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
-// Set user IP/agent information for causal consistency purposes.
-// The cpPosIndex cookie has no prefix and is set by MediaWiki::preOutputCommit().
-$cpPosIndex = $wgRequest->getInt( 'cpPosIndex', (int)$wgRequest->getCookie( 'cpPosIndex', '' ) );
+// Set user IP/agent information for agent session consistency purposes
 MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
        'IPAddress' => $wgRequest->getIP(),
        'UserAgent' => $wgRequest->getHeader( 'User-Agent' ),
        'ChronologyProtection' => $wgRequest->getHeader( 'ChronologyProtection' ),
-       'ChronologyPositionIndex' => $cpPosIndex
+       // The cpPosIndex cookie has no prefix and is set by MediaWiki::preOutputCommit()
+       'ChronologyPositionIndex' =>
+               $wgRequest->getInt( 'cpPosIndex', (int)$wgRequest->getCookie( 'cpPosIndex', '' ) )
 ] );
-// Make sure that caching does not compromise the consistency improvements
-if ( $cpPosIndex ) {
+// Make sure that object caching does not undermine the ChronologyProtector improvements
+if ( $wgRequest->getCookie( 'UseDC', '' ) === 'master' ) {
+       // The user is pinned to the primary DC, meaning that they made recent changes which should
+       // be reflected in their subsequent web requests. Avoid the use of interim cache keys because
+       // they use a blind TTL and could be stale if an object changes twice in a short time span.
        MediaWikiServices::getInstance()->getMainWANObjectCache()->useInterimHoldOffCaching( false );
 }
-unset( $cpPosIndex );
 
 // Useful debug output
 if ( $wgCommandLineMode ) {
@@ -868,11 +869,19 @@ if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
 
        $session->renew();
        if ( MediaWiki\Session\PHPSessionHandler::isEnabled() &&
-               ( $session->isPersistent() || $session->shouldRememberUser() )
+               ( $session->isPersistent() || $session->shouldRememberUser() ) &&
+               session_id() !== $session->getId()
        ) {
                // Start the PHP-session for backwards compatibility
+               if ( session_id() !== '' ) {
+                       wfDebugLog( 'session', 'PHP session {old_id} was already started, changing to {new_id}', 'all', [
+                               'old_id' => session_id(),
+                               'new_id' => $session->getId(),
+                       ] );
+                       session_write_close();
+               }
                session_id( $session->getId() );
-               MediaWiki\quietCall( 'session_start' );
+               session_start();
        }
 
        unset( $session );