inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for MT permissions issue for tenant users - added missing Tenant Service hooks (follow-on to r6399)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2007-09-05 09:04:54 +00:00
parent 6e854e6166
commit 27ef680947
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
View File

@@ -472,7 +472,7 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
public void deletePermissions(NodePermissionEntry nodePermissionEntry) public void deletePermissions(NodePermissionEntry nodePermissionEntry)
{ {
permissionsDaoComponent.deletePermissions(nodePermissionEntry.getNodeRef()); permissionsDaoComponent.deletePermissions(tenantService.getName(nodePermissionEntry.getNodeRef()));
accessCache.clear(); accessCache.clear();
} }
@@ -507,12 +507,14 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
public void setPermission(PermissionEntry permissionEntry) public void setPermission(PermissionEntry permissionEntry)
{ {
// TODO - not MT-enabled nodeRef - currently only used by tests
permissionsDaoComponent.setPermission(permissionEntry); permissionsDaoComponent.setPermission(permissionEntry);
accessCache.clear(); accessCache.clear();
} }
public void setPermission(NodePermissionEntry nodePermissionEntry) public void setPermission(NodePermissionEntry nodePermissionEntry)
{ {
// TODO - not MT-enabled nodeRef- currently only used by tests
permissionsDaoComponent.setPermission(nodePermissionEntry); permissionsDaoComponent.setPermission(nodePermissionEntry);
accessCache.clear(); accessCache.clear();
} }
@@ -565,7 +567,7 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
public Set<PermissionReference> getSettablePermissionReferences(NodeRef nodeRef) public Set<PermissionReference> getSettablePermissionReferences(NodeRef nodeRef)
{ {
return modelDAO.getExposedPermissions(nodeRef); return modelDAO.getExposedPermissions(tenantService.getName(nodeRef));
} }
public void deletePermission(NodeRef nodeRef, String authority, String perm) public void deletePermission(NodeRef nodeRef, String authority, String perm)
@@ -822,6 +824,8 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
public boolean hasSinglePermission(Set<String> authorisations, NodeRef nodeRef) public boolean hasSinglePermission(Set<String> authorisations, NodeRef nodeRef)
{ {
nodeRef = tenantService.getName(nodeRef);
Serializable key = generateKey(authorisations, nodeRef, this.required, CacheType.SINGLE_PERMISSION_GLOBAL); Serializable key = generateKey(authorisations, nodeRef, this.required, CacheType.SINGLE_PERMISSION_GLOBAL);
AccessStatus status = accessCache.get(key); AccessStatus status = accessCache.get(key);
@@ -847,6 +851,8 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
public boolean hasSinglePermission(Set<String> authorisations, NodeRef nodeRef, public boolean hasSinglePermission(Set<String> authorisations, NodeRef nodeRef,
Set<Pair<String, PermissionReference>> denied) Set<Pair<String, PermissionReference>> denied)
{ {
nodeRef = tenantService.getName(nodeRef);
// Add any denied permission to the denied list - these can not // Add any denied permission to the denied list - these can not
// then // then
// be used to given authentication. // be used to given authentication.