ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix tests for group restrictions

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-12-04 09:25:35 +01:00
parent 7c95783ab5
commit 0528bd59d1
4 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Service/PermissionService.php
View File

@@ -37,6 +37,7 @@ use OCP\IConfig;
use OCP\IGroupManager;
use OCP\ILogger;
use OCP\IUserManager;
use OCP\Share\IManager;
class PermissionService {
@@ -53,6 +54,8 @@ class PermissionService {
private $groupManager;
/** @var IConfig */
private $config;
/** @var IManager */
private $shareManager;
/** @var string */
private $userId;
/** @var array */
@@ -64,6 +67,7 @@ class PermissionService {
BoardMapper $boardMapper,
IUserManager $userManager,
IGroupManager $groupManager,
IManager $shareManager,
IConfig $config,
$userId
) {
@@ -72,6 +76,7 @@ class PermissionService {
$this->logger = $logger;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
$this->shareManager = $shareManager;
$this->config = $config;
$this->userId = $userId;
}
@@ -90,7 +95,7 @@ class PermissionService {
Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT),
Acl::PERMISSION_MANAGE => $owner || $this->userCan($acls, Acl::PERMISSION_MANAGE),
Acl::PERMISSION_SHARE => ($owner || $this->userCan($acls, Acl::PERMISSION_SHARE))
&& (!\OC::$server->getShareManager()->sharingDisabledForUser($this->userId))
&& (!$this->shareManager->sharingDisabledForUser($this->userId))
];
}
@@ -109,7 +114,7 @@ class PermissionService {
Acl::PERMISSION_EDIT => $owner || $this->userCan($acls, Acl::PERMISSION_EDIT),
Acl::PERMISSION_MANAGE => $owner || $this->userCan($acls, Acl::PERMISSION_MANAGE),
Acl::PERMISSION_SHARE => ($owner || $this->userCan($acls, Acl::PERMISSION_SHARE))
&& (!\OC::$server->getShareManager()->sharingDisabledForUser($this->userId))
&& (!$this->shareManager->sharingDisabledForUser($this->userId))
];
}
@@ -132,7 +137,7 @@ class PermissionService {
throw new NoPermissionException('Permission denied');
}
if ($permission === Acl::PERMISSION_SHARE && !\OC::$server->getShareManager()->sharingDisabledForUser($this->userId)) {
if ($permission === Acl::PERMISSION_SHARE && $this->shareManager->sharingDisabledForUser($this->userId)) {
return false;
}