-
-
Notifications
You must be signed in to change notification settings - Fork 4.8k
Avoid undefined array key sharing request #59778
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.
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
ChristophWurst
merged 1 commit into
master
from
bug/noid/avoid-undefined-array-key-sharing-request
Apr 22, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\DAV\DAV\Security; | ||
|
|
||
| use OCA\DAV\Connector\Sabre\Exception\TooManyRequests; | ||
| use OCP\IAppConfig; | ||
| use OCP\IUserSession; | ||
| use OCP\Security\RateLimiting\ILimiter; | ||
| use OCP\Security\RateLimiting\IRateLimitExceededException; | ||
|
|
||
| class RateLimiting { | ||
|
|
||
| public function __construct( | ||
| private readonly IUserSession $userSession, | ||
| private readonly IAppConfig $config, | ||
| private readonly ILimiter $limiter, | ||
| ) { | ||
| } | ||
|
|
||
| /** | ||
| * @throws TooManyRequests | ||
| */ | ||
| public function check(): void { | ||
| $user = $this->userSession->getUser(); | ||
| if ($user === null) { | ||
| return; | ||
| } | ||
|
|
||
| $identifier = 'share-addressbook-or-calendar'; | ||
| $userLimit = $this->config->getValueInt('dav', 'rateLimitShareAddressbookOrCalendar', 20); | ||
| $userPeriod = $this->config->getValueInt('dav', 'rateLimitPeriodShareAddressbookOrCalendar', 3600); | ||
|
|
||
| try { | ||
| $this->limiter->registerUserRequest($identifier, $userLimit, $userPeriod, $user); | ||
| } catch (IRateLimitExceededException $e) { | ||
| throw new TooManyRequests('Too many addressbook or calendar share requests', 0, $e); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\DAV\Tests\unit\DAV\Security; | ||
|
|
||
| use OCA\DAV\Connector\Sabre\Exception\TooManyRequests; | ||
| use OCA\DAV\DAV\Security\RateLimiting; | ||
| use OCP\IAppConfig; | ||
| use OCP\IUser; | ||
| use OCP\IUserSession; | ||
| use OCP\Security\RateLimiting\ILimiter; | ||
| use OCP\Security\RateLimiting\IRateLimitExceededException; | ||
| use PHPUnit\Framework\MockObject\MockObject; | ||
| use Test\TestCase; | ||
|
|
||
| class RateLimitingTest extends TestCase { | ||
| private IUserSession $userSession; | ||
| private IAppConfig&MockObject $config; | ||
| private ILimiter&MockObject $limiter; | ||
| private RateLimiting $rateLimiting; | ||
| private string $userId = 'user123'; | ||
|
|
||
| protected function setUp(): void { | ||
| parent::setUp(); | ||
|
|
||
| $this->userSession = $this->createMock(IUserSession::class); | ||
| $this->config = $this->createMock(IAppConfig::class); | ||
| $this->limiter = $this->createMock(ILimiter::class); | ||
|
|
||
| $this->rateLimiting = new RateLimiting( | ||
| $this->userSession, | ||
| $this->config, | ||
| $this->limiter, | ||
| ); | ||
| } | ||
|
|
||
| public function testNoUserObject(): void { | ||
| $this->userSession->expects($this->once()) | ||
| ->method('getUser') | ||
| ->willReturn(null); | ||
| $this->limiter->expects($this->never()) | ||
| ->method('registerUserRequest'); | ||
|
|
||
| $this->rateLimiting->check(); | ||
| } | ||
|
|
||
| public function testRegisterShareRequest(): void { | ||
| $user = $this->createMock(IUser::class); | ||
| $this->userSession->expects($this->once()) | ||
| ->method('getUser') | ||
| ->willReturn($user); | ||
| $this->config->method('getValueInt') | ||
| ->willReturnCallback(static function (string $app, string $key, int $default): int { | ||
| return match ($key) { | ||
| 'rateLimitShareAddressbookOrCalendar' => 7, | ||
| 'rateLimitPeriodShareAddressbookOrCalendar' => 600, | ||
| default => $default, | ||
| }; | ||
| }); | ||
| $this->limiter->expects($this->once()) | ||
| ->method('registerUserRequest') | ||
| ->with( | ||
| 'share-addressbook-or-calendar', | ||
| 7, | ||
| 600, | ||
| $user, | ||
| ); | ||
|
|
||
| $this->rateLimiting->check(); | ||
| } | ||
|
|
||
| public function testShareRequestRateLimitExceeded(): void { | ||
| $user = $this->createMock(IUser::class); | ||
| $this->userSession->expects($this->once()) | ||
| ->method('getUser') | ||
| ->willReturn($user); | ||
| $this->config->method('getValueInt') | ||
| ->willReturnArgument(2); | ||
| $this->limiter->expects($this->once()) | ||
| ->method('registerUserRequest') | ||
| ->with( | ||
| 'share-addressbook-or-calendar', | ||
| 20, | ||
| 3600, | ||
| $user, | ||
| ) | ||
| ->willThrowException($this->createMock(IRateLimitExceededException::class)); | ||
|
kesselb marked this conversation as resolved.
|
||
|
|
||
| $this->expectException(TooManyRequests::class); | ||
|
|
||
| $this->rateLimiting->check(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.