remove select queries and prohibit queries from Base validator
This commit is contained in:
parent
4d03610755
commit
f6d7449dd5
2 changed files with 2 additions and 12 deletions
|
@ -26,6 +26,6 @@ class Attributes extends Base
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
parent::__construct('attributes', self::ALLOWED_ATTRIBUTES, self::PROHIBITED_QUERIES);
|
parent::__construct('attributes', self::ALLOWED_ATTRIBUTES);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@ use Utopia\Database\Validator\Query\Offset;
|
||||||
use Utopia\Database\Validator\Query\Cursor;
|
use Utopia\Database\Validator\Query\Cursor;
|
||||||
use Utopia\Database\Validator\Query\Filter;
|
use Utopia\Database\Validator\Query\Filter;
|
||||||
use Utopia\Database\Validator\Query\Order;
|
use Utopia\Database\Validator\Query\Order;
|
||||||
use Utopia\Database\Validator\Query\Select;
|
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Database;
|
use Utopia\Database\Database;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
|
@ -23,7 +22,7 @@ class Base extends Queries
|
||||||
* @param string[] $allowedAttributes
|
* @param string[] $allowedAttributes
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public function __construct(string $collection, array $allowedAttributes, array $prohibitedQueries = [])
|
public function __construct(string $collection, array $allowedAttributes)
|
||||||
{
|
{
|
||||||
$config = Config::getParam('collections', []);
|
$config = Config::getParam('collections', []);
|
||||||
$collections = array_merge($config['console'], $config['projects'], $config['buckets'], $config['databases']);
|
$collections = array_merge($config['console'], $config['projects'], $config['buckets'], $config['databases']);
|
||||||
|
@ -70,16 +69,7 @@ class Base extends Queries
|
||||||
new Cursor(),
|
new Cursor(),
|
||||||
new Filter($attributes),
|
new Filter($attributes),
|
||||||
new Order($attributes),
|
new Order($attributes),
|
||||||
new Select($attributes),
|
|
||||||
];
|
];
|
||||||
// Remove prohibited validators from the $validators array
|
|
||||||
foreach ($prohibitedQueries as $prohibitedQuery) {
|
|
||||||
foreach ($validators as $key => $validator) {
|
|
||||||
if ($validator instanceof $prohibitedQuery) {
|
|
||||||
unset($validators[$key]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
parent::__construct($validators);
|
parent::__construct($validators);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue