verdigado-public/organization_folders
0
0
Fork 0
mirror of https://github.com/verdigado/organization_folders.git synced 2024-12-06 11:22:41 +01:00
Code Projects Activity

first draft of ACL rule management

Browse source
This commit is contained in:
Jonathan Treffler 2024-11-04 19:24:12 +01:00
parent 5a2f872b2d
commit f652b13dd3
6 changed files with 223 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

73
lib/Service/ResourceService.php
View file

@ -7,21 +7,30 @@ use Exception;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCA\GroupFolders\ACL\UserMapping\UserMappingManager;
use OCA\GroupFolders\ACL\Rule;
use OCA\OrganizationFolders\Db\Resource;
use OCA\OrganizationFolders\Db\FolderResource;
use OCA\OrganizationFolders\Db\ResourceMapper;
use OCA\OrganizationFolders\Model\OrganizationFolder;
use OCA\OrganizationFolders\Errors\InvalidResourceType;
use OCA\OrganizationFolders\Errors\ResourceNotFound;
use OCA\OrganizationFolders\Errors\ResourceNameNotUnique;
use OCA\OrganizationFolders\Manager\PathManager;
use OCA\OrganizationFolders\Manager\ACLManager;
class ResourceService {
public function __construct(
private ResourceMapper $mapper
private ResourceMapper $mapper,
private PathManager $pathManager,
protected ACLManager $aclManager,
private UserMappingManager $userMappingManager,
) {
}
public function findAll(int $organizationFolderId, int $parentResourceId = null) {
return $this->mapper->findAll($organizationFolderId, $parentResourceId);
public function findAll(int $organizationFolderId, int $parentResourceId = null, array $filters = []) {
return $this->mapper->findAll($organizationFolderId, $parentResourceId, $filters);
}
private function handleException(Exception $e, int $id): void {
@ -46,7 +55,7 @@ class ResourceService {
string $type,
int $organizationFolderId,
string $name,
?int $parentResource = null,
?int $parentResourceId = null,
bool $active = true,
?int $membersAclPermission = null,
@ -59,18 +68,35 @@ class ResourceService {
throw new InvalidResourceType($type);
}
if(!$this->mapper->existsWithName($organizationFolderId, $parentResource, $name)) {
if(!$this->mapper->existsWithName($organizationFolderId, $parentResourceId, $name)) {
$resource->setOrganizationFolderId($organizationFolderId);
$resource->setName($name);
$resource->setParentResource($parentResource);
$resource->setActive($active);
$resource->setLastUpdatedTimestamp(time());
if(isset($parentResourceId)) {
$parentResource = $this->find($parentResourceId);
$resource->setParentResource($parentResource->getId());
$parentNode = $this->pathManager->getFolderResourceNode($parentResource);
} else {
$parentNode = $this->pathManager->getOrganizationFolderNodeById($organizationFolderId);
}
if($type === "folder") {
$resourceNode = $parentNode->newFolder($name);
$fileId = $resourceNode->getId();
if($fileId === -1) {
throw new Exception("Unknown error occured while creating resource folder");
}
if(isset($membersAclPermission, $managersAclPermission, $inheritedAclPermission)) {
$resource->setMembersAclPermission($membersAclPermission);
$resource->setManagersAclPermission($managersAclPermission);
$resource->setInheritedAclPermission($inheritedAclPermission);
$resource->setFileId($fileId);
} else {
throw new \InvalidArgumentException("Folder specific parameters must be included, when creating a resource of type folder");
}
@ -137,6 +163,41 @@ class ResourceService {
return $this->mapper->update($resource);
}
public function setAllFolderResourceAclsInOrganizationFolder(OrganizationFolder $organizationFolder, array $inheritingGroups) {
$topLevelFolderResources = $this->findAll($organizationFolder->getId(), null, ["type" => "folder"]);
return $this->recursivelySetFolderResourceALCs($topLevelFolderResources, "", $inheritingGroups);
}
/**
* Recursively overwrite ACL rules for an array of folder resources
*
* @param array $folderResources
* @psalm-param FolderResource[] $folderResources
* @param string $path
* @psalm-param string $path
* @param array $inheritingGroups
* @psalm-param string[] $inheritingGroups
*/
public function recursivelySetFolderResourceALCs(array $folderResources, string $path, array $inheritingGroups) {
foreach($folderResources as $folderResource) {
$resourceFileId = $folderResource->getFileId();
$acls = [];
foreach($inheritingGroups as $inheritingGroup) {
$acls[] = new Rule(userMapping: $this->userMappingManager->mappingFromId("group", $inheritingGroup),
fileId: $resourceFileId,
mask: 31,
permissions: $folderResource->getInheritedAclPermission(),
);
}
$this->aclManager->overwriteACLsForFileId($resourceFileId, $acls);
// TODO: recurse sub-resources
}
}
public function delete(int $id): Resource {
try {
$resource = $this->mapper->find($id);