upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix(files_reminders): Check for node access when retrieving or removing reminders

Browse source 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
This commit is contained in:
Christopher Ng 2025-02-06 15:59:40 -08:00 committed by Andy Scherzinger
parent cdf6db0016
commit 55351cfe32
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/files_reminders/lib/Controller/ApiController.php
View file

@ -57,7 +57,7 @@ class ApiController extends OCSController {
'dueDate' => $reminder->getDueDate()->format(DateTimeInterface::ATOM), // ISO 8601
];
return new DataResponse($reminderData, Http::STATUS_OK);
} catch (DoesNotExistException $e) {
} catch (NodeNotFoundException | DoesNotExistException $e) {
$reminderData = [
'dueDate' => null,
];
@ -125,7 +125,7 @@ class ApiController extends OCSController {
try {
$this->reminderService->remove($user, $fileId);
return new DataResponse([], Http::STATUS_OK);
} catch (DoesNotExistException $e) {
} catch (NodeNotFoundException | DoesNotExistException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}
}

21
apps/files_reminders/lib/Service/ReminderService.php
View file

@ -47,9 +47,11 @@ class ReminderService {
}
/**
* @throws NodeNotFoundException
* @throws DoesNotExistException
*/
public function getDueForUser(IUser $user, int $fileId): RichReminder {
$this->checkNode($user, $fileId);
$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
return new RichReminder($reminder, $this->root);
}
@ -74,11 +76,7 @@ class ReminderService {
*/
public function createOrUpdate(IUser $user, int $fileId, DateTime $dueDate): bool {
$now = new DateTime('now', new DateTimeZone('UTC'));
$userFolder = $this->root->getUserFolder($user->getUID());
$node = $userFolder->getFirstNodeById($fileId);
if (!$node) {
throw new NodeNotFoundException();
}
$this->checkNode($user, $fileId);
try {
$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
$reminder->setDueDate($dueDate);
@ -99,9 +97,11 @@ class ReminderService {
}
/**
* @throws NodeNotFoundException
* @throws DoesNotExistException
*/
public function remove(IUser $user, int $fileId): void {
$this->checkNode($user, $fileId);
$reminder = $this->reminderMapper->findDueForUser($user, $fileId);
$this->reminderMapper->delete($reminder);
}
@ -162,4 +162,15 @@ class ReminderService {
$this->reminderMapper->delete($reminder);
}
}
/**
* @throws NodeNotFoundException
*/
private function checkNode(IUser $user, int $fileId): void {
$userFolder = $this->root->getUserFolder($user->getUID());
$node = $userFolder->getFirstNodeById($fileId);
if ($node === null) {
throw new NodeNotFoundException();
}
}
}