namespace MediaWiki\Session;
-use Psr\Log\LogLevel;
+use AuthPlugin;
use MediaWikiTestCase;
+use Psr\Log\LogLevel;
use User;
/**
$session = $manager->getSessionForRequest( $request );
$this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session );
$this->assertSame( $idEmpty, $session->getId() );
- $this->assertNull( $manager->getPersistedSessionId( $request ) );
// Both providers return info, picks best one
$request->info1 = new SessionInfo( SessionInfo::MIN_PRIORITY + 1, array(
$session = $manager->getSessionForRequest( $request );
$this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session );
$this->assertSame( $id2, $session->getId() );
- $this->assertSame( $id2, $manager->getPersistedSessionId( $request ) );
$request->info1 = new SessionInfo( SessionInfo::MIN_PRIORITY + 2, array(
'provider' => $provider1,
$session = $manager->getSessionForRequest( $request );
$this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session );
$this->assertSame( $id1, $session->getId() );
- $this->assertSame( $id1, $manager->getPersistedSessionId( $request ) );
// Tied priorities
$request->info1 = new SessionInfo( SessionInfo::MAX_PRIORITY, array(
$this->assertContains( $request->info1, $ex->sessionInfos );
$this->assertContains( $request->info2, $ex->sessionInfos );
}
- try {
- $manager->getPersistedSessionId( $request );
- $this->fail( 'Expcected exception not thrown' );
- } catch ( \OverFlowException $ex ) {
- $this->assertStringStartsWith(
- 'Multiple sessions for this request tied for top priority: ',
- $ex->getMessage()
- );
- $this->assertCount( 2, $ex->sessionInfos );
- $this->assertContains( $request->info1, $ex->sessionInfos );
- $this->assertContains( $request->info2, $ex->sessionInfos );
- }
// Bad provider
$request->info1 = new SessionInfo( SessionInfo::MAX_PRIORITY, array(
$ex->getMessage()
);
}
- try {
- $manager->getPersistedSessionId( $request );
- $this->fail( 'Expcected exception not thrown' );
- } catch ( \UnexpectedValueException $ex ) {
- $this->assertSame(
- 'Provider1 returned session info for a different provider: ' . $request->info1,
- $ex->getMessage()
- );
- }
// Unusable session info
$this->logger->setCollect( true );
$session = $manager->getSessionForRequest( $request );
$this->assertInstanceOf( 'MediaWiki\\Session\\Session', $session );
$this->assertSame( $id2, $session->getId() );
- $this->assertSame( $id2, $manager->getPersistedSessionId( $request ) );
$this->logger->setCollect( false );
// Unpersisted session ID
$this->assertSame( $id1, $session->getId() );
$session->persist();
$this->assertTrue( $session->isPersistent(), 'sanity check' );
- $this->assertNull( $manager->getPersistedSessionId( $request ) );
}
public function testGetSessionById() {
$manager = $this->getManager();
-
try {
$manager->getSessionById( 'bad' );
$this->fail( 'Expected exception not thrown' );
'Bar' => array( 'X', 'Bar1', 3 => 'Bar2' ),
'Quux' => array( 'Quux' ),
'Baz' => array(),
- 'Quux' => array( 'Quux' ),
);
$this->assertEquals( $expect, $manager->getVaryHeaders() );
$that = $this;
- \ObjectCache::$instances[__METHOD__] = new \HashBagOStuff();
+ \ObjectCache::$instances[__METHOD__] = new TestBagOStuff();
$this->setMwGlobals( array( 'wgMainCacheType' => __METHOD__ ) );
+ $this->setMWGlobals( array(
+ 'wgAuth' => new AuthPlugin,
+ ) );
$this->stashMwGlobals( array( 'wgGroupPermissions' ) );
$wgGroupPermissions['*']['createaccount'] = true;
return null;
}
$m = str_replace( 'MediaWiki\Session\SessionManager::autoCreateUser: ', '', $m );
- $m = preg_replace( '/ - from: .*$/', ' - from: XXX', $m );
return $m;
} );
$manager->setLogger( $logger );
$user->getId(), User::idFromName( 'UTSessionAutoCreate1', User::READ_LATEST )
);
$this->assertSame( array(
- array( LogLevel::INFO, 'creating new user (UTSessionAutoCreate1) - from: XXX' ),
+ array( LogLevel::INFO, 'creating new user ({username}) - from: {url}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->assertEquals( 0, User::idFromName( 'UTDoesNotExist', User::READ_LATEST ) );
$session->clear();
$this->assertSame( array(
- array( LogLevel::DEBUG, 'user is blocked from this wiki, blacklisting' ),
+ array(
+ LogLevel::DEBUG,
+ 'user is blocked from this wiki, blacklisting',
+ ),
), $logger->getBuffer() );
$logger->clearBuffer();
$user->getId(), User::idFromName( 'UTSessionAutoCreate2', User::READ_LATEST )
);
$this->assertSame( array(
- array( LogLevel::INFO, 'creating new user (UTSessionAutoCreate2) - from: XXX' ),
+ array( LogLevel::INFO, 'creating new user ({username}) - from: {url}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$user->getId(), User::idFromName( 'UTSessionAutoCreate3', User::READ_LATEST )
);
$this->assertSame( array(
- array( LogLevel::INFO, 'creating new user (UTSessionAutoCreate3) - from: XXX' ),
+ array( LogLevel::INFO, 'creating new user ({username}) - from: {url}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
'LocalUserCreated' => array(),
) );
$this->assertSame( array(
- array( LogLevel::INFO, 'creating new user (UTSessionAutoCreate4) - from: XXX' ),
+ array( LogLevel::INFO, 'creating new user ({username}) - from: {url}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
}
$this->objectCacheDef( $provider1 ),
) );
- $user = User::newFromName( 'UTSysop' );
- $token = $user->getToken( true );
-
$this->assertFalse( $manager->isUserSessionPrevented( 'UTSysop' ) );
$manager->preventSessionsForUser( 'UTSysop' );
- $this->assertNotEquals( $token, User::newFromName( 'UTSysop' )->getToken() );
$this->assertTrue( $manager->isUserSessionPrevented( 'UTSysop' ) );
}
public function testLoadSessionInfoFromStore() {
$manager = $this->getManager();
- $logger = new \TestLogger( true, function ( $m ) {
- return preg_replace(
- '/^Session \[\d+\]\w+<(?:null|anon|[+-]:\d+:\w+)>\w+: /', 'Session X: ', $m
- );
- } );
+ $logger = new \TestLogger( true );
$manager->setLogger( $logger );
$request = new \FauxRequest();
$this->assertSame( $unverifiedUserInfo, $info->getUserInfo() );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Unverified user provided and no metadata to auth it' )
+ array(
+ LogLevel::WARNING,
+ 'Session "{session}": Unverified user provided and no metadata to auth it',
+ )
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Null provider and no metadata' ),
+ array( LogLevel::WARNING, 'Session "{session}": Null provider and no metadata' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->assertFalse( $info->isIdSafe(), 'sanity check' );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::INFO, 'Session X: No user provided and provider cannot set user' )
+ array( LogLevel::INFO, 'Session "{session}": No user provided and provider cannot set user' )
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, true );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad data' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad data' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, array( 'data' => array() ) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad data structure' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad data structure' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, array( 'metadata' => $metadata ) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad data structure' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad data structure' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, array( 'metadata' => $metadata, 'data' => true ) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad data structure' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad data structure' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, array( 'metadata' => true, 'data' => array() ) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad data structure' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad data structure' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->store->setRawSession( $id, array( 'metadata' => $tmp, 'data' => array() ) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Bad metadata' ),
+ array( LogLevel::WARNING, 'Session "{session}": Bad metadata' ),
), $logger->getBuffer() );
$logger->clearBuffer();
}
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Wrong provider, Bad !== Mock' ),
+ array( LogLevel::WARNING, 'Session "{session}": Wrong provider Bad !== Mock' ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Unknown provider, Bad' ),
+ array( LogLevel::WARNING, 'Session "{session}": Unknown provider Bad' ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::ERROR, 'Session X: Invalid ID' ),
+ array( LogLevel::ERROR, 'Session "{session}": {exception}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::ERROR, 'Session X: Invalid user name' ),
+ array( LogLevel::ERROR, 'Session "{session}": {exception}', ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: User ID mismatch, 2 !== 1' ),
+ array( LogLevel::WARNING, 'Session "{session}": User ID mismatch, {uid_a} !== {uid_b}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: User name mismatch, X !== UTSysop' ),
+ array( LogLevel::WARNING, 'Session "{session}": User name mismatch, {uname_a} !== {uname_b}' ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
array(
- LogLevel::WARNING, 'Session X: User ID matched but name didn\'t (rename?), X !== UTSysop'
+ LogLevel::WARNING,
+ 'Session "{session}": User ID matched but name didn\'t (rename?), {uname_a} !== {uname_b}'
),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
array(
- LogLevel::WARNING, 'Session X: Metadata has an anonymous user, but a non-anon user was provided'
+ LogLevel::WARNING,
+ 'Session "{session}": Metadata has an anonymous user, ' .
+ 'but a non-anon user was provided',
),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: User token mismatch' ),
+ array( LogLevel::WARNING, 'Session "{session}": User token mismatch' ),
), $logger->getBuffer() );
$logger->clearBuffer();
) );
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Metadata merge failed: no merge!' ),
+ array(
+ LogLevel::WARNING,
+ 'Session "{session}": Metadata merge failed: {exception}',
+ ),
), $logger->getBuffer() );
$logger->clearBuffer();
$this->assertTrue( $info->forceHTTPS() );
$this->assertSame( array(), $logger->getBuffer() );
+ // "Persist" flag from session
+ $this->store->setSessionMeta( $id, $metadata );
+ $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+ 'provider' => $provider,
+ 'id' => $id,
+ 'userInfo' => $userInfo
+ ) );
+ $this->assertTrue( $loadSessionInfoFromStore( $info ) );
+ $this->assertFalse( $info->wasPersisted() );
+ $this->assertSame( array(), $logger->getBuffer() );
+
+ $this->store->setSessionMeta( $id, array( 'persisted' => true ) + $metadata );
+ $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+ 'provider' => $provider,
+ 'id' => $id,
+ 'userInfo' => $userInfo
+ ) );
+ $this->assertTrue( $loadSessionInfoFromStore( $info ) );
+ $this->assertTrue( $info->wasPersisted() );
+ $this->assertSame( array(), $logger->getBuffer() );
+
+ $this->store->setSessionMeta( $id, array( 'persisted' => false ) + $metadata );
+ $info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
+ 'provider' => $provider,
+ 'id' => $id,
+ 'userInfo' => $userInfo,
+ 'persisted' => true
+ ) );
+ $this->assertTrue( $loadSessionInfoFromStore( $info ) );
+ $this->assertTrue( $info->wasPersisted() );
+ $this->assertSame( array(), $logger->getBuffer() );
+
// Provider refreshSessionInfo() returning false
$info = new SessionInfo( SessionInfo::MIN_PRIORITY, array(
'provider' => $provider3,
$this->assertFalse( $loadSessionInfoFromStore( $info ) );
$this->assertTrue( $called );
$this->assertSame( array(
- array( LogLevel::WARNING, 'Session X: Hook aborted' ),
+ array( LogLevel::WARNING, 'Session "{session}": Hook aborted' ),
), $logger->getBuffer() );
$logger->clearBuffer();
}