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

continued development of ACL rule management; fixed getting filesystem node of folder resources

Browse source
This commit is contained in:
Jonathan Treffler 2024-11-05 00:45:44 +01:00
parent 5500ded3fb
commit 8d781f5001
6 changed files with 121 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Service/OrganizationFolderService.php
View file

@ -188,7 +188,8 @@ class OrganizationFolderService {
$acls = [];
foreach($groups as $group) {
$acls[] = new Rule(userMapping: $this->userMappingManager->mappingFromId("group", $group),
$acls[] = new Rule(
userMapping: $this->userMappingManager->mappingFromId("group", $group),
fileId: $fileId,
mask: 31,
permissions: 1,

2
lib/Service/ResourceMemberService.php
View file

@ -52,6 +52,8 @@ class ResourceMemberService {
$member->setResourceId($resourceId);
$member->setPermissionLevel($permissionLevel->value);
$member->setType($type->value);
// TODO: check if principal fits format
$member->setPrincipal($principal);
$member->setCreatedTimestamp(time());
$member->setLastUpdatedTimestamp(time());

88
lib/Service/ResourceService.php
View file

@ -14,18 +14,23 @@ use OCA\OrganizationFolders\Db\Resource;
use OCA\OrganizationFolders\Db\FolderResource;
use OCA\OrganizationFolders\Db\ResourceMapper;
use OCA\OrganizationFolders\Model\OrganizationFolder;
use OCA\OrganizationFolders\Enum\MemberPermissionLevel;
use OCA\OrganizationFolders\Enum\MemberType;
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;
use OCA\OrganizationFolders\OrganizationProvider\OrganizationProviderManager;
class ResourceService {
public function __construct(
private ResourceMapper $mapper,
private PathManager $pathManager,
protected ResourceMapper $mapper,
protected PathManager $pathManager,
protected ACLManager $aclManager,
private UserMappingManager $userMappingManager,
protected UserMappingManager $userMappingManager,
protected ResourceMemberService $resourceMemberService,
protected OrganizationProviderManager $organizationProviderManager,
) {
}
@ -77,9 +82,13 @@ class ResourceService {
if(isset($parentResourceId)) {
$parentResource = $this->find($parentResourceId);
$resource->setParentResource($parentResource->getId());
if($parentResource->getOrganizationFolderId() === $organizationFolderId) {
$resource->setParentResource($parentResource->getId());
} else {
throw new Exception("Cannot create child-resource of parent in different organizationId");
}
$parentNode = $this->pathManager->getFolderResourceNode($parentResource);
$parentNode = $this->getFolderResourceFilesystemNode($parentResource);
} else {
$parentNode = $this->pathManager->getOrganizationFolderNodeById($organizationFolderId);
}
@ -129,9 +138,15 @@ class ResourceService {
}
if(isset($name)) {
if($this->mapper->existsWithName($resource->getGroupFolderId(), $resource->getParentResource(), $name)) {
if($this->mapper->existsWithName($resource->getOrganizationFolderId(), $resource->getParentResource(), $name)) {
throw new ResourceNameNotUnique();
} else {
if($resource->getType() === "folder") {
$resourceNode = $this->getFolderResourceFilesystemNode($resource);
$newPath = $resourceNode->getParent()->getPath() . "/" . $name;
$resourceNode->move($newPath);
}
$resource->setName($name);
}
}
@ -161,6 +176,7 @@ class ResourceService {
}
return $this->mapper->update($resource);
// TODO: improve error handing: if db update fails roll back changes in the filesystem
}
public function setAllFolderResourceAclsInOrganizationFolder(OrganizationFolder $organizationFolder, array $inheritingGroups) {
@ -184,20 +200,78 @@ class ResourceService {
$resourceFileId = $folderResource->getFileId();
$acls = [];
// inherit ACLs
foreach($inheritingGroups as $inheritingGroup) {
$acls[] = new Rule(userMapping: $this->userMappingManager->mappingFromId("group", $inheritingGroup),
$acls[] = new Rule(
userMapping: $this->userMappingManager->mappingFromId("group", $inheritingGroup),
fileId: $resourceFileId,
mask: 31,
permissions: $folderResource->getInheritedAclPermission(),
);
}
// member ACLs
$resourceMembers = $this->resourceMemberService->findAll($folderResource->getId());
foreach($resourceMembers as $resourceMember) {
if($resourceMember->getPermissionLevel() === MemberPermissionLevel::MANAGER->value) {
$resourceMemberPermissions = $folderResource->getManagersAclPermission();
} else if($resourceMember->getPermissionLevel() === MemberPermissionLevel::MEMBER->value) {
$resourceMemberPermissions = $folderResource->getMembersAclPermission();
} else {
throw new Exception("invalid resource member permission level");
}
if($resourceMember->getType() === MemberType::USER->value) {
$mapping = $this->userMappingManager->mappingFromId("user", $resourceMember->getPrincipal());
} else if($resourceMember->getType() === MemberType::GROUP->value) {
$mapping = $this->userMappingManager->mappingFromId("group", $resourceMember->getPrincipal());
} else if($resourceMember->getType() === MemberType::ROLE->value) {
[$organizationProviderId, $roleId] = explode(":", $resourceMember->getPrincipal(), 2);
$organizationProvider = $this->organizationProviderManager->getOrganizationProvider($organizationProviderId);
$role = $organizationProvider->getRole($roleId);
$mapping = $this->userMappingManager->mappingFromId("group", $role->getMembersGroup());
} else {
throw new Exception("invalid resource member type");
}
if(is_null($mapping)) {
// TODO: skip member instead of crashing
throw new Exception(message: "invalid mapping, likely non-existing group");
}
$acls[] = new Rule(
userMapping: $mapping,
fileId: $resourceFileId,
mask: 31,
permissions: $resourceMemberPermissions,
);
}
$this->aclManager->overwriteACLsForFileId($resourceFileId, $acls);
// TODO: recurse sub-resources
}
}
public function getResourcePath(FolderResource $resource) {
$currentResource = $resource;
$invertedPath = [];
$invertedPath[] = $currentResource->getName();
while($currentResource->getParentResource()) {
$currentResource = $this->find($currentResource->getParentResource());
$invertedPath[] = $currentResource->getName();
}
return array_reverse($invertedPath);
}
public function getFolderResourceFilesystemNode(FolderResource $resource) {
return $this->pathManager->getOrganizationFolderByIdSubfolder($resource->getOrganizationFolderId(), $this->getResourcePath($resource));
}
public function delete(int $id): Resource {
try {
$resource = $this->mapper->find($id);