Skip to content

fix(test): align OrderBySessionHardeningTest with shipped get_order_string #7185

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

Merged
TheWitness merged 2 commits into from
Jun 3, 2026
Merged

fix(test): align OrderBySessionHardeningTest with shipped get_order_string #7185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba0325
fix(test): align OrderBySessionHardeningTest with shipped get_order_s…
somethingwithproof May 30, 2026
29de1ad
fix(test): slice get_order_string body to next function boundary
somethingwithproof May 30, 2026
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
10 changes: 6 additions & 4 deletions tests/Unit/OrderBySessionHardeningTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
expect($htmlUtilitySource)->toContain('cacti_build_sort_fragment($column, $direction)');
});

test('get_order_string rebuilds ORDER BY from validated session sort_data', function () use ($htmlUtilitySource) {
test('get_order_string normalizes, validates and builds the sort fragment', function () use ($htmlUtilitySource) {
$start = strpos($htmlUtilitySource, 'function get_order_string()');
expect($start)->not->toBeFalse();

$body = substr($htmlUtilitySource, $start, 1800);
expect($body)->toContain("if (isset(\$_SESSION['sort_data'][\$page]) && is_array(\$_SESSION['sort_data'][\$page]))");
expect($body)->toContain("\$_SESSION['sort_string'][\$page] = 'ORDER BY ' . implode(', ', \$order_parts);");
$next = strpos($htmlUtilitySource, "\nfunction ", $start + 1);
$body = $next === false ? substr($htmlUtilitySource, $start) : substr($htmlUtilitySource, $start, $next - $start);
expect($body)->toContain("cacti_normalize_sort_column(get_nfilter_request_var('sort_column'))");
expect($body)->toContain('cacti_build_sort_fragment($sort_column, $sort_dir)');
expect($body)->toContain('validate_sort_column($request_column, $page)');
Comment thread
somethingwithproof marked this conversation as resolved.
});