maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

secure requests; refs #893

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-10-31 15:57:59 +01:00
parent 16eca628dd
commit ea76ce8fcc
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api.php
View File

@@ -1,4 +1,6 @@
<?php <?php
use voku\helper\AntiXSS;
require __DIR__ . '/vendor/autoload.php'; require __DIR__ . '/vendor/autoload.php';
require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php'; require \Froxlor\Froxlor::getInstallDir() . '/lib/tables.inc.php';
@@ -30,6 +32,12 @@ if (is_null($decoded_request)) {
json_response(400, "Invalid JSON"); json_response(400, "Invalid JSON");
} }
/**
* check for xss attempts and clean request
*/
$antiXss = new AntiXSS();
$request = $antiXss->xss_clean($request);
// validate content // validate content
try { try {
$decoded_request = stripcslashes_deep($decoded_request); $decoded_request = stripcslashes_deep($decoded_request);

1
lib/Froxlor/UI/HTML.php
View File

@@ -299,7 +299,6 @@ class HTML
$checkbox = self::makecheckbox('delete_userfiles', $chk_text, '1', false, '0', true, true); $checkbox = self::makecheckbox('delete_userfiles', $chk_text, '1', false, '0', true, true);
} else { } else {
$checkbox = '<input type="hidden" name="delete_userfiles" value="0" />' . "\n"; $checkbox = '<input type="hidden" name="delete_userfiles" value="0" />' . "\n";
;
} }
$text = strtr($text, array( $text = strtr($text, array(

21
lib/init.php
View File

@@ -44,6 +44,8 @@ require dirname(__DIR__) . '/vendor/autoload.php';
use Froxlor\Database\Database; use Froxlor\Database\Database;
use Froxlor\Settings; use Froxlor\Settings;
use voku\helper\AntiXSS;
use Froxlor\PhpHelper;
header("Content-Type: text/html; charset=UTF-8"); header("Content-Type: text/html; charset=UTF-8");
@@ -86,6 +88,17 @@ foreach ($_REQUEST as $key => $value) {
} }
} }
/**
* check for xss attempts and clean important globals
*/
$antiXss = new AntiXSS();
// check $_GET
PhpHelper::cleanGlobal($_GET, $antiXss);
// check $_POST
PhpHelper::cleanGlobal($_POST, $antiXss);
// check $_COOKIE
PhpHelper::cleanGlobal($_COOKIE, $antiXss);
unset($_); unset($_);
unset($value); unset($value);
unset($key); unset($key);
@@ -473,9 +486,9 @@ unset($js);
unset($css); unset($css);
if (isset($_POST['action'])) { if (isset($_POST['action'])) {
$action = $_POST['action']; $action = trim(strip_tags($_POST['action']));
} elseif (isset($_GET['action'])) { } elseif (isset($_GET['action'])) {
$action = $_GET['action']; $action = trim(strip_tags($_GET['action']));
} else { } else {
$action = ''; $action = '';
// clear request data // clear request data
@@ -485,9 +498,9 @@ if (isset($_POST['action'])) {
} }
if (isset($_POST['page'])) { if (isset($_POST['page'])) {
$page = $_POST['page']; $page = trim(strip_tags($_POST['page']));
} elseif (isset($_GET['page'])) { } elseif (isset($_GET['page'])) {
$page = $_GET['page']; $page = trim(strip_tags($_GET['page']));
} else { } else {
$page = ''; $page = '';
} }