namespace MediaWiki\Session;
-use BagOStuff;
+use CachedBagOStuff;
use Psr\Log\LoggerInterface;
use User;
use WebRequest;
/** @var string Used to detect subarray modifications */
private $dataHash = null;
- /** @var BagOStuff */
+ /** @var CachedBagOStuff */
private $store;
/** @var LoggerInterface */
/**
* @param SessionId $id Session ID object
* @param SessionInfo $info Session info to populate from
- * @param BagOStuff $store Backend data store
+ * @param CachedBagOStuff $store Backend data store
* @param LoggerInterface $logger
* @param int $lifetime Session data lifetime in seconds
*/
public function __construct(
- SessionId $id, SessionInfo $info, BagOStuff $store, LoggerInterface $logger, $lifetime
+ SessionId $id, SessionInfo $info, CachedBagOStuff $store, LoggerInterface $logger, $lifetime
) {
$phpSessionHandling = \RequestContext::getMain()->getConfig()->get( 'PHPSessionHandling' );
$this->usePhpSessionHandling = $phpSessionHandling !== 'disable';
$this->data = array();
$this->dataDirty = true;
$this->metaDirty = true;
- $this->logger->debug( "SessionBackend $this->id is unsaved, marking dirty in constructor" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" is unsaved, marking dirty in constructor',
+ array(
+ 'session' => $this->id,
+ ) );
} else {
$this->data = $blob['data'];
if ( isset( $blob['metadata']['loggedOut'] ) ) {
} else {
$this->metaDirty = true;
$this->logger->debug(
- "SessionBackend $this->id metadata dirty due to missing expiration timestamp"
- );
+ 'SessionBackend "{session}" metadata dirty due to missing expiration timestamp',
+ array(
+ 'session' => $this->id,
+ ) );
}
}
$this->dataHash = md5( serialize( $this->data ) );
$this->provider->sessionIdWasReset( $this, $oldId );
$this->metaDirty = true;
$this->logger->debug(
- "SessionBackend $this->id metadata dirty due to ID reset (formerly $oldId)"
- );
+ 'SessionBackend "{session}" metadata dirty due to ID reset (formerly "{oldId}")',
+ array(
+ 'session' => $this->id,
+ 'oldId' => $oldId,
+ ) );
if ( $restart ) {
session_id( (string)$this->id );
$this->persist = true;
$this->forcePersist = true;
$this->metaDirty = true;
- $this->logger->debug( "SessionBackend $this->id force-persist due to persist()" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" force-persist due to persist()',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
} else {
$this->renew();
if ( $this->remember !== (bool)$remember ) {
$this->remember = (bool)$remember;
$this->metaDirty = true;
- $this->logger->debug( "SessionBackend $this->id metadata dirty due to remember-user change" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" metadata dirty due to remember-user change',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
}
}
$this->user = $user;
$this->metaDirty = true;
- $this->logger->debug( "SessionBackend $this->id metadata dirty due to user change" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" metadata dirty due to user change',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
}
if ( $this->forceHTTPS !== (bool)$force ) {
$this->forceHTTPS = (bool)$force;
$this->metaDirty = true;
- $this->logger->debug( "SessionBackend $this->id metadata dirty due to force-HTTPS change" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" metadata dirty due to force-HTTPS change',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
}
}
$this->loggedOut = $ts;
$this->metaDirty = true;
$this->logger->debug(
- "SessionBackend $this->id metadata dirty due to logged-out-timestamp change"
- );
+ 'SessionBackend "{session}" metadata dirty due to logged-out-timestamp change',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
}
}
$this->providerMetadata = $metadata;
$this->metaDirty = true;
$this->logger->debug(
- "SessionBackend $this->id metadata dirty due to provider metadata change"
- );
+ 'SessionBackend "{session}" metadata dirty due to provider metadata change',
+ array(
+ 'session' => $this->id,
+ ) );
$this->autosave();
}
}
$data[$key] = $value;
$this->dataDirty = true;
$this->logger->debug(
- "SessionBackend $this->id data dirty due to addData(): " . wfGetAllCallers( 5 )
- );
+ 'SessionBackend "{session}" data dirty due to addData(): {callers}',
+ array(
+ 'session' => $this->id,
+ 'callers' => wfGetAllCallers( 5 ),
+ ) );
}
}
}
public function dirty() {
$this->dataDirty = true;
$this->logger->debug(
- "SessionBackend $this->id data dirty due to dirty(): " . wfGetAllCallers( 5 )
- );
+ 'SessionBackend "{session}" data dirty due to dirty(): {callers}',
+ array(
+ 'session' => $this->id,
+ 'callers' => wfGetAllCallers( 5 ),
+ ) );
}
/**
if ( time() + $this->lifetime / 2 > $this->expires ) {
$this->metaDirty = true;
$this->logger->debug(
- "SessionBackend $this->id metadata dirty for renew(): " . wfGetAllCallers( 5 )
- );
+ 'SessionBackend "{callers}" metadata dirty for renew(): {callers}',
+ array(
+ 'session' => $this->id,
+ 'callers' => wfGetAllCallers( 5 ),
+ ) );
if ( $this->persist ) {
$this->forcePersist = true;
$this->logger->debug(
- "SessionBackend $this->id force-persist for renew(): " . wfGetAllCallers( 5 )
- );
+ 'SessionBackend "{session}" force-persist for renew(): {callers}',
+ array(
+ 'session' => $this->id,
+ 'callers' => wfGetAllCallers( 5 ),
+ ) );
}
}
$this->autosave();
* @return \ScopedCallback When this goes out of scope, a save will be triggered
*/
public function delaySave() {
- $that = $this;
$this->delaySave++;
- $ref = &$this->delaySave;
- return new \ScopedCallback( function () use ( $that, &$ref ) {
- if ( --$ref <= 0 ) {
- $ref = 0;
- $that->save();
+ return new \ScopedCallback( function () {
+ if ( --$this->delaySave <= 0 ) {
+ $this->delaySave = 0;
+ $this->save();
}
} );
}
public function save( $closing = false ) {
if ( $this->provider->getManager()->isUserSessionPrevented( $this->user->getName() ) ) {
$this->logger->debug(
- "SessionBackend $this->id not saving, " .
- "user {$this->user} was passed to SessionManager::preventSessionsForUser"
- );
+ 'SessionBackend "{session}" not saving, user {user} was ' .
+ 'passed to SessionManager::preventSessionsForUser',
+ array(
+ 'session' => $this->id,
+ 'user' => $this->user,
+ ) );
return;
}
// Ensure the user has a token
// @codeCoverageIgnoreStart
$anon = $this->user->isAnon();
- if ( !$anon && !$this->user->getToken() ) {
+ if ( !$anon && !$this->user->getToken( false ) ) {
$this->logger->debug(
- "SessionBackend $this->id creating token for user {$this->user} on save"
- );
+ 'SessionBackend "{session}" creating token for user {user} on save',
+ array(
+ 'session' => $this->id,
+ 'user' => $this->user,
+ ) );
$this->user->setToken();
if ( !wfReadOnly() ) {
$this->user->saveSettings();
if ( !$this->metaDirty && !$this->dataDirty &&
$this->dataHash !== md5( serialize( $this->data ) )
) {
- $this->logger->debug( "SessionBackend $this->id data dirty due to hash mismatch, " .
- "$this->dataHash !== " . md5( serialize( $this->data ) ) );
+ $this->logger->debug(
+ 'SessionBackend "{session}" data dirty due to hash mismatch, {expected} !== {got}',
+ array(
+ 'session' => $this->id,
+ 'expected' => $this->dataHash,
+ 'got' => md5( serialize( $this->data ) ),
+ ) );
$this->dataDirty = true;
}
return;
}
- $this->logger->debug( "SessionBackend $this->id save: " .
- 'dataDirty=' . (int)$this->dataDirty . ' ' .
- 'metaDirty=' . (int)$this->metaDirty . ' ' .
- 'forcePersist=' . (int)$this->forcePersist
- );
+ $this->logger->debug(
+ 'SessionBackend "{session}" save: dataDirty={dataDirty} ' .
+ 'metaDirty={metaDirty} forcePersist={forcePersist}',
+ array(
+ 'session' => $this->id,
+ 'dataDirty' => (int)$this->dataDirty,
+ 'metaDirty' => (int)$this->metaDirty,
+ 'forcePersist' => (int)$this->forcePersist,
+ ) );
// Persist to the provider, if flagged
if ( $this->persist && ( $this->metaDirty || $this->forcePersist ) ) {
'provider' => (string)$this->provider,
'providerMetadata' => $this->providerMetadata,
'userId' => $anon ? 0 : $this->user->getId(),
- 'userName' => $anon ? null : $this->user->getName(),
+ 'userName' => User::isValidUserName( $this->user->getName() ) ? $this->user->getName() : null,
'userToken' => $anon ? null : $this->user->getToken(),
'remember' => !$anon && $this->remember,
'forceHTTPS' => $this->forceHTTPS,
'data' => $this->data,
'metadata' => $metadata,
),
- $metadata['expires']
+ $metadata['expires'],
+ $this->persist ? 0 : CachedBagOStuff::WRITE_CACHE_ONLY
);
$this->metaDirty = false;
private function checkPHPSession() {
if ( !$this->checkPHPSessionRecursionGuard ) {
$this->checkPHPSessionRecursionGuard = true;
- $ref = &$this->checkPHPSessionRecursionGuard;
- $reset = new \ScopedCallback( function () use ( &$ref ) {
- $ref = false;
+ $reset = new \ScopedCallback( function () {
+ $this->checkPHPSessionRecursionGuard = false;
} );
if ( $this->usePhpSessionHandling && session_id() === '' && PHPSessionHandler::isEnabled() &&
SessionManager::getGlobalSession()->getId() === (string)$this->id
) {
- $this->logger->debug( "SessionBackend $this->id: Taking over PHP session" );
+ $this->logger->debug(
+ 'SessionBackend "{session}" Taking over PHP session',
+ array(
+ 'session' => $this->id,
+ ) );
session_id( (string)$this->id );
- \MediaWiki\quietCall( 'session_cache_limiter', 'private, must-revalidate' );
\MediaWiki\quietCall( 'session_start' );
}
}
dépôts / lhc / web / wiklou.git / blobdiff