Skip to content

FEAT: Expose editHtml permission in role management GUI (#452) #457

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
loocars merged 2 commits into from
Jul 23, 2026
+15 −2
Merged

FEAT: Expose editHtml permission in role management GUI (#452) #457

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
8f2dfc3
FEAT: Expose editHtml permission in role management GUI
loocars Jul 9, 2026
8792a8e
Maintain editHtml permission via the updates migration array
loocars Jul 15, 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
1 change: 1 addition & 0 deletions changelog.d/feat-edithtml-role-permission.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FEAT: The "editHtml" permission can now be granted to roles via the role management GUI, instead of only being available to administrators (#452)
1 change: 0 additions & 1 deletion share/server/core/classes/CoreAuthorisationHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ class CoreAuthorisationHandler
'createObject' => 'edit',
'deleteObject' => 'edit',
'addModify' => 'edit',
'editHtml' => 'edit',
],
'Overview' => [
'getOverviewRotations' => 'view',
Expand Down
8 changes: 8 additions & 0 deletions share/server/core/classes/CorePDOHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ public static function initialize_static()
],

'updates' => [
'1100500' => [
['-perm-add', ['mod' => 'Map', 'act' => 'editHtml', 'obj' => '*']],
],

'1091500' => [
['-perm-change-act', ['mod' => 'ChangePassword', 'old_act' => 'change', 'new_act' => '*']]
],
Expand Down Expand Up @@ -830,6 +834,10 @@ public function createInitialDb()
$this->queryFatal('-perm-add', ['mod' => 'Map', 'act' => 'manage', 'obj' => '*']);
$this->queryFatal('-perm-add', ['mod' => 'Map', 'act' => 'add', 'obj' => '*']);

// Access controll: Edit HTML content of map objects, grantable via the
// role management GUI (CVE-2024-47090)
$this->queryFatal('-perm-add', ['mod' => 'Map', 'act' => 'editHtml', 'obj' => '*']);

$this->queryFatal('-perm-add', ['mod' => 'MainCfg', 'act' => 'edit', 'obj' => '*']);

// Access control: View URLs e.g. in rotation pools
Expand Down
7 changes: 6 additions & 1 deletion share/server/core/classes/ViewManageRoles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,12 @@ private function renderPermissions($role_id)
'rotations' => [],
];
foreach ($AUTHORISATION->getAllVisiblePerms() as $perm) {
if ($perm['mod'] == 'Map' && $perm['act'] != 'add' && $perm['act'] != 'manage') {
if (
$perm['mod'] == 'Map'
&& $perm['act'] != 'add'
&& $perm['act'] != 'manage'
&& $perm['act'] != 'editHtml'
) {
$map_name = $perm['obj'];
if (!isset($permissions_by_section['maps'][$map_name])) {
$permissions_by_section['maps'][$map_name] = [];
Expand Down
Loading