Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 12 additions & 17 deletions app/V1Module/security/Policies/AssignmentPermissionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
namespace App\Security\Policies;

use App\Model\Entity\Assignment;
use App\Model\Entity\GroupMembership;
use App\Security\Identity;
use App\Helpers\SubmissionConfigHelper;
use DateTime;

class AssignmentPermissionPolicy implements IPermissionPolicy
class AssignmentPermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
/** @var SubmissionConfigHelper */
private $submissionHelper;
Expand Down Expand Up @@ -70,26 +71,20 @@ public function isAssignee(Identity $identity, Assignment $assignment)

public function isSupervisorOrAdmin(Identity $identity, Assignment $assignment)
{
$group = $assignment->getGroup();
$user = $identity->getUserData();

if ($user === null) {
return false;
}

return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership(
$identity->getUserData(),
$assignment->getGroup(),
GroupMembership::TYPE_SUPERVISOR
);
}

public function isObserverOrBetter(Identity $identity, Assignment $assignment)
{
$group = $assignment->getGroup();
$user = $identity->getUserData();

if ($user === null) {
return false;
}

return $group && ($group->isObserverOf($user) || $group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership(
$identity->getUserData(),
$assignment->getGroup(),
GroupMembership::TYPE_OBSERVER
);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace App\Security\Policies;

use App\Model\Entity\AssignmentSolution;
use App\Model\Entity\AssignmentSolutionSubmission;
use App\Model\Entity\GroupMembership;
use App\Security\Identity;

class AssignmentSolutionPermissionPolicy implements IPermissionPolicy
class AssignmentSolutionPermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
public function getAssociatedClass()
{
Expand All @@ -20,14 +20,11 @@ public function isAdmin(Identity $identity, AssignmentSolution $solution)
return false;
}

$group = $assignment->getGroup();
$user = $identity->getUserData();

if ($user === null) {
return false;
}

return $group && $group->isAdminOf($user);
return $this->checkMinimalMembership(
$identity->getUserData(),
$assignment->getGroup(),
GroupMembership::TYPE_ADMIN
);
}

public function isSupervisorOrAdmin(Identity $identity, AssignmentSolution $solution)
Expand All @@ -37,14 +34,11 @@ public function isSupervisorOrAdmin(Identity $identity, AssignmentSolution $solu
return false;
}

$group = $assignment->getGroup();
$user = $identity->getUserData();

if ($user === null) {
return false;
}

return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership(
$identity->getUserData(),
$assignment->getGroup(),
GroupMembership::TYPE_SUPERVISOR
);
}

public function isObserverOrBetter(Identity $identity, AssignmentSolution $solution)
Expand All @@ -54,14 +48,11 @@ public function isObserverOrBetter(Identity $identity, AssignmentSolution $solut
return false;
}

$group = $assignment->getGroup();
$user = $identity->getUserData();

if ($user === null) {
return false;
}

return $group && ($group->isObserverOf($user) || $group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership(
$identity->getUserData(),
$assignment->getGroup(),
GroupMembership::TYPE_OBSERVER
);
}

public function isAuthor(Identity $identity, AssignmentSolution $solution)
Expand Down
59 changes: 49 additions & 10 deletions app/V1Module/security/Policies/BasePermissionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,64 @@

namespace App\Security\Policies;

use App\Model\Entity\Instance;
use App\Model\Entity\GroupMembership;
use App\Model\Entity\Group;
use App\Model\Entity\User;
use App\Security\Identity;
use App\Security\Roles;
use InvalidArgumentException;

