Skip to content

add more page loading tests #490

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
simonLeary42 merged 4 commits into from
Jan 5, 2026
Merged

add more page loading tests #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d18adc
add tests for non admin attempt to access admin page
simonLeary42 Jan 5, 2026
3b08350
fix bug
simonLeary42 Jan 5, 2026
d5b0f7c
update phpstan.neon
simonLeary42 Jan 5, 2026
3cba7fa
rearrange data, add redirect tests
simonLeary42 Jan 5, 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
1 change: 0 additions & 1 deletion deployment/overrides/phpunit/config/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ custom_user_mappings_dir = "test/custom_user_mappings"
[site]
allow_die = false
enable_verbose_error_log = false
enable_redirect_message = false
enable_exception_handler = false
enable_error_handler = false
1 change: 0 additions & 1 deletion phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ parameters:
- '#Call to method PHPUnit\\Framework\\Assert::assertTrue\(\) with true will always evaluate to true.#'
paths:
- test/functional/InvalidEPPNTest.php
- test/functional/PageLoadTest.php
# I cannot seem to make this error go away no matter how many functions I add @phpstan-impure to
- messages:
- '#Negated boolean expression is always false\.#'
Expand Down
28 changes: 13 additions & 15 deletions resources/lib/UnityHTTPD.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,15 @@ enum UnityHTTPDMessageLevel: string

class UnityHTTPD
{
public static function die(mixed $x = null, bool $show_user = false): never
public static function die(?string $x = null): never
{
if (CONFIG["site"]["allow_die"] == false) {
if (is_null($x)) {
throw new NoDieException();
} else {
throw new NoDieException($x);
}
if ($x !== null) {
echo $x;
}
if (CONFIG["site"]["allow_die"]) {
die();
} else {
if (!is_null($x) and $show_user) {
die($x);
} else {
die();
}
throw new NoDieException();
}
}

Expand Down Expand Up @@ -165,14 +160,15 @@ private static function throwableToArray(\Throwable $t): array

public static function badRequest(
string $log_message,
string $user_message = "",
?\Throwable $error = null,
?array $data = null,
): never {
self::gracefulDie(
"bad request",
$log_message,
"Invalid requested action or submitted data.",
"",
$user_message,
error: $error,
http_response_code: 400,
data: $data,
Expand All @@ -181,14 +177,15 @@ public static function badRequest(

public static function forbidden(
string $log_message,
string $user_message = "",
?\Throwable $error = null,
?array $data = null,
): never {
self::gracefulDie(
"forbidden",
$log_message,
"Permission denied.",
"",
$user_message,
error: $error,
http_response_code: 403,
data: $data,
Expand All @@ -197,14 +194,15 @@ public static function forbidden(

public static function internalServerError(
string $log_message,
string $user_message = "",
?\Throwable $error = null,
?array $data = null,
): never {
self::gracefulDie(
"internal server error",
$log_message,
"An internal server error has occurred.",
"",
$user_message,
error: $error,
http_response_code: 500,
data: $data,
Expand Down
34 changes: 22 additions & 12 deletions test/functional/PageLoadTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,34 @@ class PageLoadTest extends UnityWebPortalTestCase
public static function provider()
{
return [
["Admin", __DIR__ . "/../../webroot/admin/pi-mgmt.php"],
["Admin", __DIR__ . "/../../webroot/admin/user-mgmt.php"],
["Admin", __DIR__ . "/../../webroot/admin/content.php"],
["Admin", __DIR__ . "/../../webroot/admin/notices.php"],
["NonExistent", __DIR__ . "/../../webroot/panel/new_account.php"],
["Blank", __DIR__ . "/../../webroot/panel/account.php"],
["Blank", __DIR__ . "/../../webroot/panel/groups.php"],
["Blank", __DIR__ . "/../../webroot/panel/support.php"],
["EmptyPIGroupOwner", __DIR__ . "/../../webroot/panel/pi.php"],
// normal page load
["Admin", "admin/pi-mgmt.php", "/PI Management/"],
["Admin", "admin/user-mgmt.php", "/User Management/"],
["Admin", "admin/content.php", "/Page Content Management/"],
["Admin", "admin/notices.php", "/Cluster Notice Management/"],
["NonExistent", "panel/new_account.php", "/Register New Account/"],
["Blank", "panel/account.php", "/Account Settings/"],
["Blank", "panel/groups.php", "/My Principal Investigators/"],
["Blank", "panel/support.php", "/Support/"],
["EmptyPIGroupOwner", "panel/pi.php", "/My Users/"],
// normal user should not be able to access admin pages
["Blank", "admin/pi-mgmt.php", "/You are not an admin/"],
["Blank", "admin/user-mgmt.php", "/You are not an admin/"],
["Blank", "admin/content.php", "/You are not an admin/"],
["Blank", "admin/notices.php", "/You are not an admin/"],
// new_account.php should redirect to account.php if account already exists
["Blank", "panel/new_account.php", "/panel\/account\.php/"],
// all pages should redirect to new_account.php if account does not exist
["NonExistent", "panel/account.php", "/panel\/new_account\.php/"],
];
}

#[DataProvider("provider")]
public function testLoadPage($nickname, $path)
public function testLoadPage($nickname, $path, $regex)
{
global $USER, $SSO, $LDAP, $SQL, $MAILER, $WEBHOOK;
$this->switchUser($nickname);
http_get($path);
$this->assertTrue(true); // assert there were no errors
$output = http_get(__DIR__ . "/../../webroot/" . $path);
$this->assertMatchesRegularExpression($regex, $output);
}
}
6 changes: 3 additions & 3 deletions test/phpunit-bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function http_post(
}
}

function http_get(string $phpfile, array $get_data = []): void
function http_get(string $phpfile, array $get_data = []): string
{
global $LDAP,
$SQL,
Expand All @@ -131,9 +131,9 @@ function http_get(string $phpfile, array $get_data = []): void
try {
include $phpfile;
} finally {
ob_get_clean(); // discard output
unset($_GET);
$_PREVIOUS_SERVER = $_SERVER;
$_SERVER = $_PREVIOUS_SERVER;
return ob_get_clean();
}
}

Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/ajax/get_group_members.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

$gid = UnityHTTPD::getQueryParameter("gid");
Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/ajax/get_page_contents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

$pageid = UnityHTTPD::getQueryParameter("pageid");
Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

if ($_SERVER["REQUEST_METHOD"] == "POST") {
Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/notices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

if ($_SERVER["REQUEST_METHOD"] == "POST") {
Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/pi-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

$getUserFromPost = function () {
Expand Down
2 changes: 1 addition & 1 deletion webroot/admin/user-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use UnityWebPortal\lib\UserFlag;

if (!$USER->getFlag(UserFlag::ADMIN)) {
UnityHTTPD::forbidden("not an admin");
UnityHTTPD::forbidden("not an admin", "You are not an admin.");
}

if ($_SERVER["REQUEST_METHOD"] == "POST") {
Expand Down