wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OCS Share API should not return invalid shares

Browse source 
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
This commit is contained in:
Roeland Jago Douma 2016-02-16 16:04:17 +01:00
parent 7b0f83b616
commit 2aa0b885f6
2 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/files_sharing/api/share20ocs.php
View file

@ -20,6 +20,7 @@
*/ */
namespace OCA\Files_Sharing\API; namespace OCA\Files_Sharing\API;
use OCP\Files\NotFoundException;
use OCP\IGroupManager; use OCP\IGroupManager;
use OCP\IUserManager; use OCP\IUserManager;
use OCP\IRequest; use OCP\IRequest;
@ -83,6 +84,7 @@ class Share20OCS {
* *
* @param \OCP\Share\IShare $share * @param \OCP\Share\IShare $share
* @return array * @return array
* @throws NotFoundException In case the node can't be resolved.
*/ */
protected function formatShare(\OCP\Share\IShare $share) { protected function formatShare(\OCP\Share\IShare $share) {
$sharedBy = $this->userManager->get($share->getSharedBy()); $sharedBy = $this->userManager->get($share->getSharedBy());
@ -177,13 +179,17 @@ class Share20OCS {
} }
if ($this->canAccessShare($share)) { if ($this->canAccessShare($share)) {
try {
$share = $this->formatShare($share); $share = $this->formatShare($share);
return new \OC_OCS_Result([$share]); return new \OC_OCS_Result([$share]);
} else { } catch (NotFoundException $e) {
return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.'); //Fall trough
} }
} }
return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
}
/** /**
* Delete a share * Delete a share
* *
@ -368,7 +374,11 @@ class Share20OCS {
$formatted = []; $formatted = [];
foreach ($shares as $share) { foreach ($shares as $share) {
if ($this->canAccessShare($share)) { if ($this->canAccessShare($share)) {
try {
$formatted[] = $this->formatShare($share); $formatted[] = $this->formatShare($share);
} catch (NotFoundException $e) {
// Ignore this share
}
} }
} }
@ -398,7 +408,11 @@ class Share20OCS {
$formatted = []; $formatted = [];
foreach ($shares as $share) { foreach ($shares as $share) {
try {
$formatted[] = $this->formatShare($share); $formatted[] = $this->formatShare($share);
} catch (NotFoundException $e) {
//Ignore this share
}
} }
return new \OC_OCS_Result($formatted); return new \OC_OCS_Result($formatted);
@ -458,7 +472,11 @@ class Share20OCS {
$formatted = []; $formatted = [];
foreach ($shares as $share) { foreach ($shares as $share) {
try {
$formatted[] = $this->formatShare($share); $formatted[] = $this->formatShare($share);
} catch (NotFoundException $e) {
//Ignore share
}
} }
return new \OC_OCS_Result($formatted); return new \OC_OCS_Result($formatted);

6
apps/files_sharing/tests/api/share20ocstest.php
View file

@ -28,6 +28,12 @@ use OCP\IURLGenerator;
use OCP\IUser; use OCP\IUser;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
/**
* Class Share20OCSTest
*
* @package OCA\Files_Sharing\Tests\API
* @group DB
*/
class Share20OCSTest extends \Test\TestCase { class Share20OCSTest extends \Test\TestCase {
/** @var \OC\Share20\Manager | \PHPUnit_Framework_MockObject_MockObject */ /** @var \OC\Share20\Manager | \PHPUnit_Framework_MockObject_MockObject */