tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

#941 - Security flaw: SS prone to CSRF attack

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43901 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-10-28 21:44:38 +00:00
parent f807c9f8ca
commit 808d6875cb
4 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/control/Controller.php
View File

@ -157,7 +157,7 @@ class Controller extends ViewableData {
} }
// Protection against CSRF attacks // Protection against CSRF attacks
if($form->securityEnabled()) { if($form->securityTokenEnabled()) {
$securityID = Session::get('SecurityID'); $securityID = Session::get('SecurityID');
if(!$securityID || !isset($this->requestParams['SecurityID']) || $securityID != $this->requestParams['SecurityID']) { if(!$securityID || !isset($this->requestParams['SecurityID']) || $securityID != $this->requestParams['SecurityID']) {

6
forms/Form.php
View File

@ -174,7 +174,7 @@ class Form extends ViewableData {
* @return FieldSet The form fields * @return FieldSet The form fields
*/ */
function Fields() { function Fields() {
if($this->securityEnabled()) { if($this->securityTokenEnabled()) {
if(Session::get('SecurityID')) { if(Session::get('SecurityID')) {
$securityID = Session::get('SecurityID'); $securityID = Session::get('SecurityID');
} else { } else {
@ -686,7 +686,7 @@ class Form extends ViewableData {
* against CSRF attacks, but you should disable this if you don't want to tie * against CSRF attacks, but you should disable this if you don't want to tie
* a form to a session - eg a search form. * a form to a session - eg a search form.
*/ */
function disableSecurity() { function disableSecurityToken() {
$this->security = false; $this->security = false;
} }
@ -696,7 +696,7 @@ class Form extends ViewableData {
* *
* @return bool * @return bool
*/ */
function securityEnabled() { function securityTokenEnabled() {
return $this->security; return $this->security;
} }

2
search/SearchForm.php
View File

@ -36,6 +36,8 @@ class SearchForm extends Form {
$fields->push(new HiddenField("executeForm", null, $name)); $fields->push(new HiddenField("executeForm", null, $name));
parent::__construct($controller, $name, $fields, $actions); parent::__construct($controller, $name, $fields, $actions);
$this->disableSecurityToken();
} }
function FormMethod() { function FormMethod() {

54
security/LoginForm.php
View File

@ -17,35 +17,35 @@
* @author Markus Lanthaler <markus@silverstripe.com> * @author Markus Lanthaler <markus@silverstripe.com>
*/ */
abstract class LoginForm extends Form { abstract class LoginForm extends Form {
function __construct($controller, $name, $fields, $actions) {
parent::__construct($controller, $name, $fields, $actions);
$this->disableSecurityToken();
}
/** /**
* Authenticator class to use with this login form * Authenticator class to use with this login form
* *
* Set this variable to the authenticator class to use with this login * Set this variable to the authenticator class to use with this login
* form. * form.
* * @var string
* @var string */
*/
protected $authenticator_class; protected $authenticator_class;
/**
/** * Get the authenticator class
* Get the authenticator class * @return Authenticator Returns the authenticator class for this login form.
* */
* @return Authenticator Returns the authenticator class for this login
* form. public function getAuthenticator() {
*/ if(!class_exists($this->authenticator_class) || !is_subclass_of($this->authenticator_class, 'Authenticator')) {
public function getAuthenticator() { user_error('The form uses an invalid authenticator class!', E_USER_ERROR);
if(!class_exists($this->authenticator_class) || return;
!is_subclass_of($this->authenticator_class, 'Authenticator')) { }
user_error('The form uses an invalid authenticator class!',
E_USER_ERROR); return new $this->authenticator_class;
return; }
}
return new $this->authenticator_class;
}
} }
?> ?>