Skip to content

[stable32] fix(DeclarativeManager): Fix admin delegation #61874

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

Open
backportbot wants to merge 2 commits into
base: stable32
Choose a base branch
from
+12 −3
Open

[stable32] fix(DeclarativeManager): Fix admin delegation #61874

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
e096662
fix(DeclarativeManager): Fix admin delegation
marcelklehr Jul 6, 2026
a1096f9
fix(DeclarativeManagerTest): Fix testAdminFormUserUnauthorized
marcelklehr Jul 7, 2026
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
6 changes: 4 additions & 2 deletions lib/private/Settings/DeclarativeManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ public function getFormsWithValues(IUser $user, ?string $type, ?string $section)
if ($section !== null && $schema['section_id'] !== $section) {
continue;
}
// If listing all fields skip the admin fields which a non-admin user has no access to
if ($type === null && $schema['section_type'] === 'admin' && !$isAdmin) {
// Skip admin declarative forms for non-admin users. They have no access to
// these fields even when they are allowed to view the section through admin
// delegation, which only covers non-declarative settings.
if ($schema['section_type'] === DeclarativeSettingsTypes::SECTION_TYPE_ADMIN && !$isAdmin) {
continue;
}

Expand Down
9 changes: 8 additions & 1 deletion tests/lib/Settings/DeclarativeManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,15 @@ public function testAdminFormUserUnauthorized(): void {
$schema = self::validSchemaAllFields;
$this->declarativeManager->registerSchema($app, $schema);

// A non-admin user must not receive admin declarative forms, but this must not
// throw: it would abort rendering of a section a user can legitimately access
// through admin delegation (which only covers non-declarative settings).
$forms = $this->declarativeManager->getFormsWithValues($this->user, $schema['section_type'], $schema['section_id']);
$this->assertEmpty($forms);

// Writing to an admin declarative form is still forbidden for a non-admin user.
$this->expectException(\Exception::class);
$this->declarativeManager->getFormsWithValues($this->user, $schema['section_type'], $schema['section_id']);
$this->declarativeManager->setValue($this->user, $app, $schema['id'], 'some_real_setting', '120m');
}

/**
Expand Down
Loading