Skip to content

Fix user init in pi-mgmt.php #274

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
Jul 13, 2025
Merged

Fix user init in pi-mgmt.php #274

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
4e0d76c
extend tests
simonLeary42 Jul 12, 2025
42030ca
remove extra call to init
simonLeary42 Jul 12, 2025
8515522
change test name
simonLeary42 Jul 12, 2025
66b0bf4
LDAP is singleton
simonLeary42 Jul 12, 2025
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
31 changes: 18 additions & 13 deletions resources/init.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,24 @@
);

// Creates LDAP service
$LDAP = new UnityLDAP(
$CONFIG["ldap"]["uri"],
$CONFIG["ldap"]["user"],
$CONFIG["ldap"]["pass"],
__DIR__ . "/../deployment/custom_user_mappings",
$CONFIG["ldap"]["user_ou"],
$CONFIG["ldap"]["group_ou"],
$CONFIG["ldap"]["pigroup_ou"],
$CONFIG["ldap"]["orggroup_ou"],
$CONFIG["ldap"]["admin_group"],
$CONFIG["ldap"]["user_group"],
$CONFIG["ldap"]["def_user_shell"]
);
if (isset($GLOBALS["ldapconn"])) {
$LDAP = $GLOBALS["ldapconn"];
} else {
$LDAP = new UnityLDAP(
$CONFIG["ldap"]["uri"],
$CONFIG["ldap"]["user"],
$CONFIG["ldap"]["pass"],
__DIR__ . "/../deployment/custom_user_mappings",
$CONFIG["ldap"]["user_ou"],
$CONFIG["ldap"]["group_ou"],
$CONFIG["ldap"]["pigroup_ou"],
$CONFIG["ldap"]["orggroup_ou"],
$CONFIG["ldap"]["admin_group"],
$CONFIG["ldap"]["user_group"],
$CONFIG["ldap"]["def_user_shell"]
);
$GLOBALS["ldapconn"] = $LDAP;
}

// Creates SQL service
$SQL = new UnitySQL(
Expand Down
125 changes: 120 additions & 5 deletions test/functional/NewUserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,43 @@ private function cancelAllRequests()
);
}

private function approveUserByAdmin($gid, $uid)
{
http_post(
__DIR__ . "/../../webroot/admin/pi-mgmt.php",
[
"form_type" => "reqChild",
"action" => "Approve",
"pi" => $gid,
"uid" => $uid,
]
);
}

private function approveUserByPI($uid)
{
http_post(
__DIR__ . "/../../webroot/panel/pi.php",
[
"form_type" => "userReq",
"action" => "Approve",
"uid" => $uid,
]
);
}

private function approveGroup($uid)
{
http_post(
__DIR__ . "/../../webroot/admin/pi-mgmt.php",
[
"form_type" => "req",
"action" => "Approve",
"uid" => $uid,
]
);
}

// delete requests made by that user
// delete user entry
// remove user from org group
Expand Down Expand Up @@ -109,13 +146,80 @@ private function ensurePIGroupDoesNotExist()
}
}

