if ( Hooks::run( 'WebResponseSetCookie', array( &$name, &$value, &$expire, $options ) ) ) {
$cookie = $options['prefix'] . $name;
$data = array(
- (string)$cookie,
- (string)$value,
- (int)$expire,
- (string)$options['path'],
- (string)$options['domain'],
- (bool)$options['secure'],
- (bool)$options['httpOnly'],
+ 'name' => (string)$cookie,
+ 'value' => (string)$value,
+ 'expire' => (int)$expire,
+ 'path' => (string)$options['path'],
+ 'domain' => (string)$options['domain'],
+ 'secure' => (bool)$options['secure'],
+ 'httpOnly' => (bool)$options['httpOnly'],
);
- if ( !isset( self::$setCookies[$cookie] ) ||
- self::$setCookies[$cookie] !== array( $func, $data )
+
+ // Per RFC 6265, key is name + domain + path
+ $key = "{$data['name']}\n{$data['domain']}\n{$date['path']}";
+
+ // If this cookie name was in the request, fake an entry in
+ // self::$setCookies for it so the deleting check works right.
+ if ( isset( $_COOKIE[$cookie] ) && !array_key_exists( $key, self::$setCookies ) ) {
+ self::$setCookies[$key] = array();
+ }
+
+ // PHP deletes if value is the empty string; also, a past expiry is deleting
+ $deleting = ( $data['value'] === '' || $data['expire'] > 0 && $data['expire'] <= time() );
+
+ if ( $deleting && !isset( self::$setCookies[$key] ) ) { // isset( null ) is false
+ wfDebugLog( 'cookie', 'already deleted ' . $func . ': "' . implode( '", "', $data ) . '"' );
+ } elseif ( !$deleting && isset( self::$setCookies[$key] ) &&
+ self::$setCookies[$key] === array( $func, $data )
) {
+ wfDebugLog( 'cookie', 'already set ' . $func . ': "' . implode( '", "', $data ) . '"' );
+ } else {
wfDebugLog( 'cookie', $func . ': "' . implode( '", "', $data ) . '"' );
- if ( call_user_func_array( $func, $data ) ) {
- self::$setCookies[$cookie] = array( $func, $data );
+ if ( call_user_func_array( $func, array_values( $data ) ) ) {
+ self::$setCookies[$key] = $deleting ? null : array( $func, $data );
}
- } else {
- wfDebugLog( 'cookie', 'already set ' . $func . ': "' . implode( '", "', $data ) . '"' );
}
}
}
foreach ( $cookies as $key => $value ) {
if ( $value === false ) {
- $this->clearCookie( $request, $response, $key, $options );
+ $response->clearCookie( $key, $options );
} else {
if ( $extendedExpiry !== null && in_array( $key, $extendedCookies ) ) {
$expiry = time() + (int)$extendedExpiry;
'Token' => false,
);
- $this->clearCookie( $request, $response, $this->params['sessionName'],
- array( 'prefix' => '' ) + $this->cookieOptions );
+ $response->clearCookie(
+ $this->params['sessionName'], array( 'prefix' => '' ) + $this->cookieOptions
+ );
foreach ( $cookies as $key => $value ) {
- $this->clearCookie( $request, $response, $key, $this->cookieOptions );
+ $response->clearCookie( $key, $this->cookieOptions );
}
- $this->clearCookie( $request, $response, 'forceHTTPS',
+ $response->clearCookie( 'forceHTTPS',
array( 'prefix' => '', 'secure' => false ) + $this->cookieOptions );
}
return $value;
}
- /**
- * Delete a cookie. Contains an auth-specific hack.
- * @param \WebRequest $request
- * @param \WebResponse $response
- * @param string $key
- * @param array $options
- */
- protected function clearCookie( $request, $response, $key, $options = array() ) {
- global $wgCookiePrefix;
-
- $prefix = isset( $options['prefix'] ) ? $options['prefix'] : $wgCookiePrefix;
-
- if ( $request->getCookie( $key, $prefix ) ) {
- $response->clearCookie( $key, $options );
- }
- }
-
/**
* Return the data to store in cookies
* @param User $user
$request = new \FauxRequest();
$provider->persistSession( $backend, $request );
$this->assertSame( $sessionId, $request->response()->getCookie( 'MySessionName' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserID' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserName' ) );
- $this->assertNull( $request->response()->getCookie( 'xToken' ) );
- $this->assertNull( $request->response()->getCookie( 'forceHTTPS' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xUserID' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'xUserName' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xToken' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'forceHTTPS' ) );
$this->assertSame( array(), $backend->getData() );
// Logged-in user, no remember
$this->assertSame( $sessionId, $request->response()->getCookie( 'MySessionName' ) );
$this->assertSame( (string)$user->getId(), $request->response()->getCookie( 'xUserID' ) );
$this->assertSame( $user->getName(), $request->response()->getCookie( 'xUserName' ) );
- $this->assertNull( $request->response()->getCookie( 'xToken' ) );
- $this->assertNull( $request->response()->getCookie( 'forceHTTPS' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xToken' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'forceHTTPS' ) );
$this->assertSame( array(), $backend->getData() );
// Logged-in user, remember
'xUserName' => array(
'value' => $user->getName(),
) + $defaults,
- 'xToken' => !$remember ? null : array(
- 'value' => $user->getToken(),
- 'expire' => $extendedExpiry,
+ 'xToken' => array(
+ 'value' => $remember ? $user->getToken() : '',
+ 'expire' => $remember ? $extendedExpiry : -31536000,
) + $defaults,
'forceHTTPS' => !$secure ? null : array(
'value' => 'true',
$request = new \FauxRequest();
$provider->persistSession( $backend, $request );
$this->assertSame( $sessionId, $request->response()->getCookie( 'MySessionName' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserID' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserName' ) );
- $this->assertNull( $request->response()->getCookie( 'xToken' ) );
- $this->assertNull( $request->response()->getCookie( 'forceHTTPS' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xUserID' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'xUserName' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xToken' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'forceHTTPS' ) );
$this->assertSame( array(), $backend->getData() );
$provider->persistSession( $backend, $this->getSentRequest() );
$this->assertSame( $sessionId, $request->response()->getCookie( 'MySessionName' ) );
$this->assertSame( (string)$user->getId(), $request->response()->getCookie( 'xUserID' ) );
$this->assertSame( $user->getName(), $request->response()->getCookie( 'xUserName' ) );
- $this->assertNull( $request->response()->getCookie( 'xToken' ) );
- $this->assertNull( $request->response()->getCookie( 'forceHTTPS' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xToken' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'forceHTTPS' ) );
$this->assertSame( 'bar!', $request->response()->getCookie( 'xbar' ) );
$this->assertSame( (string)$loggedOut, $request->response()->getCookie( 'xLoggedOut' ) );
$this->assertEquals( array(
$request = new \FauxRequest();
$provider->unpersistSession( $request );
- $this->assertNull( $request->response()->getCookie( 'MySessionName' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserID' ) );
- $this->assertNull( $request->response()->getCookie( 'xUserName' ) );
- $this->assertNull( $request->response()->getCookie( 'xToken' ) );
- $this->assertNull( $request->response()->getCookie( 'forceHTTPS' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'MySessionName' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xUserID' ) );
+ $this->assertSame( null, $request->response()->getCookie( 'xUserName' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'xToken' ) );
+ $this->assertSame( '', $request->response()->getCookie( 'forceHTTPS' ) );
$provider->unpersistSession( $this->getSentRequest() );
}