diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Security] fixed a Token serialization bug

Browse Source
This commit is contained in:
Sebastian Utz 2011-02-01 17:37:49 +01:00 committed by Fabien Potencier
parent fbc21fedf7
commit 4d5853866a
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
View File

@ -18,8 +18,6 @@ namespace Symfony\Component\Security\Core\Authentication\Token;
*/
class PreAuthenticatedToken extends Token
{
protected $providerKey;
/**
* Constructor.
*/
@ -35,11 +33,6 @@ class PreAuthenticatedToken extends Token
$this->providerKey = $providerKey;
}
public function getProviderKey()
{
return $this->providerKey;
}
/**
* {@inheritdoc}
*/

6
src/Symfony/Component/Security/Core/Authentication/Token/RememberMeToken.php
View File

@ -22,7 +22,6 @@ use Symfony\Component\Security\Core\User\AccountInterface;
class RememberMeToken extends Token
{
protected $key;
protected $providerKey;
/**
* The persistent token which resulted in this authentication token.
@ -53,11 +52,6 @@ class RememberMeToken extends Token
$this->setAuthenticated(true);
}
public function getProviderKey()
{
return $this->providerKey;
}
public function getKey()
{
return $this->key;

13
src/Symfony/Component/Security/Core/Authentication/Token/Token.php
View File

@ -28,6 +28,7 @@ abstract class Token implements TokenInterface
protected $user;
protected $credentials;
protected $immutable;
protected $providerKey;
/**
* Constructor.
@ -181,12 +182,20 @@ abstract class Token implements TokenInterface
$this->immutable = true;
}
/**
* {@inheritdoc}
*/
public function getProviderKey()
{
return $this->providerKey;
}
/**
* {@inheritdoc}
*/
public function serialize()
{
return serialize(array($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable));
return serialize(array($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable, $this->providerKey));
}
/**
@ -194,6 +203,6 @@ abstract class Token implements TokenInterface
*/
public function unserialize($serialized)
{
list($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable) = unserialize($serialized);
list($this->user, $this->credentials, $this->authenticated, $this->roles, $this->immutable, $this->providerKey) = unserialize($serialized);
}
}

9
src/Symfony/Component/Security/Core/Authentication/Token/UsernamePasswordToken.php
View File

@ -18,11 +18,9 @@ namespace Symfony\Component\Security\Core\Authentication\Token;
*/
class UsernamePasswordToken extends Token
{
protected $providerKey;
/**
* Constructor.
*
*
* @param string $user The username (like a nickname, email address, etc.)
* @param string $credentials This usually is the password of the user
*/
@ -37,11 +35,6 @@ class UsernamePasswordToken extends Token
parent::setAuthenticated((Boolean) count($roles));
}
public function getProviderKey()
{
return $this->providerKey;
}
/**
* {@inheritdoc}
*/