public function testCreateUserByJoinGoup()
public function testCreateUserByJoinGoupByPI()
{
global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
$pi_user_args = getUserIsPIHasNoMembersNoMemberRequests();
switchUser(...$pi_user_args);
$pi_group = $USER->getPIGroup();
$gid = $pi_group->gid;
$user_to_create_args = getNonExistentUser();
switchUser(...$user_to_create_args);
$this->assertTrue(!$USER->exists());
$newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
$this->assertTrue(!$newOrg->exists());
$this->assertTrue($pi_group->exists());
$this->assertTrue(!$pi_group->userExists($USER));
$this->assertRequestedMembership(false, $gid);
try {
$this->requestGroupMembership($pi_group->gid);
$this->assertRequestedMembership(true, $gid);

// $second_request_failed = false;
// try {
$this->requestGroupMembership($pi_group->gid);
// } catch(Exception) {
// $second_request_failed = true;
// }
// $this->assertTrue($second_request_failed);
$this->assertRequestedMembership(true, $gid);

$this->cancelAllRequests();
$this->assertRequestedMembership(false, $gid);

$this->requestGroupMembership($pi_group->gid);
$this->assertTrue($pi_group->requestExists($USER));
$this->assertRequestedMembership(true, $gid);

$REDIS->flushAll(); // regression test: flush used to break requests

$approve_uid = $SSO["user"];
switchUser(...$pi_user_args);
$this->approveUserByPI($approve_uid);
switchUser(...$user_to_create_args);

$this->assertTrue(!$pi_group->requestExists($USER));
$this->assertRequestedMembership(false, $gid);
$this->assertTrue($pi_group->userExists($USER));
$this->assertTrue($USER->exists());
$this->assertTrue($newOrg->exists());

// $third_request_failed = false;
// try {
$this->requestGroupMembership($pi_group->gid);
// } catch(Exception) {
// $third_request_failed = true;
// }
// $this->assertTrue($third_request_failed);
$this->assertRequestedMembership(false, $gid);
$this->assertTrue(!$pi_group->requestExists($USER));
} finally {
switchUser(...$user_to_create_args);
$this->ensureOrgGroupDoesNotExist();
$this->ensureUserNotInPIGroup($pi_group);
$this->ensureUserDoesNotExist();
}
}


public function testCreateUserByJoinGoupByAdmin()
{
global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
switchUser(...getUserIsPIHasNoMembersNoMemberRequests());
$pi_group = $USER->getPIGroup();
$gid = $pi_group->gid;
switchUser(...getNonExistentUser());
$user_to_create_args = getNonExistentUser();
switchUser(...$user_to_create_args);
$this->assertTrue(!$USER->exists());
$newOrg = new UnityOrg($SSO["org"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
$this->assertTrue(!$newOrg->exists());
Expand Down Expand Up @@ -144,7 +248,11 @@ public function testCreateUserByJoinGoup()

$REDIS->flushAll(); // regression test: flush used to break requests

$pi_group->approveUser($USER);
$approve_uid = $SSO["user"];
switchUser(...getAdminUser());
$this->approveUserByAdmin($gid, $approve_uid);
switchUser(...$user_to_create_args);

$this->assertTrue(!$pi_group->requestExists($USER));
$this->assertRequestedMembership(false, $gid);
$this->assertTrue($pi_group->userExists($USER));
Expand All @@ -161,16 +269,19 @@ public function testCreateUserByJoinGoup()
$this->assertRequestedMembership(false, $gid);
$this->assertTrue(!$pi_group->requestExists($USER));
} finally {
switchUser(...$user_to_create_args);
$this->ensureOrgGroupDoesNotExist();
$this->ensureUserNotInPIGroup($pi_group);
$this->ensureUserDoesNotExist();
}
}


public function testCreateUserByCreateGroup()
{
global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
switchuser(...getNonExistentUser());
$user_to_create_args = getNonExistentUser();
switchuser(...$user_to_create_args);
$pi_group = $USER->getPIGroup();
$this->assertTrue(!$USER->exists());
$this->assertTrue(!$pi_group->exists());
Expand All @@ -197,7 +308,11 @@ public function testCreateUserByCreateGroup()

$REDIS->flushAll(); // regression test: flush used to break requests

$pi_group->approveGroup();
$approve_uid = $SSO["user"];
switchUser(...getAdminUser());
$this->approveGroup($approve_uid);
switchUser(...$user_to_create_args);

$this->assertRequestedPIGroup(false);
$this->assertTrue($pi_group->exists());
$this->assertTrue($USER->exists());
Expand Down
5 changes: 0 additions & 5 deletions webroot/admin/pi-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
case "reqChild":
$parent_group = new UnityGroup($_POST["pi"], $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
if ($_POST["action"] == "Approve") {
// initialize user if not initialized
if (!$form_user->exists()) {
$form_user->init();
}

// approve request button clicked
$parent_group->approveUser($form_user); // Add to group (ldap and slurm)
} elseif ($_POST["action"] == "Deny") {
Expand Down