/**
* Returns a non-persistent backend that thinks it has at least one session active
* @param User|null $user
+ * @param string $id
*/
- protected function getBackend( User $user = null ) {
+ protected function getBackend( User $user = null, $id = null ) {
if ( !$this->config ) {
$this->config = new \HashConfig();
$this->manager = null;
$info = new SessionInfo( SessionInfo::MIN_PRIORITY, [
'provider' => $this->provider,
- 'id' => self::SESSIONID,
+ 'id' => $id ?: self::SESSIONID,
'persisted' => true,
'userInfo' => UserInfo::newFromUser( $user ?: new User, true ),
'idIsSafe' => true,
$priv = \TestingAccessWrapper::newFromObject( $backend );
$priv->persist = false;
$priv->requests = [ 100 => new \FauxRequest() ];
+ $priv->requests[100]->setSessionId( $id );
$priv->usePhpSessionHandling = false;
$manager = \TestingAccessWrapper::newFromObject( $this->manager );
- $manager->allSessionBackends = [ $backend->getId() => $backend ];
- $manager->allSessionIds = [ $backend->getId() => $id ];
+ $manager->allSessionBackends = [ $backend->getId() => $backend ] + $manager->allSessionBackends;
+ $manager->allSessionIds = [ $backend->getId() => $id ] + $manager->allSessionIds;
$manager->sessionProviders = [ (string)$this->provider => $this->provider ];
return $backend;
$this->assertArrayHasKey( $backend->getId(), $manager->allSessionIds );
}
+ public function testSetProviderMetadata() {
+ $backend = $this->getBackend();
+ $priv = \TestingAccessWrapper::newFromObject( $backend );
+ $priv->providerMetadata = [ 'dummy' ];
+
+ try {
+ $backend->setProviderMetadata( 'foo' );
+ $this->fail( 'Expected exception not thrown' );
+ } catch ( \InvalidArgumentException $ex ) {
+ $this->assertSame( '$metadata must be an array or null', $ex->getMessage() );
+ }
+
+ try {
+ $backend->setProviderMetadata( (object)[] );
+ $this->fail( 'Expected exception not thrown' );
+ } catch ( \InvalidArgumentException $ex ) {
+ $this->assertSame( '$metadata must be an array or null', $ex->getMessage() );
+ }
+
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ), 'sanity check' );
+ $backend->setProviderMetadata( [ 'dummy' ] );
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ) );
+
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ), 'sanity check' );
+ $backend->setProviderMetadata( [ 'test' ] );
+ $this->assertNotFalse( $this->store->getSession( self::SESSIONID ) );
+ $this->assertSame( [ 'test' ], $backend->getProviderMetadata() );
+ $this->store->deleteSession( self::SESSIONID );
+
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ), 'sanity check' );
+ $backend->setProviderMetadata( null );
+ $this->assertNotFalse( $this->store->getSession( self::SESSIONID ) );
+ $this->assertSame( null, $backend->getProviderMetadata() );
+ $this->store->deleteSession( self::SESSIONID );
+ }
+
public function testResetId() {
$id = session_id();
$this->assertNotEquals( 0, $wrap->expires );
}
+ public function testUnpersist() {
+ $this->provider = $this->getMock( 'DummySessionProvider', [ 'unpersistSession' ] );
+ $this->provider->expects( $this->once() )->method( 'unpersistSession' );
+ $backend = $this->getBackend();
+ $wrap = \TestingAccessWrapper::newFromObject( $backend );
+ $wrap->store = new \CachedBagOStuff( $this->store );
+ $wrap->persist = true;
+ $wrap->dataDirty = true;
+
+ $backend->save(); // This one shouldn't call $provider->persistSession(), but should save
+ $this->assertTrue( $backend->isPersistent(), 'sanity check' );
+ $this->assertNotFalse( $this->store->getSession( self::SESSIONID ), 'sanity check' );
+
+ $backend->unpersist();
+ $this->assertFalse( $backend->isPersistent() );
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ) );
+ $this->assertNotFalse( $wrap->store->get( wfMemcKey( 'MWSession', self::SESSIONID ) ) );
+ }
+
public function testRememberUser() {
$backend = $this->getBackend();
$neverHook = $this->getMock( __CLASS__, [ 'onSessionMetadata' ] );
$neverHook->expects( $this->never() )->method( 'onSessionMetadata' );
- $neverProvider = $this->getMock( 'DummySessionProvider', [ 'persistSession' ] );
+ $builder = $this->getMockBuilder( 'DummySessionProvider' )
+ ->setMethods( [ 'persistSession', 'unpersistSession' ] );
+
+ $neverProvider = $builder->getMock();
$neverProvider->expects( $this->never() )->method( 'persistSession' );
+ $neverProvider->expects( $this->never() )->method( 'unpersistSession' );
// Not persistent or dirty
$this->provider = $neverProvider;
$backend->save();
$this->assertFalse( $this->store->getSession( self::SESSIONID ), 'making sure it didn\'t save' );
+ // (but does unpersist if forced)
+ $this->provider = $builder->getMock();
+ $this->provider->expects( $this->never() )->method( 'persistSession' );
+ $this->provider->expects( $this->atLeastOnce() )->method( 'unpersistSession' );
+ $this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SessionMetadata' => [ $neverHook ] ] );
+ $this->store->setSessionData( self::SESSIONID, $testData );
+ $backend = $this->getBackend( $user );
+ $this->store->deleteSession( self::SESSIONID );
+ \TestingAccessWrapper::newFromObject( $backend )->persist = false;
+ \TestingAccessWrapper::newFromObject( $backend )->forcePersist = true;
+ $this->assertFalse( $backend->isPersistent(), 'sanity check' );
+ \TestingAccessWrapper::newFromObject( $backend )->metaDirty = false;
+ \TestingAccessWrapper::newFromObject( $backend )->dataDirty = false;
+ $backend->save();
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ), 'making sure it didn\'t save' );
+
+ // (but not to a WebRequest associated with a different session)
+ $this->provider = $neverProvider;
+ $this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SessionMetadata' => [ $neverHook ] ] );
+ $this->store->setSessionData( self::SESSIONID, $testData );
+ $backend = $this->getBackend( $user );
+ \TestingAccessWrapper::newFromObject( $backend )->requests[100]
+ ->setSessionId( new SessionId( 'x' ) );
+ $this->store->deleteSession( self::SESSIONID );
+ \TestingAccessWrapper::newFromObject( $backend )->persist = false;
+ \TestingAccessWrapper::newFromObject( $backend )->forcePersist = true;
+ $this->assertFalse( $backend->isPersistent(), 'sanity check' );
+ \TestingAccessWrapper::newFromObject( $backend )->metaDirty = false;
+ \TestingAccessWrapper::newFromObject( $backend )->dataDirty = false;
+ $backend->save();
+ $this->assertFalse( $this->store->getSession( self::SESSIONID ), 'making sure it didn\'t save' );
+
// Not persistent, but dirty
$this->provider = $neverProvider;
$this->onSessionMetadataCalled = false;
$backend->save();
$this->assertFalse( $this->store->getSession( self::SESSIONID ), 'making sure it didn\'t save' );
- $this->provider = $this->getMock( 'DummySessionProvider', [ 'persistSession' ] );
+ // (but will persist if forced)
+ $this->provider = $builder->getMock();
$this->provider->expects( $this->atLeastOnce() )->method( 'persistSession' );
+ $this->provider->expects( $this->never() )->method( 'unpersistSession' );
$this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SessionMetadata' => [ $neverHook ] ] );
$this->store->setSessionData( self::SESSIONID, $testData );
$backend = $this->getBackend( $user );
$this->assertNotSame( false, $this->store->getSessionFromBackend( self::SESSIONID ),
'making sure it did save to backend' );
- $this->provider = $this->getMock( 'DummySessionProvider', [ 'persistSession' ] );
+ // (also persists if forced)
+ $this->provider = $builder->getMock();
$this->provider->expects( $this->atLeastOnce() )->method( 'persistSession' );
+ $this->provider->expects( $this->never() )->method( 'unpersistSession' );
$this->onSessionMetadataCalled = false;
$this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SessionMetadata' => [ $this ] ] );
$this->store->setSessionData( self::SESSIONID, $testData );
$this->assertNotSame( false, $this->store->getSessionFromBackend( self::SESSIONID ),
'making sure it did save to backend' );
- $this->provider = $this->getMock( 'DummySessionProvider', [ 'persistSession' ] );
+ // (also persists if metadata dirty)
+ $this->provider = $builder->getMock();
$this->provider->expects( $this->atLeastOnce() )->method( 'persistSession' );
+ $this->provider->expects( $this->never() )->method( 'unpersistSession' );
$this->onSessionMetadataCalled = false;
$this->mergeMwGlobalArrayValue( 'wgHooks', [ 'SessionMetadata' => [ $this ] ] );
$this->store->setSessionData( self::SESSIONID, $testData );
$metadata['???'] = '!!!';
}
+ public function testTakeOverGlobalSession() {
+ if ( !PHPSessionHandler::isInstalled() ) {
+ PHPSessionHandler::install( SessionManager::singleton() );
+ }
+ if ( !PHPSessionHandler::isEnabled() ) {
+ $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' );
+ $rProp->setAccessible( true );
+ $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() );
+ $resetHandler = new \ScopedCallback( function () use ( $handler ) {
+ session_write_close();
+ $handler->enable = false;
+ } );
+ $handler->enable = true;
+ }
+
+ $backend = $this->getBackend( User::newFromName( 'UTSysop' ) );
+ \TestingAccessWrapper::newFromObject( $backend )->usePhpSessionHandling = true;
+
+ $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager );
+
+ $manager = \TestingAccessWrapper::newFromObject( $this->manager );
+ $request = \RequestContext::getMain()->getRequest();
+ $manager->globalSession = $backend->getSession( $request );
+ $manager->globalSessionRequest = $request;
+
+ session_id( '' );
+ \TestingAccessWrapper::newFromObject( $backend )->checkPHPSession();
+ $this->assertSame( $backend->getId(), session_id() );
+ session_write_close();
+
+ $backend2 = $this->getBackend(
+ User::newFromName( 'UTSysop' ), 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+ );
+ \TestingAccessWrapper::newFromObject( $backend2 )->usePhpSessionHandling = true;
+
+ session_id( '' );
+ \TestingAccessWrapper::newFromObject( $backend2 )->checkPHPSession();
+ $this->assertSame( '', session_id() );
+ }
+
public function testResetIdOfGlobalSession() {
if ( !PHPSessionHandler::isInstalled() ) {
PHPSessionHandler::install( SessionManager::singleton() );
$backend = $this->getBackend( User::newFromName( 'UTSysop' ) );
\TestingAccessWrapper::newFromObject( $backend )->usePhpSessionHandling = true;
- TestUtils::setSessionManagerSingleton( $this->manager );
+ $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager );
$manager = \TestingAccessWrapper::newFromObject( $this->manager );
$request = \RequestContext::getMain()->getRequest();
session_id( self::SESSIONID );
\MediaWiki\quietCall( 'session_start' );
+ $_SESSION['foo'] = __METHOD__;
$backend->resetId();
$this->assertNotEquals( self::SESSIONID, $backend->getId() );
$this->assertSame( $backend->getId(), session_id() );
+ $this->assertArrayHasKey( 'foo', $_SESSION );
+ $this->assertSame( __METHOD__, $_SESSION['foo'] );
session_write_close();
+ }
- session_id( '' );
- $this->assertNotSame( $backend->getId(), session_id(), 'sanity check' );
- $backend->persist();
- $this->assertSame( $backend->getId(), session_id() );
- session_write_close();
+ public function testUnpersistOfGlobalSession() {
+ if ( !PHPSessionHandler::isInstalled() ) {
+ PHPSessionHandler::install( SessionManager::singleton() );
+ }
+ if ( !PHPSessionHandler::isEnabled() ) {
+ $rProp = new \ReflectionProperty( 'MediaWiki\\Session\\PHPSessionHandler', 'instance' );
+ $rProp->setAccessible( true );
+ $handler = \TestingAccessWrapper::newFromObject( $rProp->getValue() );
+ $resetHandler = new \ScopedCallback( function () use ( $handler ) {
+ session_write_close();
+ $handler->enable = false;
+ } );
+ $handler->enable = true;
+ }
+
+ $backend = $this->getBackend( User::newFromName( 'UTSysop' ) );
+ $wrap = \TestingAccessWrapper::newFromObject( $backend );
+ $wrap->usePhpSessionHandling = true;
+ $wrap->persist = true;
+
+ $resetSingleton = TestUtils::setSessionManagerSingleton( $this->manager );
+
+ $manager = \TestingAccessWrapper::newFromObject( $this->manager );
+ $request = \RequestContext::getMain()->getRequest();
+ $manager->globalSession = $backend->getSession( $request );
+ $manager->globalSessionRequest = $request;
+
+ session_id( self::SESSIONID . 'x' );
+ \MediaWiki\quietCall( 'session_start' );
+ $backend->unpersist();
+ $this->assertSame( self::SESSIONID . 'x', session_id() );
+
+ session_id( self::SESSIONID );
+ $wrap->persist = true;
+ $backend->unpersist();
+ $this->assertSame( '', session_id() );
}
public function testGetAllowedUserRights() {
dépôts / lhc / web / wiklou.git / blobdiff