Merge pull request #10996 from KorvinSzanto/feature/clean-up-xss

Prevent browser blocked reflected XSS in dashboard search pages
concretecms · Oct 13, 2022 · 5e353be · 5e353be
1 parent 2cf7546
commit 5e353be
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/concrete/blocks/express_entry_list/view.php b/concrete/blocks/express_entry_list/view.php
@@ -8,8 +8,8 @@
 <?php } ?>
 <?php if ($tableDescription) { ?>
     <p><?=$tableDescription?></p>
-<?php } 
-	
+<?php }
+
 if (isset($entity)) { ?>
     <?php if ($enableSearch) { ?>
         <form method="get" action="<?=$c->getCollectionLink()?>">
@@ -87,7 +87,9 @@ class="table ccm-block-express-entry-list-table <?php if ($tableStriped) { ?><?p
             <thead>
                 <tr>
                 <?php foreach ($result->getColumns() as $column) { ?>
-                    <th class="<?=$column->getColumnStyleClass()?>"><a href="<?=$column->getColumnSortURL()?>"><?=$column->getColumnTitle()?></a></th>
+                    <th class="<?=$column->getColumnStyleClass()?>">
+                        <a href="<?=h($column->getColumnSortURL())?>"><?=$column->getColumnTitle()?></a>
+                    </th>
                 <?php } ?>
                 </tr>
             </thead>

diff --git a/concrete/elements/express/search/menu.php b/concrete/elements/express/search/menu.php
@@ -24,7 +24,7 @@
                     ?>
                     <li data-items-per-page="<?= $itemsPerPageOption; ?>">
                         <a class="dropdown-item <?= ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>"
-                           href="<?=$url?>"><?= $itemsPerPageOption; ?></a>
+                           href="<?= h($url) ?>"><?= $itemsPerPageOption; ?></a>
                     </li>
                 <?php } ?>
             </ul>

diff --git a/concrete/elements/files/search/menu.php b/concrete/elements/files/search/menu.php
@@ -38,7 +38,7 @@ class="btn btn-secondary p-2 dropdown-toggle"
                     ?>
 
                     <li data-items-per-page="<?php echo $itemsPerPageOption; ?>">
-                        <a class="dropdown-item <?php echo ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>" href="<?php echo $url ?>">
+                        <a class="dropdown-item <?php echo ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>" href="<?php echo h($url) ?>">
                             <?php echo $itemsPerPageOption; ?>
                         </a>
                     </li>

diff --git a/concrete/elements/groups/search/menu.php b/concrete/elements/groups/search/menu.php
@@ -46,7 +46,7 @@ class="btn btn-secondary p-2 dropdown-toggle"
 
                     <li data-items-per-page="<?php echo $itemsPerPageOption; ?>">
                         <a class="dropdown-item <?php echo ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>"
-                           href="<?php echo $url ?>">
+                           href="<?php echo h($url) ?>">
                             <?php echo $itemsPerPageOption; ?>
                         </a>
                     </li>

diff --git a/concrete/elements/pages/search/menu.php b/concrete/elements/pages/search/menu.php
@@ -36,7 +36,7 @@ class="btn btn-secondary p-2 dropdown-toggle"
 
                     <li data-items-per-page="<?php echo $itemsPerPageOption; ?>">
                         <a class="dropdown-item <?php echo ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>"
-                           href="<?php echo $url ?>">
+                           href="<?php echo h($url) ?>">
                             <?php echo $itemsPerPageOption; ?>
                         </a>
                     </li>

diff --git a/concrete/elements/users/search/menu.php b/concrete/elements/users/search/menu.php
@@ -38,7 +38,7 @@ class="btn btn-secondary p-2 dropdown-toggle"
 
                     <li data-items-per-page="<?php echo $itemsPerPageOption; ?>">
                         <a class="dropdown-item <?php echo ($itemsPerPageOption === $itemsPerPage) ? 'active' : ''; ?>"
-                           href="<?php echo $url ?>">
+                           href="<?php echo h($url) ?>">
                             <?php echo $itemsPerPageOption; ?>
                         </a>
                     </li>

diff --git a/concrete/single_pages/dashboard/express/entries/entries.php b/concrete/single_pages/dashboard/express/entries/entries.php
@@ -14,7 +14,7 @@
                 <?php foreach ($result->getColumns() as $column) { ?>
                     <th class="<?=$column->getColumnStyleClass()?>">
                         <?php if ($column->isColumnSortable()) { ?>
-                            <a href="<?=$column->getColumnSortURL()?>"><?=$column->getColumnTitle()?></a>
+                            <a href="<?= h($column->getColumnSortURL()) ?>"><?=$column->getColumnTitle()?></a>
                         <?php } else { ?>
                             <span><?=$column->getColumnTitle()?></span>
                         <?php } ?>

diff --git a/concrete/single_pages/dashboard/files/search.php b/concrete/single_pages/dashboard/files/search.php
@@ -68,7 +68,7 @@ class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
                         <?php
                         if ($column->isColumnSortable()) { ?>
                             <a href="<?php
-                            echo $column->getColumnSortURL() ?>">
+                            echo h($column->getColumnSortURL()) ?>">
                                 <?php
                                 echo $column->getColumnTitle() ?>
                             </a>

diff --git a/concrete/single_pages/dashboard/sitemap/search.php b/concrete/single_pages/dashboard/sitemap/search.php
@@ -53,7 +53,7 @@ class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
                 <?php /** @var Column $column */ ?>
                 <th class="<?php echo $column->getColumnStyleClass() ?>">
                     <?php if ($column->isColumnSortable()): ?>
-                        <a href="<?php echo $column->getColumnSortURL() ?>">
+                        <a href="<?php echo h($column->getColumnSortURL()) ?>">
                             <?php echo $column->getColumnTitle() ?>
                         </a>
                     <?php else: ?>

diff --git a/concrete/single_pages/dashboard/users/groups.php b/concrete/single_pages/dashboard/users/groups.php
@@ -53,7 +53,7 @@ class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
                 <?php /** @var Column $column */ ?>
                 <th class="<?php echo $column->getColumnStyleClass() ?>">
                     <?php if ($column->isColumnSortable()): ?>
-                        <a href="<?php echo $column->getColumnSortURL() ?>">
+                        <a href="<?php echo h($column->getColumnSortURL()) ?>">
                             <?php echo $column->getColumnTitle() ?>
                         </a>
                     <?php else: ?>

diff --git a/concrete/single_pages/dashboard/users/search.php b/concrete/single_pages/dashboard/users/search.php
@@ -54,7 +54,7 @@ class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
                 <?php /** @var Column $column */ ?>
                 <th class="<?php echo $column->getColumnStyleClass() ?>">
                     <?php if ($column->isColumnSortable()): ?>
-                        <a href="<?php echo $column->getColumnSortURL() ?>">
+                        <a href="<?php echo h($column->getColumnSortURL()) ?>">
                             <?php echo $column->getColumnTitle() ?>
                         </a>
                     <?php else: ?>