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

Merged V2.2 to HEAD

Browse Source 
11167: Merged V2.1 to V2.2
      10497: ETWOONE-243: Permissions issue with Versioning enabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11228 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-10-07 02:11:57 +00:00
parent 1cd93731fd
commit 1887df682e
1 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ import org.alfresco.repo.security.permissions.PermissionEntry;
import org.alfresco.repo.security.permissions.PermissionReference; import org.alfresco.repo.security.permissions.PermissionReference;
import org.alfresco.repo.security.permissions.PermissionServiceSPI; import org.alfresco.repo.security.permissions.PermissionServiceSPI;
import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.version.VersionModel;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -410,18 +411,16 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
return permissionsDaoComponent.getPermissions(storeRef); return permissionsDaoComponent.getPermissions(storeRef);
} }
public AccessStatus hasPermission(final NodeRef nodeRefIn, final PermissionReference permIn) public AccessStatus hasPermission(NodeRef passedNodeRef, final PermissionReference permIn)
{ {
// If the node ref is null there is no sensible test to do - and there // If the node ref is null there is no sensible test to do - and there
// must be no permissions // must be no permissions
// - so we allow it // - so we allow it
if (nodeRefIn == null) if (passedNodeRef == null)
{ {
return AccessStatus.ALLOWED; return AccessStatus.ALLOWED;
} }
final NodeRef nodeRef = tenantService.getName(nodeRefIn);
// If the permission is null we deny // If the permission is null we deny
if (permIn == null) if (permIn == null)
{ {
@@ -429,16 +428,30 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
} }
// AVM nodes - test for existence underneath // AVM nodes - test for existence underneath
if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM)) if (passedNodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
{ {
return doAvmCan(nodeRef, permIn); return doAvmCan(passedNodeRef, permIn);
} }
// Allow permissions for nodes that do not exist // Allow permissions for nodes that do not exist
if (!nodeService.exists(nodeRef)) if (!nodeService.exists(passedNodeRef))
{ {
return AccessStatus.ALLOWED; return AccessStatus.ALLOWED;
} }
// Because of VersionedNodeRef has no any inherited from source Frozen NodeRef permissions (it has only default permissions),
// it is necessary to avoid cases when some user without appropriate permissions trying to receive any resource from its any version link etc.
// That could be proceed through receiving Frozen NodeRef instance for this VersionedNodeRef instance. There is appears a possibility to get
// access to specified for Frozen NodeRef instance permissions
// NOTE: maybe in future there will appear situation when changing Node permissions will be a cause for creating new Node version. In other words,
// VersionedNodeRefs will contain their own permissions (whose, probably, will differ from version to version). In this case you should delete/comment this code!!!
if(isVersionedNodeRefInstance(passedNodeRef))
{
passedNodeRef = convertVersionedNodeRefToFrozenNodeRef(passedNodeRef);
}
final NodeRef nodeRef = tenantService.getName(passedNodeRef);
final PermissionReference perm; final PermissionReference perm;
if (permIn.equals(OLD_ALL_PERMISSIONS_REFERENCE)) if (permIn.equals(OLD_ALL_PERMISSIONS_REFERENCE))
@@ -1911,4 +1924,31 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
} }
return answer; return answer;
} }
/**
* This methods checks weather the specified NodeRef instance is an VersionedNodeRef
*
* @param nodeRef - probably VersionedNodeRef
* @return <b>true</b> if NodeRef if Versioned and <b>false</b> in other case
*/
private boolean isVersionedNodeRefInstance(NodeRef nodeRef)
{
return nodeRef.getStoreRef().getProtocol().equals(VersionModel.STORE_PROTOCOL);
}
/**
* Converts specified VersionedNodeRef to Frozen NodeRef (from SpacesStore store, accessed by workspace protocol)
*
* @param nodeRef - <b>always</b> VersionedNodeRef
* @return Frozen NodeRef instance (source for this VersionedNodeRef instance)
*/
private NodeRef convertVersionedNodeRefToFrozenNodeRef(NodeRef nodeRef)
{
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
return new NodeRef((String) properties.get(ContentModel.PROP_STORE_PROTOCOL),
(String) properties.get(ContentModel.PROP_STORE_IDENTIFIER),
(String) properties.get(ContentModel.PROP_NODE_UUID));
}
} }