/**
* Base policy is not bound to particular entity.
* It gathers generic checks performed solely on the entity of the logged-in user.
* Base policy class that implements caching mechanisms reusable by other policies.
*/
class BasePermissionPolicy implements IPermissionPolicy
class BasePermissionPolicy
{
public function getAssociatedClass()
private const MEMBERSHIPS = [
GroupMembership::TYPE_STUDENT => 1,
GroupMembership::TYPE_OBSERVER => 2,
GroupMembership::TYPE_SUPERVISOR => 3,
GroupMembership::TYPE_ADMIN => 4,
];

private static array $membershipCache = [];

protected function getMembershipLevel(User $user, Group $group): int
{
return '';
$gid = $group->getId();
if (!array_key_exists($gid, self::$membershipCache)) {
self::$membershipCache[$gid] = 0; // Not a member

if ($user->getRole() === Roles::STUDENT_ROLE) {
if ($group->isStudentOf($user)) {
self::$membershipCache[$gid] = self::MEMBERSHIPS[GroupMembership::TYPE_STUDENT];
}
} else {
if ($group->isAdminOf($user)) {
self::$membershipCache[$gid] = self::MEMBERSHIPS[GroupMembership::TYPE_ADMIN];
} elseif ($group->isSupervisorOf($user)) {
self::$membershipCache[$gid] = self::MEMBERSHIPS[GroupMembership::TYPE_SUPERVISOR];
} elseif ($group->isObserverOf($user)) {
self::$membershipCache[$gid] = self::MEMBERSHIPS[GroupMembership::TYPE_OBSERVER];
} elseif ($user->getRole() === Roles::STUDENT_ROLE && $group->isStudentOf($user)) {
self::$membershipCache[$gid] = self::MEMBERSHIPS[GroupMembership::TYPE_STUDENT];
}
}
}

return self::$membershipCache[$gid];
}

public function userIsNotGroupLocked(Identity $identity): bool
protected function checkMinimalMembership(?User $user, ?Group $group, string $membership): bool
{
$user = $identity->getUserData();
return $user && !$user->isGroupLocked();
if (!$user || !$group) {
return false;
}

$minLevel = self::MEMBERSHIPS[$membership] ?? null;
if ($minLevel === null) {
throw new InvalidArgumentException("Unknown membership type: $membership");
}

$level = $this->getMembershipLevel($user, $group);
return $level >= $minLevel;
}
}
13 changes: 8 additions & 5 deletions app/V1Module/security/Policies/CommentPermissionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
use App\Model\Entity\Assignment;
use App\Model\Entity\AssignmentSolution;
use App\Model\Entity\Comment;
use App\Model\Entity\GroupMembership;
use App\Model\Repository\Assignments;
use App\Model\Repository\AssignmentSolutions;
use App\Security\Identity;

class CommentPermissionPolicy implements IPermissionPolicy
class CommentPermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
private $assignments;
private $assignmentSolutions;
Expand Down Expand Up @@ -62,8 +63,11 @@ public function isSupervisorInGroupOfCommentedSolution(Identity $identity, Comme
return false;
}

$group = $solution->getAssignment()->getGroup();
return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership(
$user,
$solution->getAssignment()->getGroup(),
GroupMembership::TYPE_SUPERVISOR
);
}


Expand All @@ -80,7 +84,6 @@ public function isSupervisorInGroupOfCommentedAssignment(Identity $identity, Com
return false;
}

$group = $assignment->getGroup();
return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
return $this->checkMinimalMembership($user, $assignment->getGroup(), GroupMembership::TYPE_SUPERVISOR);
}
}
23 changes: 3 additions & 20 deletions app/V1Module/security/Policies/ExercisePermissionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

use App\Model\Entity\Exercise;
use App\Model\Entity\Group;
use App\Model\Entity\GroupMembership;
use App\Helpers\SubmissionConfigHelper;
use App\Security\Identity;

class ExercisePermissionPolicy implements IPermissionPolicy
class ExercisePermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
/** @var SubmissionConfigHelper */
private $submissionHelper;
Expand Down Expand Up @@ -121,15 +122,6 @@ public function isSubGroupNonStudentMember(Identity $identity, Exercise $exercis
return false;
}

/**
* @var Array[]
* A cache holding the result of isAdminOf invocation for given groups.
* The cache is structures as [user-id][group-id] => boolean
* Under normal circumstances, the cache should hold only one (logged in) user,
* but it was written as generic cache just in case.
*/
private $supergroupAdminCache = [];

