Merge pull request #382 from tyrant88/tyrant88-patch-142

Security Fix in Statistik PlugIn
FriendsOfREDAXO · Oct 22, 2023 · 3a0cb70 · 3a0cb70
2 parents 8f69cca + b4fb44b
commit 3a0cb70
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # Changelog
+## Version 6.9.10 (2023-10-21)
+- Security Fix: escape Suchbegriffe
+
 ## Version 6.9.9 (2023-09-23)
 - Fix indexing wenn hinter Proxy ;-)
 - Code Style (CS)

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: search_it
-version: '6.9.9'
+version: '6.9.10'
 author: Friends Of REDAXO
 supportpage: https://github.com/FriendsOfREDAXO/search_it
 

diff --git a/plugins/autocomplete/package.yml b/plugins/autocomplete/package.yml
@@ -1,5 +1,5 @@
 package: search_it/autocomplete
-version: '6.9.9'
+version: '6.9.10'
 author: Manétage
 
 title: 'translate:search_it_autocomplete_plugin_title'

diff --git a/plugins/documentation/package.yml b/plugins/documentation/package.yml
@@ -1,5 +1,5 @@
 package: search_it/documentation
-version: '6.9.9'
+version: '6.9.10'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_documentation_title'

diff --git a/plugins/plaintext/package.yml b/plugins/plaintext/package.yml
@@ -1,5 +1,5 @@
 package: search_it/plaintext
-version: '6.9.9'
+version: '6.9.10'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_plaintext_title'

diff --git a/plugins/stats/images/searchterm_timestats.inc.php b/plugins/stats/images/searchterm_timestats.inc.php
@@ -30,11 +30,11 @@
         $max = $month['count'];
 }
 
-$title = $this->i18n(
+$title = rex_i18n::rawMsg(
     'search_it_stats_searchterm_timestats_title',
     empty($term)
         ? $this->i18n('search_it_stats_searchterm_timestats_title0_all')
-        : $this->i18n(
+        : rex_i18n::rawMsg(
         'search_it_stats_searchterm_timestats_title0_single',
         $term
     ),

diff --git a/plugins/stats/package.yml b/plugins/stats/package.yml
@@ -1,5 +1,5 @@
 package: search_it/stats
-version: '6.9.9'
+version: '6.9.10'
 author: Friends Of REDAXO
 
 title: 'translate:search_it_stats_plugin_title'

diff --git a/plugins/stats/pages/index.php b/plugins/stats/pages/index.php
@@ -114,11 +114,13 @@
 
 // top search terms
 $topsearchtermlist = '';
-$topsearchtermselect = '<option value="all" ' . ($this->getConfig('searchtermselect') == 'all' ? ' selected="selected"' : '') . '>' . rex_escape($this->i18n('search_it_stats_searchterm_timestats_title0_all')) . '</option>';
+$topsearchtermselect = '<option value="all" ' . ($this->getConfig('searchtermselect') == 'all' ? ' selected="selected"' : '') . '>' . $this->i18n('search_it_stats_searchterm_timestats_title0_all') . '</option>';
 $topsearchterms = $stats->getTopSearchterms($this->getConfig('maxtopsearchitems'));
 foreach ($topsearchterms as $term) {
     $topsearchtermlist .= '<li class="' . ($term['success'] == '1' ? 'search_it-stats-success text-success' : 'search_it-stats-fail text-danger') . '"><strong>' . rex_escape($term['term']) . '</strong> <em>(' . $term['count'] . ')</em></li>';
-    $topsearchtermselect .= '<option value="_' . rex_escape($term['term']) . '"' . (($this->getConfig('searchtermselect') == '_' . $term['term']) ? ' selected="selected"' : '') . '>' . $this->i18n('search_it_stats_searchterm_timestats_title0_single', rex_escape($term['term'])) . '</option>';
+    $topsearchtermselect .= '<option value="_' . rex_escape($term['term'], 'url') . '"' .
+        ($this->getConfig('searchtermselect') == '_' . rex_escape($term['term'], 'url') ? ' selected="selected"' : '') . '>' .
+        rex_i18n::rawMsg('search_it_stats_searchterm_timestats_title0_single', rex_escape($term['term'])) . '</option>';
 }
 
 if (!empty($topsearchterms)) {
@@ -185,10 +187,10 @@
 
 $pre = rex_i18n::rawMsg('search_it_stats_searchterm_timestats_title', $topsearchtermselect, $searchtermselectmonthcount);
 $rest = '<img src="index.php?page=search_it/stats&amp;func=image&amp;image=searchterm_timestats&amp;term='
-    . rex_escape(urlencode($this->getConfig('searchtermselect') == 'all' ? 'all' : $this->getConfig('searchtermselect')))
+    . ($this->getConfig('searchtermselect') == 'all' ? 'all' : $this->getConfig('searchtermselect'))
     . '&amp;monthcount=' . intval($this->getConfig('searchtermselectmonthcount')) . '"  alt="'
-    . $this->i18n('search_it_stats_searchterm_timestats_title', $this->getConfig('searchtermselect') == 'all' ? $this->i18n('search_it_stats_searchterm_timestats_title0_all') : $this->i18n('search_it_stats_searchterm_timestats_title0_single', substr($this->getConfig('searchtermselect'), 1)), intval($this->getConfig('searchtermselectmonthcount'))) . '"'
-    . ' title="' . rex_escape($this->i18n('search_it_stats_searchterm_timestats_title', $this->getConfig('searchtermselect') == 'all' ? $this->i18n('search_it_stats_searchterm_timestats_title0_all') : $this->i18n('search_it_stats_searchterm_timestats_title0_single', substr($this->getConfig('searchtermselect'), 1)), intval($this->getConfig('searchtermselectmonthcount')))) . '" />';
+    . $this->i18n('search_it_stats_searchterm_timestats_title', $this->getConfig('searchtermselect') == 'all' ? $this->i18n('search_it_stats_searchterm_timestats_title0_all') : rex_i18n::rawMsg('search_it_stats_searchterm_timestats_title0_single', substr($this->getConfig('searchtermselect'), 1)), intval($this->getConfig('searchtermselectmonthcount'))) . '"'
+    . ' title="' . $this->i18n('search_it_stats_searchterm_timestats_title', $this->getConfig('searchtermselect') == 'all' ? $this->i18n('search_it_stats_searchterm_timestats_title0_all') : rex_i18n::rawMsg('search_it_stats_searchterm_timestats_title0_single', substr($this->getConfig('searchtermselect'), 1)), intval($this->getConfig('searchtermselectmonthcount'))) . '" />';
 
 $content[] = search_it_getSettingsFormSection(
     'searchterm_timestats',
@@ -276,7 +278,7 @@ function (data) {
                                     select = '';
                                 }
                                 jQuery('#search_it_stats_searchtermselect').append(
-                                    jQuery('<option value="_' + item.term + '"' + select + '>').text('"' + item.term + '"')
+                                    jQuery('<option value="_' + encodeURIComponent(item.term) + '"' + select + '>').text(item.term)
                                 );
                             });