Release 2.58 (#5952)
* bump version * fix formatting locale reset after embedded controller sub-requests (#5944) * fix GHSA-c6w6-57jj-62vh * fix GHSA-m492-gv72-xvxj * fix GHSA-jr9p-4h4j-6c58 * make sure to only use JS logic to call API endpoints * fixes GHSA-r8vr-m544-qh4h * make sure to only use JS logic to call API endpoints * fix GHSA-rw46-qg69-vg6h * fix GHSA-pj8j-p4g4-4vw8 - prevent kimai from rendering images via markdown * fix GHSA-pj8j-p4g4-4vw8 - use a safe network client to prevent SSRF via images * fix GHSA-xv4r-4885-gwpg * fix GHSA-pgcc-vfmc-7cw5 - move GET routes to API with POST method to prevent CSRF * fix tooltip survives page reload * updated wizard images * split wizard and password reset subscriber into two classes * relax upper php limit * added zizmor workflow scans and apply findings * user permissions <name>_other_profile now respect teams * move all linting steps to new job * updated docker image version names * use .env.local for storing APP_SECRET * improve build order and use given tag as ref for checkout, not default main branch * improved APP_SECRET handling, see entrypoint.sh * use local code for building the image for more flexibility, added dockerignore
This commit is contained in:
@@ -859,6 +859,90 @@ class RolePermissionManagerTest extends TestCase
|
||||
self::assertFalse($sut->checkUserAccess($subject, $requester));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessAllowsDisabledSubjectWhenOnlyEnabledIsFalse(): void
|
||||
{
|
||||
$sut = $this->createSut();
|
||||
|
||||
$subject = self::userWithId(1);
|
||||
$subject->setEnabled(false);
|
||||
|
||||
$requester = self::userWithId(2);
|
||||
$team = new Team('Support');
|
||||
$team->addUser($subject);
|
||||
$team->addTeamlead($requester);
|
||||
|
||||
// with $onlyEnabled = true (default) the disabled flag denies access
|
||||
self::assertFalse($sut->checkUserAccess($subject, $requester));
|
||||
// with $onlyEnabled = false the disabled flag is ignored and the teamlead path grants access
|
||||
self::assertTrue($sut->checkUserAccess($subject, $requester, false));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessOnlyEnabledFalseStillRequiresAccessPath(): void
|
||||
{
|
||||
// disabling the "enabled" check must not bypass the rest of the access logic:
|
||||
// a requester without team relation must still be denied.
|
||||
$sut = $this->createSut();
|
||||
|
||||
$subject = self::userWithId(1);
|
||||
$subject->setEnabled(false);
|
||||
(new Team('Subject team'))->addUser($subject);
|
||||
|
||||
$requester = self::userWithId(2);
|
||||
$requester->setRoles([User::ROLE_TEAMLEAD]);
|
||||
|
||||
self::assertFalse($sut->checkUserAccess($subject, $requester, false));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessOnlyEnabledFalseStillBlocksSystemAccountSubject(): void
|
||||
{
|
||||
// the system-account guard sits below the "enabled" check, so it must still
|
||||
// apply when $onlyEnabled = false.
|
||||
$sut = $this->createSut();
|
||||
|
||||
$subject = self::userWithId(1);
|
||||
$subject->setEnabled(false);
|
||||
$subject->setSystemAccount(true);
|
||||
|
||||
$requester = self::userWithId(2);
|
||||
$team = new Team('Support');
|
||||
$team->addUser($subject);
|
||||
$team->addTeamlead($requester);
|
||||
|
||||
self::assertFalse($sut->checkUserAccess($subject, $requester, false));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessOnlyEnabledFalseGrantsAdminFallbackForDisabledTeamlessUser(): void
|
||||
{
|
||||
$sut = $this->createSut();
|
||||
|
||||
$subject = self::userWithId(1);
|
||||
$subject->setEnabled(false);
|
||||
|
||||
$requester = self::userWithId(2);
|
||||
$requester->setRoles([User::ROLE_ADMIN]);
|
||||
|
||||
self::assertTrue($subject->isRegularUserOnly());
|
||||
self::assertSame([], $subject->getTeams());
|
||||
self::assertFalse($sut->checkUserAccess($subject, $requester));
|
||||
self::assertTrue($sut->checkUserAccess($subject, $requester, false));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessOnlyEnabledFalseStillGrantsSuperAdmin(): void
|
||||
{
|
||||
// super-admin / canSeeAllData is decided before the "enabled" check,
|
||||
// so the result must not change with the flag.
|
||||
$sut = $this->createSut();
|
||||
|
||||
$subject = self::userWithId(1);
|
||||
$subject->setEnabled(false);
|
||||
|
||||
$requester = self::userWithId(2);
|
||||
$requester->setSuperAdmin(true);
|
||||
|
||||
self::assertTrue($sut->checkUserAccess($subject, $requester));
|
||||
self::assertTrue($sut->checkUserAccess($subject, $requester, false));
|
||||
}
|
||||
|
||||
public function testCheckUserAccessDeniesSystemAccountForNonSystemRequester(): void
|
||||
{
|
||||
$sut = $this->createSut();
|
||||
|
||||
Reference in New Issue
Block a user