public function isSuperGroupAdmin(Identity $identity, Exercise $exercise)
{
$user = $identity->getUserData();
Expand All @@ -141,21 +133,12 @@ public function isSuperGroupAdmin(Identity $identity, Exercise $exercise)
return false;
}

if (empty($this->supergroupAdminCache[$user->getId()])) {
$this->supergroupAdminCache[$user->getId()] = [];
}
$supergroupCache = &$this->supergroupAdminCache[$user->getId()];

/** @var Group $group */
foreach ($exercise->getGroups() as $group) {
if (!array_key_exists($group->getId(), $supergroupCache)) {
$supergroupCache[$group->getId()] = $group->isAdminOf($user);
}
if ($supergroupCache[$group->getId()]) {
if ($this->checkMinimalMembership($user, $group, GroupMembership::TYPE_ADMIN)) {
return true;
}
}

return false;
}

Expand Down
23 changes: 23 additions & 0 deletions app/V1Module/security/Policies/GenericPermissionPolicy.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace App\Security\Policies;

use App\Security\Identity;

/**
* A policy that is not bound to a particular entity.
* It gathers generic checks performed solely on the entity of the logged-in user.
*/
class GenericPermissionPolicy implements IPermissionPolicy
{
public function getAssociatedClass()
{
return '';
}

public function userIsNotGroupLocked(Identity $identity): bool
{
$user = $identity->getUserData();
return $user && !$user->isGroupLocked();
}
}
31 changes: 17 additions & 14 deletions app/V1Module/security/Policies/GroupPermissionPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
namespace App\Security\Policies;

use App\Model\Entity\Group;
use App\Model\Entity\GroupMembership;
use App\Model\Entity\Instance;
use App\Security\Identity;
use DateTIme;

class GroupPermissionPolicy implements IPermissionPolicy
class GroupPermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
public function getAssociatedClass()
{
Expand All @@ -21,17 +22,20 @@ public function isMember(Identity $identity, Group $group): bool
return false;
}

return $group->isMemberOf($user) || $group->isAdminOf($user);
return $group->isMemberOf($user) || $this->checkMinimalMembership(
$identity->getUserData(),
$group,
GroupMembership::TYPE_ADMIN
);
}

public function isSupervisorOrAdmin(Identity $identity, Group $group): bool
{
$user = $identity->getUserData();
if (!$user) {
return false;
}

return $group->isSupervisorOf($user) || $group->isAdminOf($user);
return $this->checkMinimalMembership(
$identity->getUserData(),
$group,
GroupMembership::TYPE_SUPERVISOR
);
}

public function isObserver(Identity $identity, Group $group): bool
Expand All @@ -46,12 +50,11 @@ public function isObserver(Identity $identity, Group $group): bool

public function isAdmin(Identity $identity, Group $group): bool
{
$user = $identity->getUserData();
if (!$user) {
return false;
}

return $group->isAdminOf($user);
return $this->checkMinimalMembership(
$identity->getUserData(),
$group,
GroupMembership::TYPE_ADMIN
);
}

public function isPublic(Identity $identity, Group $group): bool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
namespace App\Security\Policies;

use App\Model\Entity\Group;
use App\Model\Entity\GroupMembership;
use App\Model\Entity\Notification;
use App\Security\Identity;
use App\Security\Roles;

class NotificationPermissionPolicy implements IPermissionPolicy
class NotificationPermissionPolicy extends BasePermissionPolicy implements IPermissionPolicy
{
/** @var Roles */
private $roles;
Expand Down Expand Up @@ -57,7 +58,7 @@ public function isAncestorGroupAdmin(Identity $identity, Notification $notificat

/** @var Group $group */
foreach ($notification->getGroups() as $group) {
if ($group->isAdminOf($user)) {
if ($this->checkMinimalMembership($user, $group, GroupMembership::TYPE_ADMIN)) {
return true;
}
}
Expand Down
Loading
Loading