tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #606 from willrossi/trac6303

Browse Source 
API: add SecurityToken::reset() as a shortcut for regenerating a token.
This commit is contained in:
Sean Harvey 2012-07-01 18:37:41 -07:00
commit 95e4057e21
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/SecurityToken.php
View File

@ -147,6 +147,13 @@ class SecurityToken extends Object implements TemplateGlobalProvider {
Session::set($this->getName(), $val);
}
/**
* Reset the token to a new value.
*/
public function reset() {
$this->setValue($this->generate());
}
/**
* Checks for an existing CSRF token in the current users session.
* This check is automatically performed in {@link Form->httpSubmission()}
@ -291,6 +298,5 @@ class NullSecurityToken extends SecurityToken {
*/
function generate() {
return null;
}
}
}
}

8
tests/security/SecurityTokenTest.php
View File

@ -65,6 +65,14 @@ class SecurityTokenTest extends SapphireTest {
$t->setValue('mytoken');
$this->assertTrue($t->check('mytoken'), 'Valid token returns true');
}
function testReset() {
$t = new SecurityToken();
$initialValue = $t->getValue();
$t->reset();
$this->assertNotEquals($t->getValue(), $initialValue);
}
function testCheckRequest() {
$t = new SecurityToken();