upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix(controller): Add default range to $limit parameter

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2026-04-13 14:45:32 +02:00
parent d28bfb484b
commit 7ed9191493
No known key found for this signature in database
GPG key ID: F72FA5B49FFA96B0
2 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/AppFramework/Http/Dispatcher.php
View file

@ -26,6 +26,9 @@ use Psr\Log\LoggerInterface;
* Class to dispatch the request to the middleware dispatcher
*/
class Dispatcher {
public const DEFAULT_MIN = 1;
public const DEFAULT_MAX = 500;
/**
* @param Http $protocol the http protocol with contains all status headers
* @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
@ -149,7 +152,7 @@ class Dispatcher {
$value = false;
} elseif ($value !== null && \in_array($type, $types, true)) {
settype($value, $type);
$this->ensureParameterValueSatisfiesRange($param, $value);
$this->ensureParameterValueSatisfiesRange($param, $value, $default);
} elseif ($value === null && $type !== null && $this->appContainer->has($type)) {
$value = $this->appContainer->get($type);
}
@ -193,7 +196,7 @@ class Dispatcher {
* @psalm-param mixed $value
* @throws ParameterOutOfRangeException
*/
private function ensureParameterValueSatisfiesRange(string $param, $value): void {
private function ensureParameterValueSatisfiesRange(string $param, $value, $default): void {
$rangeInfo = $this->reflector->getRange($param);
if ($rangeInfo) {
if ($value < $rangeInfo['min'] || $value > $rangeInfo['max']) {
@ -204,6 +207,15 @@ class Dispatcher {
$rangeInfo['max'],
);
}
} elseif ($param === 'limit') {
if ($value !== $default && ($value < self::DEFAULT_MIN || $value > self::DEFAULT_MAX)) {
throw new ParameterOutOfRangeException(
$param,
$value,
self::DEFAULT_MIN,
self::DEFAULT_MAX,
);
}
}
}
}

32
tests/lib/AppFramework/Http/DispatcherTest.php
View file

@ -549,18 +549,34 @@ class DispatcherTest extends \Test\TestCase {
[7, 14, 5, true],
[7, 14, 10, false],
[-14, -7, -10, false],
[null, null, -1, false],
// $limit comes with default limits of self::DEFAULT_MIN (1) <= $limit <= self::DEFAULT_MAX (500)
[null, null, -1, true, 'limit'],
[null, null, -1, false, 'limit', -1],
[null, null, 0, true, 'limit'],
[null, null, 0, true, 'limit', -1],
[null, null, 1, false, 'limit'],
[null, null, 500, false, 'limit'],
[null, null, 501, true, 'limit'],
];
}
#[\PHPUnit\Framework\Attributes\DataProvider('rangeDataProvider')]
public function testEnsureParameterValueSatisfiesRange(int $min, int $max, int $input, bool $throw): void {
public function testEnsureParameterValueSatisfiesRange(?int $min, ?int $max, int $input, bool $throw, string $param = 'myArgument', ?int $default = null): void {
$this->reflector = $this->createMock(ControllerMethodReflector::class);
$this->reflector->expects($this->any())
->method('getRange')
->willReturn([
'min' => $min,
'max' => $max,
]);
if ($min === null && $max === null) {
$this->reflector->expects($this->any())
->method('getRange')
->willReturn(null);
} else {
$this->reflector->expects($this->any())
->method('getRange')
->willReturn([
'min' => $min,
'max' => $max,
]);
}
$this->dispatcher = new Dispatcher(
$this->http,
@ -578,7 +594,7 @@ class DispatcherTest extends \Test\TestCase {
$this->expectException(ParameterOutOfRangeException::class);
}
$this->invokePrivate($this->dispatcher, 'ensureParameterValueSatisfiesRange', ['myArgument', $input]);
self::invokePrivate($this->dispatcher, 'ensureParameterValueSatisfiesRange', [$param, $input, $default]);
if (!$throw) {
// do not mark this test risky
$this->assertTrue(true);