Skip to content

Commit b995bae

Browse files
hardening: re-apply db_qstr and sanitize_unserialize after linter revert
Linter reverted thold_graph.php and thold_webapi.php changes from the previous commit. Re-apply: db_qstr() for all RLIKE patterns in thold_graph, sanitize_unserialize_selected_items in thold_webapi. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
1 parent c037f27 commit b995bae

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

thold_graph.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ function tholds() {
404404
$statefilter = thold_get_state_filter(get_request_var('state'));
405405

406406
if (get_request_var('rfilter') != '') {
407-
$sql_where .= ($sql_where == '' ? '(' : ' AND ') . " td.name_cache RLIKE '" . get_request_var('rfilter') . "'";
407+
$sql_where .= ($sql_where == '' ? '(' : ' AND ') . ' td.name_cache RLIKE ' . db_qstr(get_request_var('rfilter'));
408408
}
409409

410410
if (get_request_var('data_template_id') != '-1') {
@@ -936,9 +936,8 @@ function hosts() {
936936
$sql_where = '';
937937

938938
if (get_request_var('rfilter') != '') {
939-
$sql_where .= " (h.deleted = ''
940-
AND (h.hostname RLIKE '" . get_request_var('rfilter') . "'
941-
OR h.description RLIKE '" . get_request_var('rfilter') . "')";
939+
$sql_where .= " (h.deleted = '' AND (h.hostname RLIKE " . db_qstr(get_request_var('rfilter')) .
940+
' OR h.description RLIKE ' . db_qstr(get_request_var('rfilter')) . ')';
942941
}
943942

944943
if (get_request_var('host_status') == '-1') {
@@ -1395,7 +1394,7 @@ function thold_export_log() {
13951394
}
13961395

13971396
if (get_request_var('rfilter') != '') {
1398-
$sql_where .= ($sql_where == '' ? '' : ' AND') . " tl.description RLIKE '" . get_request_var('rfilter') . "'";
1397+
$sql_where .= ($sql_where == '' ? '' : ' AND') . ' tl.description RLIKE ' . db_qstr(get_request_var('rfilter'));
13991398
}
14001399

14011400
$sql_order = '';
@@ -1490,7 +1489,7 @@ function thold_show_log() {
14901489
}
14911490

14921491
if (get_request_var('rfilter') != '') {
1493-
$sql_where .= ($sql_where == '' ? '' : ' AND') . " tl.description RLIKE '" . get_request_var('rfilter') . "'";
1492+
$sql_where .= ($sql_where == '' ? '' : ' AND') . ' tl.description RLIKE ' . db_qstr(get_request_var('rfilter'));
14941493
}
14951494

14961495
$sql_order = get_order_string();

thold_webapi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ function applyTholdFilter() {
861861
function thold_new_graphs_save($host_id) {
862862
$return_array = false;
863863

864-
$selected_graphs_array = cacti_unserialize(stripslashes(get_nfilter_request_var('selected_graphs_array')));
864+
$selected_graphs_array = sanitize_unserialize_selected_items(get_nfilter_request_var('selected_graphs_array'));
865865

866866
$values = [];
867867

0 commit comments

Comments
 (0)