Skip to content

security: fix RLIKE SQLi, XSS, integer casting, and dynamic dispatch #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
somethingwithproof wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

security: fix RLIKE SQLi, XSS, integer casting, and dynamic dispatch #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions db_functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,21 @@ function renderGroupConcat(string &$sql_where, string $sql_join, string $sql_fie
*/
function renderWhereJoin(string &$sql_where, string &$sql_join): void {
if (get_request_var('crit') > 0) {
$awhere = 'h.monitor_criticality >= ' . get_request_var('crit');
$awhere = 'h.monitor_criticality >= ' . (int) get_request_var('crit');
} else {
$awhere = '';
}

if (get_request_var('grouping') == 'site') {
if (get_request_var('site') > 0) {
$awhere .= ($awhere == '' ? '' : ' AND ') . 'h.site_id = ' . get_request_var('site');
$awhere .= ($awhere == '' ? '' : ' AND ') . 'h.site_id = ' . (int) get_request_var('site');
} elseif (get_request_var('site') == -2) {
$awhere .= ($awhere == '' ? '' : ' AND ') . ' h.site_id = 0';
}
}

if (get_request_var('rfilter') != '') {
$awhere .= ($awhere == '' ? '' : ' AND ') . " h.description RLIKE '" . get_request_var('rfilter') . "'";
$awhere .= ($awhere == '' ? '' : ' AND ') . ' h.description RLIKE ' . db_qstr(get_request_var('rfilter'));
}

if (get_request_var('grouping') == 'tree') {
Expand Down
14 changes: 8 additions & 6 deletions monitor_controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ function drawPage(): void {

// Default with permissions = default_by_permission
// Tree = group_by_tree
$function = 'render' . ucfirst(get_request_var('grouping'));
$allowed_groupings = ['default', 'tree', 'site', 'template'];
$grouping = in_array(get_request_var('grouping'), $allowed_groupings, true) ? get_request_var('grouping') : 'default';
$function = 'render' . ucfirst($grouping);

if (function_exists($function) && get_request_var('view') != 'list') {
if (get_request_var('grouping') == 'default' || get_request_var('grouping') == 'site') {
Expand Down Expand Up @@ -548,23 +550,23 @@ function monitorRenderGroupingDropdowns(array $classes, array $criticalities, ar
*/
function monitorRenderHiddenFilterInputs(): void {
if (get_request_var('grouping') != 'tree') {
print '<td><input type="hidden" id="tree" value="' . get_request_var('tree') . '"></td>' . PHP_EOL;
print '<td><input type="hidden" id="tree" value="' . html_escape(get_request_var('tree')) . '"></td>' . PHP_EOL;
}

if (get_request_var('grouping') != 'site') {
print '<td><input type="hidden" id="site" value="' . get_request_var('site') . '"></td>' . PHP_EOL;
print '<td><input type="hidden" id="site" value="' . html_escape(get_request_var('site')) . '"></td>' . PHP_EOL;
}

if (get_request_var('grouping') != 'template') {
print '<td><input type="hidden" id="template" value="' . get_request_var('template') . '"></td>' . PHP_EOL;
print '<td><input type="hidden" id="template" value="' . html_escape(get_request_var('template')) . '"></td>' . PHP_EOL;
}

if (get_request_var('view') == 'list') {
print '<td><input type="hidden" id="size" value="' . get_request_var('size') . '"></td>' . PHP_EOL;
print '<td><input type="hidden" id="size" value="' . html_escape(get_request_var('size')) . '"></td>' . PHP_EOL;
}

if (get_request_var('view') != 'default') {
print '<td><input type="hidden" id="trim" value="' . get_request_var('trim') . '"></td>' . PHP_EOL;
print '<td><input type="hidden" id="trim" value="' . html_escape(get_request_var('trim')) . '"></td>' . PHP_EOL;
}
}

Expand Down
4 changes: 2 additions & 2 deletions poller_functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ function buildRebootDetails(array $hosts): array {

$last_host = $host;
$body .= '<tr>' .
'<td class="left">' . $host['description'] . '</td>' .
'<td class="left">' . $host['hostname'] . '</td>' .
'<td class="left">' . html_escape($host['description']) . '</td>' .
'<td class="left">' . html_escape($host['hostname']) . '</td>' .
'</tr>' . PHP_EOL;

$body_txt .=
Expand Down
Loading