Skip to content

catch edge cases #234

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

catch edge cases #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67977d3
catch edge cases
simonLeary42 Jun 3, 2025
30e8e5b
wording
simonLeary42 Jun 3, 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
39 changes: 22 additions & 17 deletions resources/lib/UnityGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,16 @@ public function exists()

public function requestGroup($send_mail_to_admins, $send_mail = true)
{
// check for edge cases...
if ($this->SQL->requestExists($this->getOwner()->getUID())) {
throw new Exception("group '$this' creation request already exists!");
}

if ($this->exists()) {
return;
throw new Exception("requested to create group '$this' that already exists!");
}

// check if account deletion request already exists
if ($this->SQL->accDeletionRequestExists($this->getOwner()->getUID())) {
return;
throw new Exception("group owner '$this' requested account deletion");
}

$this->SQL->addRequest($this->getOwner()->getUID());
Expand Down Expand Up @@ -140,13 +142,16 @@ public function approveGroup($operator = null, $send_mail = true)
{
if (!$this->SQL->requestExists($this->getOwner()->getUID())) {
throw new Exception(
"attempt to approve nonexistent request for group='{$this->getPIUID()}' uid='$new_user'"
"attempt to approve nonexistent request for group='$this' uid='$new_user'"
);
}

// check for edge cases...
if ($this->exists()) {
return;
throw new Exception("group '$this' exists");
}

if ($this->SQL->accDeletionRequestExists($this->getOwner()->getUID())) {
throw new Exception("group owner '{$this->getOwner()->getUID()}' requested account deletion");
}

// check if owner exists
Expand Down Expand Up @@ -188,7 +193,7 @@ public function denyGroup($operator = null, $send_mail = true)
$this->SQL->removeRequest($this->getOwner()->getUID());

if ($this->exists()) {
return;
throw new Exception("group '$this' creation request cannot be denied, it already exists!");
}

$operator = is_null($operator) ? $this->getOwner()->getUID() : $operator->getUID();
Expand All @@ -212,6 +217,7 @@ public function denyGroup($operator = null, $send_mail = true)
public function cancelGroupRequest($send_mail = true)
{
if (!$this->SQL->requestExists($this->getOwner()->getUID())) {
UnitySite::errorLog("warning", "attempt to cancel nonexistent group creation request ($this)");
return;
}

Expand All @@ -229,6 +235,7 @@ public function cancelGroupRequest($send_mail = true)
public function cancelGroupJoinRequest($user, $send_mail = true)
{
if (!$this->requestExists($user)) {
UnitySite::errorLog("warning", "attempt to cancel nonexistent group join request ($this)");
return;
}

Expand Down Expand Up @@ -290,7 +297,7 @@ public function approveUser($new_user, $send_mail = true)
{
if (!$this->requestExists($new_user)) {
throw new Exception(
"attempt to approve nonexistent request for group='{$this->getPIUID()}' uid='$new_user'"
"attempt to approve nonexistent request for group='$this' uid='$new_user'"
);
}

Expand Down Expand Up @@ -331,7 +338,7 @@ public function approveUser($new_user, $send_mail = true)
public function denyUser($new_user, $send_mail = true)
{
if (!$this->requestExists($new_user)) {
return;
throw new Exception("request from user '$new_user' does not exist");
}

// remove request, this will fail silently if the request doesn't exist
Expand Down Expand Up @@ -363,11 +370,12 @@ public function denyUser($new_user, $send_mail = true)
public function removeUser($new_user, $send_mail = true)
{
if (!$this->userExists($new_user)) {
UnitySite::errorLog("warning", "attempted to delete absent user '$new_user' from group '$this'");
return;
}

if ($new_user->getUID() == $this->getOwner()->getUID()) {
throw new Exception("Cannot delete group owner from group. Disband group instead");
throw new Exception("Cannot delete group owner '{$this->getOwner()}' from group. Disband group instead");
}

// remove request, this will fail silently if the request doesn't exist
Expand Down Expand Up @@ -399,18 +407,15 @@ public function removeUser($new_user, $send_mail = true)
public function newUserRequest($new_user, $send_mail = true)
{
if ($this->userExists($new_user)) {
UnitySite::errorLog("warning", "user '$new_user' already in group");
return;
throw new Exception("user '$new_user' already in group");
}

if ($this->requestExists($new_user)) {
UnitySite::errorLog("warning", "user '$new_user' already requested group membership");
return;
throw new Exception("user '$new_user' already requested group membership");
}

if ($this->SQL->accDeletionRequestExists($new_user->getUID())) {
throw new Exception("user '$new_user' requested account deletion");
return;
}

$this->addRequest($new_user->getUID());
Expand Down Expand Up @@ -607,7 +612,7 @@ public static function getUIDfromPIUID($pi_uid)
if (substr($pi_uid, 0, strlen(self::PI_PREFIX)) == self::PI_PREFIX) {
return substr($pi_uid, strlen(self::PI_PREFIX));
} else {
throw new Exception("PI netid doesn't have the correct prefix.");
throw new Exception("PI netid '$pi_uid' doesn't have the correct prefix.");
}
}
}
14 changes: 5 additions & 9 deletions test/functional/PiBecomeRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,10 @@ public function testRequestBecomePiUserRequestedAccountDeletion()
$this->assertFalse($USER->isPI());
$this->assertNumberPiBecomeRequests(0);
$this->assertTrue($SQL->accDeletionRequestExists($USER->getUID()));
try {
http_post(
__DIR__ . "/../../webroot/panel/account.php",
["form_type" => "pi_request"]
);
$this->assertNumberPiBecomeRequests(0);
} finally {
$SQL->removeRequest($USER->getUID());
}
$this->expectException(Exception::class);
http_post(
__DIR__ . "/../../webroot/panel/account.php",
["form_type" => "pi_request"]
);
}
}