Skip to content
Snippets Groups Projects
Commit 17d40965 authored by Alex Barth's avatar Alex Barth
Browse files

#853974 snoldak924, alex_b: Fix XSS vulnerabilities in module.

parent 050378eb
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
-------------------------------- --------------------------------
- #853974 snoldak924, alex_b: Fix XSS vulnerabilities in module.
- #887846 ekes: Make FeedsSimplePieEnclosure (un)serialization safe. - #887846 ekes: Make FeedsSimplePieEnclosure (un)serialization safe.
- #908582 XiaN Vizjereij, alex_b: Fix "Cannot use object of type stdClass as - #908582 XiaN Vizjereij, alex_b: Fix "Cannot use object of type stdClass as
array" error in mappers/taxonomy.inc. array" error in mappers/taxonomy.inc.
......
...@@ -29,7 +29,7 @@ function feeds_page() { ...@@ -29,7 +29,7 @@ function feeds_page() {
} }
$rows[] = array( $rows[] = array(
l($title, $link), l($title, $link),
$importer->config['description'], check_plain($importer->config['description']),
); );
} }
} }
......
...@@ -63,8 +63,8 @@ function feeds_ui_overview_form(&$form_status) { ...@@ -63,8 +63,8 @@ function feeds_ui_overview_form(&$form_status) {
); );
foreach (feeds_importer_load_all(TRUE) as $importer) { foreach (feeds_importer_load_all(TRUE) as $importer) {
$importer_form = array(); $importer_form = array();
$importer_form['name']['#value'] = $importer->config['name']; $importer_form['name']['#value'] = check_plain($importer->config['name']);
$importer_form['description']['#value'] = $importer->config['description']; $importer_form['description']['#value'] = check_plain($importer->config['description']);
if (empty($importer->config['content_type'])) { if (empty($importer->config['content_type'])) {
$importer_form['attached']['#value'] = '[none]'; $importer_form['attached']['#value'] = '[none]';
} }
...@@ -774,8 +774,8 @@ function theme_feeds_ui_mapping_form($form) { ...@@ -774,8 +774,8 @@ function theme_feeds_ui_mapping_form($form) {
// Some parsers do not define source options. // Some parsers do not define source options.
$source = isset($form['source']['#options'][$mapping['source']]) ? $form['source']['#options'][$mapping['source']] : $mapping['source']; $source = isset($form['source']['#options'][$mapping['source']]) ? $form['source']['#options'][$mapping['source']] : $mapping['source'];
$rows[] = array( $rows[] = array(
$source, check_plain($source),
$form['target']['#options'][$mapping['target']], check_plain($form['target']['#options'][$mapping['target']]),
drupal_render($form['unique_flags'][$i]), drupal_render($form['unique_flags'][$i]),
drupal_render($form['remove_flags'][$i]), drupal_render($form['remove_flags'][$i]),
); );
...@@ -803,8 +803,8 @@ function theme_feeds_ui_mapping_form($form) { ...@@ -803,8 +803,8 @@ function theme_feeds_ui_mapping_form($form) {
$rows = array(); $rows = array();
foreach (element_children($form['legendset']['legend']['sources']) as $k) { foreach (element_children($form['legendset']['legend']['sources']) as $k) {
$rows[] = array( $rows[] = array(
drupal_render($form['legendset']['legend']['sources'][$k]['name']), check_plain(drupal_render($form['legendset']['legend']['sources'][$k]['name'])),
drupal_render($form['legendset']['legend']['sources'][$k]['description']), check_plain(drupal_render($form['legendset']['legend']['sources'][$k]['description'])),
); );
} }
if (count($rows)) { if (count($rows)) {
...@@ -816,8 +816,8 @@ function theme_feeds_ui_mapping_form($form) { ...@@ -816,8 +816,8 @@ function theme_feeds_ui_mapping_form($form) {
$rows = array(); $rows = array();
foreach (element_children($form['legendset']['legend']['targets']) as $k) { foreach (element_children($form['legendset']['legend']['targets']) as $k) {
$rows[] = array( $rows[] = array(
drupal_render($form['legendset']['legend']['targets'][$k]['name']), check_plain(drupal_render($form['legendset']['legend']['targets'][$k]['name'])),
drupal_render($form['legendset']['legend']['targets'][$k]['description']), check_plain(drupal_render($form['legendset']['legend']['targets'][$k]['description'])),
); );
} }
$legend .= '<h4>'. t('Targets') .'</h4>'; $legend .= '<h4>'. t('Targets') .'</h4>';
......
...@@ -75,9 +75,9 @@ class FeedsCSVParser extends FeedsParser { ...@@ -75,9 +75,9 @@ class FeedsCSVParser extends FeedsParser {
$mappings = feeds_importer($this->id)->processor->config['mappings']; $mappings = feeds_importer($this->id)->processor->config['mappings'];
$sources = $uniques = array(); $sources = $uniques = array();
foreach ($mappings as $mapping) { foreach ($mappings as $mapping) {
$sources[] = $mapping['source']; $sources[] = check_plain($mapping['source']);
if ($mapping['unique']) { if ($mapping['unique']) {
$uniques[] = $mapping['source']; $uniques[] = check_plain($mapping['source']);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment