Skip to content

hardening: prepared statements, PHP 7.4 idioms, and security fixes #51

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

hardening: prepared statements, PHP 7.4 idioms, and security fixes #51

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
14 changes: 9 additions & 5 deletions audit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,15 @@ function audit_export_rows() {
}

if (get_request_var('event_page') != '-1') {
/* event_page is a sanitized page basename, not a numeric ID. */
$sql_clauses[] = 'page = ?';
$sql_params[] = get_request_var('event_page');
}

if (!isempty_request_var('user_id') && get_request_var('user_id') > '-1') {
$user_id = get_filter_request_var('user_id');
if ($user_id > -1) {
$sql_clauses[] = 'user_id = ?';
$sql_params[] = get_request_var('user_id');
$sql_params[] = $user_id;
}

$sql_where = cacti_sizeof($sql_clauses) ? 'WHERE ' . implode(' AND ', $sql_clauses) : '';
Expand Down Expand Up @@ -552,13 +554,15 @@ function audit_log() {
}

if (get_request_var('event_page') != '-1') {
/* event_page is a sanitized page basename, not a numeric ID. */
$sql_clauses[] = 'page = ?';
$sql_params[] = get_request_var('event_page');
}

if (!isempty_request_var('user_id') && get_request_var('user_id') > '-1') {
$user_id = get_filter_request_var('user_id');
if ($user_id > -1) {
$sql_clauses[] = 'user_id = ?';
$sql_params[] = get_request_var('user_id');
$sql_params[] = $user_id;
}

$sql_where = cacti_sizeof($sql_clauses) ? 'WHERE ' . implode(' AND ', $sql_clauses) : '';
Expand Down Expand Up @@ -684,7 +688,7 @@ function audit_log() {
<?php
}

function audit_render_syslog_health() {
function audit_render_syslog_health() {
$config = audit_syslog_config();
$health = audit_syslog_health();
$enabled = audit_syslog_enabled();
Expand Down
53 changes: 53 additions & 0 deletions tests/e2e/test_security_wiring.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
| |
| End-to-end wiring checks for audit security fixes. |
| |
| Run: php tests/e2e/test_security_wiring.php |
+-------------------------------------------------------------------------+
*/

$pass = 0;
$fail = 0;

function assert_true($label, $value) {
global $pass, $fail;

if ($value) {
echo "PASS $label\n";
$pass++;
} else {
echo "FAIL $label\n";
$fail++;
}
}

$source = file_get_contents(__DIR__ . '/../../audit.php');

assert_true(
'user_id filter uses integer normalization before prepared SQL binding',
substr_count($source, "get_filter_request_var('user_id')") === 2
);

assert_true(
'event_page filter documents string binding',
substr_count($source, 'event_page is a sanitized page basename') === 2
);

assert_true(
'detail popup escapes field names and values',
strpos($source, "html_escape(\$field)") !== false &&
strpos($source, "audit_render_value(\$content)") !== false
);

assert_true(
'record data json is escaped before rendering',
strpos($source, "html_escape(json_encode(\$record, JSON_PRETTY_PRINT | JSON_INVALID_UTF8_SUBSTITUTE))") !== false
);

echo "\n";
echo "Results: $pass passed, $fail failed\n";

exit($fail > 0 ? 1 : 0);