Skip to content

Commit

Permalink
Make “root” a reserved key for Contexts (#16475)
Browse files Browse the repository at this point in the history
### What does it do?

1. Prevents "root" from being specified as a Context key.
2. Slightly refactors the `Create->beforeSave() `error testing
conditional to use a `switch` statement so only relevant code will
execute in that block.
3. Additionally, in the second commit, leverages the newly-added
`RESERVED_KEYS` constant (in the `modContext` base class) in the Context
processor `GetList` class.

### Why is it needed?
The keyword "root" is used as the default id for all trees in the core.
As such, attempting to create a Context with that key results in errors
in the rendering of the Resources tree.

### How to test
Attempt to create a new Context with the key "root." You should receive
an error message indicating the key is reserved.

### Related issue(s)/PR(s)
Resolves #16457
  • Loading branch information
smg6511 authored and opengeek committed Feb 16, 2024
1 parent 86bbbab commit ae2ca75
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 7 deletions.
1 change: 1 addition & 0 deletions core/lexicon/en/context.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
$_lang['context_err_ns'] = 'Context not specified.';
$_lang['context_err_ns_key'] = 'Please specify a valid key for the Context.';
$_lang['context_err_remove'] = 'An error occurred while trying to delete the Context.';
$_lang['context_err_reserved'] = 'The Context key you chose is reserved for system use only. Please specify a different key.';
$_lang['context_err_save'] = 'An error occurred while saving the Context.';
$_lang['context_id'] = 'Ctx ID';
$_lang['context_key'] = 'Context Key';
Expand Down
21 changes: 15 additions & 6 deletions core/src/Revolution/Processors/Context/Create.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/*
* This file is part of the MODX Revolution package.
*
Expand All @@ -10,7 +11,6 @@

namespace MODX\Revolution\Processors\Context;


use MODX\Revolution\modAccessContext;
use MODX\Revolution\modAccessPolicy;
use MODX\Revolution\modContext;
Expand All @@ -35,15 +35,24 @@ class Create extends CreateProcessor
public function beforeSave()
{
$key = $this->getProperty('key');
if (empty($key)) {
$this->addFieldError('key', $this->modx->lexicon('context_err_ns_key'));

switch (true) {
case empty($key):
$this->addFieldError('key', $this->modx->lexicon('context_err_ns_key'));
break;
case in_array(strtolower($key), $this->classKey::RESERVED_KEYS):
$this->addFieldError('key', $this->modx->lexicon('context_err_reserved'));
break;
case $this->alreadyExists($key):
$this->addFieldError('key', $this->modx->lexicon('context_err_ae'));
// no default
}
if ($this->alreadyExists($key)) {
$this->addFieldError('key', $this->modx->lexicon('context_err_ae'));
if ($this->hasErrors()) {
return false;
}
$this->object->set('key', $key);

return !$this->hasErrors();
return true;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion core/src/Revolution/Processors/Context/GetList.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function prepareRow(xPDOObject $object)
if ($this->canEdit) {
$contextArray['perm'][] = 'pedit';
}
if (!in_array($object->get('key'), ['mgr', 'web']) && $this->canRemove) {
if (!in_array($object->get('key'), $this->classKey::RESERVED_KEYS) && $this->canRemove) {
$contextArray['perm'][] = 'premove';
}

Expand Down
7 changes: 7 additions & 0 deletions core/src/Revolution/modContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
*/
class modContext extends modAccessibleObject
{
/**
* A set of Context keys that are restricted to system use only
*
* @var array RESERVED_KEYS
*/
public const RESERVED_KEYS = ['mgr', 'web', 'root'];

/**
* An array of configuration options for this context
*
Expand Down

0 comments on commit ae2ca75

Please sign in to comment.