Skip to content

Fallback to admin auth if user permissions not available #305

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
merged 2 commits into from
Apr 29, 2025
Merged

Fallback to admin auth if user permissions not available #305

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
d84595d
Fallback to admin auth if user permissions throw
cicnavi Apr 29, 2025
960c319
Check if permissions are enabled before enforcing them
cicnavi Apr 29, 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
12 changes: 6 additions & 6 deletions src/Admin/Authorization.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public function requireAdminOrUserWithPermission(string $permission): void

try {
$this->authContextService->requirePermission($permission);
} catch (Exception $exception) {
throw new AuthorizationException(
Translate::noop('User not authorized.'),
$exception->getCode(),
$exception,
);
} catch (\Exception) {
// TODO mivanci v7 log this exception
}

// If we get here, the user does not have the required permission, or permissions are not enabled.
// Fallback to admin authentication.
$this->requireAdmin(true);
}

public function getUserId(): string
Expand Down
10 changes: 3 additions & 7 deletions src/Services/AuthContextService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ public function __construct(
) {
}

public function isSspAdmin(): bool
{
return $this->sspBridge->utils()->auth()->isAdmin();
}

/**
* @throws \SimpleSAML\Error\Exception
* @throws \Exception
Expand All @@ -57,8 +52,6 @@ public function getAuthUserId(): string
*/
public function requirePermission(string $neededPermission): void
{
$auth = $this->authenticate();

$permissions = $this->moduleConfig
->config()
->getOptionalConfigItem(ModuleConfig::OPTION_ADMIN_UI_PERMISSIONS, null);
Expand All @@ -69,6 +62,9 @@ public function requirePermission(string $neededPermission): void
if (!$permissions->hasValue($neededPermission)) {
throw new RuntimeException('No permission defined for ' . $neededPermission);
}

$auth = $this->authenticate();

$attributeName = $permissions->getString('attribute');
/** @var string[] $entitlements */
$entitlements = $auth->getAttributes()[$attributeName] ?? [];
Expand Down
11 changes: 8 additions & 3 deletions tests/unit/src/Admin/AuthorizationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,12 @@ public function testRequireAdminOrUserWithPermissionReturnsIfAdmin(): void

public function testRequireAdminOrUserWithPermissionReturnsIfUser(): void
{
$this->sspBridgeUtilsAuthMock->expects($this->once())->method('isAdmin')->willReturn(false);
$this->sspBridgeUtilsAuthMock->expects($this->atLeastOnce())->method('isAdmin')
->willReturnOnConsecutiveCalls(
false,
true, // After requireAdmin called, isAdmin will return true
);
$this->sspBridgeUtilsAuthMock->expects($this->once())->method('requireAdmin');
$this->authContextServiceMock->expects($this->once())->method('requirePermission');

$this->sut()->requireAdminOrUserWithPermission('permission');
Expand All @@ -104,9 +109,9 @@ public function testRequireAdminOrUserWithPermissionReturnsIfUser(): void
public function testRequireUserWithPermissionThrowsIfUserNotAuthorized(): void
{
$this->expectException(AuthorizationException::class);
$this->expectExceptionMessage('not authorized');
$this->expectExceptionMessage('access required');

$this->sspBridgeUtilsAuthMock->expects($this->once())->method('isAdmin')->willReturn(false);
$this->sspBridgeUtilsAuthMock->expects($this->atLeastOnce())->method('isAdmin')->willReturn(false);
$this->authContextServiceMock->expects($this->once())->method('requirePermission')
->willThrowException(new Exception('error'));

Expand Down