Added escapes for the outputted data, to prevent an XSS injection.

AlexeyPlodenko · Apr 1, 2024 · 24dc159 · 24dc159
1 parent 0da3c16
commit 24dc159
Show file tree

Hide file tree

Showing 6 changed files with 143 additions and 143 deletions.
diff --git a/src/public/commands/index.php b/src/public/commands/index.php
@@ -40,19 +40,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server get command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key'])));
             }
         }        # Ask for get on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server get command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key'])));
         }         # Ask for get on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server get command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->get($server['hostname'], $server['port'], $_REQUEST['request_key'])));
                 }
             }
         }
@@ -64,19 +64,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server get command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration'])));
             }
         }        # Ask for set on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server set command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration'])));
         }         # Ask for set on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server set command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->set($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_data'], $_REQUEST['request_duration'])));
                 }
             }
         }
@@ -88,19 +88,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server get command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key'])));
             }
         }        # Ask for delete on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server delete command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key'])));
         }         # Ask for delete on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server delete command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->delete($server['hostname'], $server['port'], $_REQUEST['request_key'])));
                 }
             }
         }
@@ -117,19 +117,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server increment command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
             }
         }        # Ask for increment on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server increment command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
         }         # Ask for increment on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server increment command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->increment($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
                 }
             }
         }
@@ -146,19 +146,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server decrement command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
             }
         }        # Ask for decrement on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server decrement command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
         }         # Ask for decrement on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server decrement command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->decrement($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_value'])));
                 }
             }
         }
@@ -175,19 +175,19 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server get command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay'])));
             }
         }        # Ask for flush_all on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server flush_all command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay'])));
         }         # Ask for flush_all on all servers
         else {
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server flush_all command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api($_REQUEST['request_api'])->flush_all($server['hostname'], $server['port'], $_REQUEST['request_delay'])));
                 }
             }
         }
@@ -199,20 +199,20 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server get command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more'])));
             }
         }        # Ask for search on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server search command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more'])));
         }         # Ask for search on all servers
         else {
             # Looking into each cluster
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server search command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->search($server['hostname'], $server['port'], $_REQUEST['request_key'], $_REQUEST['request_level'], $_REQUEST['request_more'])));
                 }
             }
         }
@@ -224,20 +224,20 @@
         if (isset($_REQUEST['request_server']) && ($cluster = $_ini->cluster($_REQUEST['request_server']))) {
             foreach ($cluster as $server) {
                 # Dumping server telnet command response
-                echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet']));
+                echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet'])));
             }
         }        # Ask for a telnet command on one server
         elseif (isset($_REQUEST['request_server']) && ($server = $_ini->server($_REQUEST['request_server']))) {
             # Dumping server telnet command response
-            echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet']));
+            echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet'])));
         }         # Ask for a telnet command on all servers
         else {
             # Looking into each cluster
             foreach ($_ini->get('servers') as $cluster => $servers) {
                 # Asking for each server stats
                 foreach ($servers as $server) {
                     # Dumping server telnet command response
-                    echo Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet']));
+                    echo htmlspecialchars(Components::serverResponse($server['hostname'], $server['port'], Factory::api('Server')->telnet($server['hostname'], $server['port'], $_REQUEST['request_telnet'])));
                 }
             }
         }
@@ -255,4 +255,4 @@
         break;
 }
 
-ob_end_flush();
+ob_end_flush();
diff --git a/src/view/livestats/frame.php b/src/view/livestats/frame.php
@@ -3,7 +3,7 @@
 ?>
 <script type="text/javascript">
     var timeout = <?php echo $refresh_rate * 1000; ?>;
-    var page = '/stats?request_command=live_stats&cluster=<?php echo $cluster; ?>';
+    var page = '/stats?request_command=live_stats&cluster=<?php echo urlencode($cluster); ?>';
     setTimeout("ajax(page,'stats')", <?php echo (5 + $refresh_rate - $_ini->get('refresh_rate')) * 1000; ?>);
 </script>
 

diff --git a/src/view/stats/error.php b/src/view/stats/error.php
@@ -9,7 +9,7 @@
         # Asking server of cluster stats
         if(isset($_REQUEST['server']))
         {
-            echo ($_ini->cluster($_REQUEST['server'])) ? 'All servers from Cluster ' . $_REQUEST['server'] : 'Server '  . $_REQUEST['server'], ' did not respond !';
+            echo htmlspecialchars(($_ini->cluster($_REQUEST['server'])) ? 'All servers from Cluster ' . $_REQUEST['server'] : 'Server '  . $_REQUEST['server'], ' did not respond !');
         }
         # All servers stats
         else
@@ -20,7 +20,7 @@
     <div class="container corner full-size padding">
         <span class="left">Error message</span>
         <br/>
-        <?php echo Errors::last(); ?>
+        <?php echo htmlspecialchars(Errors::last()); ?>
         <br/>
         <br/>
         Please check above error message or your server status and retry
@@ -54,7 +54,7 @@
         This slab is allocated, but is empty
         <br/>
         <br/>
-        Go back to <a href="?server=<?php echo $_REQUEST['server']; ?>&amp;show=slabs" class="green">Server Slabs</a>
+        Go back to <a href="?server=<?php echo urlencode($_REQUEST['server']); ?>&amp;show=slabs" class="green">Server Slabs</a>
     </div>
 <?php
-}
+}