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

shares are displayed to users with resharing rights

Browse source 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
This commit is contained in:
Maxence Lange 2018-10-29 10:03:52 +01:00 committed by Julius Härtl
parent f13c7dda1c
commit 68c44bb642
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
2 changed files with 49 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/files_sharing/lib/Controller/ShareAPIController.php
View file

@ -720,14 +720,23 @@ class ShareAPIController extends OCSController {
}
$formatted = [];
$resharingRight = false;
foreach ($shares as $share) {
try {
$formatted[] = $this->formatShare($share, $path);
if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share)) {
$resharingRight = true;
}
} catch (NotFoundException $e) {
//Ignore share
}
}
if (!$resharingRight) {
$formatted = [];
}
if ($include_tags) {
$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
}
@ -1102,4 +1111,33 @@ class ShareAPIController extends OCSController {
return $this->serverContainer->query('\OCA\Spreed\Share\Helper\ShareAPIController');
}
/**
* Returns if we can find resharing rights in an IShare object for a specific user.
*
* @param string $userId
* @param IShare $share
* @return bool
*/
private function shareProviderResharingRights(string $userId, IShare $share): bool {
if ($share->getShareOwner() === $userId) {
return true;
}
if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
return false;
}
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER && $share->getSharedWith() === $userId) {
return true;
}
if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
return true;
}
return false;
}
}

22
lib/private/Share20/DefaultShareProvider.php
View file

@ -617,18 +617,18 @@ class DefaultShareProvider implements IShareProvider {
/**
* Reshares for this user are shares where they are the owner.
*/
if ($reshares === false) {
$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
if ($node === null) {
if ($reshares === false) {
$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
} else {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
)
);
}
} else {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
)
);
}
if ($node !== null) {
$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
}