diff --git a/docs/en/changelogs/2.4.12.md b/docs/en/changelogs/2.4.12.md index 2a2c56fde..9bdd26b3c 100644 --- a/docs/en/changelogs/2.4.12.md +++ b/docs/en/changelogs/2.4.12.md @@ -12,4 +12,13 @@ See [announcement](http://www.silverstripe.org/ss-2013-004-privilege-escalation- ### Security: Privilege escalation through APPLY_ROLES assignment (SS-2013-005) -See [announcement](http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/) \ No newline at end of file +See [announcement](http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/) + +## Changelog + +### Bugfixes + + * 2013-08-30 [a914dee] Disallow permissions assign for APPLY_ROLES (SS-2013-005) (Ingo Schommer) + * 2013-08-30 [6543b4e](https://github.com/silverstripe/silverstripe-cms/commit/6543b4e) Privilege escalation through Group and Member CSV upload (SS-2013-004) (Ingo Schommer) + * 2013-08-30 [ec8e826] Privilege escalation through APPLY_ROLES assignment (SS-2013-005) (Ingo Schommer) + * 2013-08-30 [7979515] Privilege escalation through Group hierarchy setting (SS-2013-003) (Ingo Schommer) \ No newline at end of file diff --git a/forms/Form.php b/forms/Form.php index 9aca133b0..f457352ad 100755 --- a/forms/Form.php +++ b/forms/Form.php @@ -137,6 +137,10 @@ class Form extends RequestHandler { */ protected $extraClasses = array(); + public static $casting = array( + 'Message' => 'Text' + ); + /** * Create a new form, with the given fields an action buttons. * diff --git a/forms/FormField.php b/forms/FormField.php index a28700db1..cc62c3748 100755 --- a/forms/FormField.php +++ b/forms/FormField.php @@ -72,6 +72,10 @@ class FormField extends RequestHandler { * @var Custom Validation Message for the Field */ protected $customValidationMessage = ""; + + public static $casting = array( + 'Message' => 'Text' + ); /** * Create a new field. diff --git a/forms/TreeDropdownField.php b/forms/TreeDropdownField.php index b336c71ce..1d281f5cf 100755 --- a/forms/TreeDropdownField.php +++ b/forms/TreeDropdownField.php @@ -233,8 +233,14 @@ class TreeDropdownField extends FormField { } } + if($obj->escapeTypeForField($this->labelField) == 'xml') { + $labelFieldEval = '$child->' . $this->labelField; + } else { + $labelFieldEval = 'Convert::raw2xml($child->' . $this->labelField . ')'; + } + $eval = '"