Page MenuHomePhabricator

0001-bug-42202-Validate-preference-values-in-action-optio.patch

Authored By
• bzimport
Nov 22 2014, 1:12 AM
Size
2 KB
Referenced Files
None
Subscribers
None

0001-bug-42202-Validate-preference-values-in-action-optio.patch

From 59c08babf06f1c5b50cba584d0890abe9a20eedf Mon Sep 17 00:00:00 2001
From: Catrope <roan.kattouw@gmail.com>
Date: Fri, 16 Nov 2012 10:19:15 -0800
Subject: [PATCH] (bug 42202) Validate preference values in action=options
Previously, there was no validation whatsoever and the module would
happily write any preference you asked it to. This, combined with the
fact that the code using the 'editfont' preference didn't perform any
validation or escaping, led to a CSS injection vulnerability.
Change-Id: I98df55f2b16ac1b6fce578798b6f58b5dad96775
---
includes/api/ApiOptions.php | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/includes/api/ApiOptions.php b/includes/api/ApiOptions.php
index 4398eb0..f21bbc0 100644
--- a/includes/api/ApiOptions.php
+++ b/includes/api/ApiOptions.php
@@ -47,7 +47,7 @@ class ApiOptions extends ApiBase {
}
$params = $this->extractRequestParams();
- $changes = 0;
+ $changed = false;
if ( isset( $params['optionvalue'] ) && !isset( $params['optionname'] ) ) {
$this->dieUsageMsg( array( 'missingparam', 'optionname' ) );
@@ -55,26 +55,43 @@ class ApiOptions extends ApiBase {
if ( $params['reset'] ) {
$user->resetOptions();
- $changes++;
+ $changed = true;
}
+
+ $changes = array();
if ( count( $params['change'] ) ) {
foreach ( $params['change'] as $entry ) {
$array = explode( '=', $entry, 2 );
- $user->setOption( $array[0], isset( $array[1] ) ? $array[1] : null );
- $changes++;
+ $changes[$array[0]] = isset( $array[1] ) ? $array[1] : null;
}
}
if ( isset( $params['optionname'] ) ) {
$newValue = isset( $params['optionvalue'] ) ? $params['optionvalue'] : null;
- $user->setOption( $params['optionname'], $newValue );
- $changes++;
+ $changes[$params['optionname']] = $newValue;
+ }
+ if ( !count( $changes ) ) {
+ $this->dieUsage( 'No changes were requested', 'nochanges' );
+ }
+
+ $prefs = Preferences::getPreferences( $user, $this->getContext() );
+ foreach ( $changes as $key => $value ) {
+ if ( !isset( $prefs[$key] ) ) {
+ $this->setWarning( "Not a valid preference: $key" );
+ continue;
+ }
+ $field = HTMLForm::loadInputFromParameters( $key, $prefs[$key] );
+ $validation = $field->validate( $value, $user->getOptions() );
+ if ( $validation === true ) {
+ $user->setOption( $key, $value );
+ $changed = true;
+ } else {
+ $this->setWarning( "Validation error for '$key': $validation" );
+ }
}
- if ( $changes ) {
+ if ( $changed ) {
// Commit changes
$user->saveSettings();
- } else {
- $this->dieUsage( 'No changes were requested', 'nochanges' );
}
$this->getResult()->addValue( null, $this->getModuleName(), 'success' );
--
1.7.10.2.484.gcd07cc5.dirty

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
9705
Default Alt Text
0001-bug-42202-Validate-preference-values-in-action-optio.patch (2 KB)

Event Timeline