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

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
128382 jvonka: MNT-16446: Edit Comment permission (part 3b) 
   - follow-on to fix test fallout
   - for CMIS (and future v1 Nodes REST)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-06-27 19:17:09 +00:00
parent ecd686b049
commit fc5f03fc96
2 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/java/org/alfresco/repo/forum/CommentServiceImpl.java
View File

@@ -46,6 +46,7 @@ import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
import org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -55,6 +56,7 @@ import org.alfresco.repo.site.SiteModel;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockStatus;
import org.alfresco.service.cmr.lock.NodeLockedException;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentIOException;
@@ -99,6 +101,7 @@ public class CommentServiceImpl extends AbstractLifecycleBean
private ActivityService activityService;
private SiteService siteService;
private PolicyComponent policyComponent;
private BehaviourFilter behaviourFilter;
private PermissionService permissionService;
private LockService lockService;
@@ -134,6 +137,11 @@ public class CommentServiceImpl extends AbstractLifecycleBean
this.policyComponent = policyComponent;
}
public void setBehaviourFilter(BehaviourFilter behaviourFilter)
{
this.behaviourFilter = behaviourFilter;
}
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
@@ -176,8 +184,7 @@ public class CommentServiceImpl extends AbstractLifecycleBean
// containment tree in a controlled manner.
// We could navigate up looking for the first fm:discussable ancestor, but that might not find the correct node - it could,
// for example, find a parent folder which was discussable.
// TODO review - is this reasonable or should we (also) check for assoc "Comments" ?
NodeRef result = null;
if (nodeService.getType(descendantNodeRef).equals(ForumModel.TYPE_POST))
{
@@ -185,15 +192,20 @@ public class CommentServiceImpl extends AbstractLifecycleBean
if (nodeService.getType(topicNode).equals(ForumModel.TYPE_TOPIC))
{
NodeRef forumNode = nodeService.getPrimaryParent(topicNode).getParentRef();
if (nodeService.getType(forumNode).equals(ForumModel.TYPE_FORUM))
ChildAssociationRef forumToTopicChildAssocRef = nodeService.getPrimaryParent(topicNode);
if (forumToTopicChildAssocRef.getQName().equals(FORUM_TO_TOPIC_ASSOC_QNAME))
{
NodeRef discussableNode = nodeService.getPrimaryParent(forumNode).getParentRef();
NodeRef forumNode = forumToTopicChildAssocRef.getParentRef();
if (nodeService.hasAspect(discussableNode, ForumModel.ASPECT_DISCUSSABLE))
if (nodeService.getType(forumNode).equals(ForumModel.TYPE_FORUM))
{
result = discussableNode;
NodeRef discussableNode = nodeService.getPrimaryParent(forumNode).getParentRef();
if (nodeService.hasAspect(discussableNode, ForumModel.ASPECT_DISCUSSABLE))
{
result = discussableNode;
}
}
}
}
@@ -372,13 +384,13 @@ public class CommentServiceImpl extends AbstractLifecycleBean
// Forum node is created automatically by DiscussableAspect behaviour.
NodeRef forumNode = nodeService.getChildAssocs(discussableNode, ForumModel.ASSOC_DISCUSSION, QName.createQName(NamespaceService.FORUMS_MODEL_1_0_URI, "discussion")).get(0).getChildRef();
final List<ChildAssociationRef> existingTopics = nodeService.getChildAssocs(forumNode, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Comments"));
final List<ChildAssociationRef> existingTopics = nodeService.getChildAssocs(forumNode, ContentModel.ASSOC_CONTAINS, FORUM_TO_TOPIC_ASSOC_QNAME);
NodeRef topicNode = null;
if (existingTopics.isEmpty())
{
Map<QName, Serializable> props = new HashMap<QName, Serializable>(1, 1.0f);
props.put(ContentModel.PROP_NAME, COMMENTS_TOPIC_NAME);
topicNode = nodeService.createNode(forumNode, ContentModel.ASSOC_CONTAINS, QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Comments"), ForumModel.TYPE_TOPIC, props).getChildRef();
topicNode = nodeService.createNode(forumNode, ContentModel.ASSOC_CONTAINS, FORUM_TO_TOPIC_ASSOC_QNAME, ForumModel.TYPE_TOPIC, props).getChildRef();
}
else
{
@@ -418,11 +430,19 @@ public class CommentServiceImpl extends AbstractLifecycleBean
}
catch (ContentIOException cioe)
{
if (cioe.getCause() instanceof AccessDeniedException)
Throwable cause = cioe.getCause();
if (cause instanceof AccessDeniedException)
{
throw (AccessDeniedException)cioe.getCause();
throw (AccessDeniedException)cause;
}
else if (cause instanceof NodeLockedException)
{
throw (NodeLockedException)cause;
}
else
{
throw cioe;
}
throw cioe;
}
if(title != null)
@@ -542,50 +562,44 @@ public class CommentServiceImpl extends AbstractLifecycleBean
@Override
public void beforeUpdateNode(NodeRef commentNodeRef)
{
if (! canEdit(commentNodeRef))
{
throw new AccessDeniedException("Cannot edit comment");
}
}
protected boolean canEdit(NodeRef commentNodeRef)
{
boolean canEdit = false;
NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef);
if (discussableNodeRef != null)
{
if (! isWorkingCopyOrLocked(discussableNodeRef))
if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE)
&& isWorkingCopyOrLocked(discussableNodeRef))
{
canEdit = canEditPermission(commentNodeRef);
throw new NodeLockedException(discussableNodeRef);
}
else
{
boolean canEdit = canEditPermission(commentNodeRef);
if (! canEdit)
{
throw new AccessDeniedException("Cannot edit comment");
}
}
}
return canEdit;
}
@Override
public void beforeDeleteNode(final NodeRef commentNodeRef)
{
if (! canDelete(commentNodeRef))
{
throw new AccessDeniedException("Cannot delete comment");
}
}
protected boolean canDelete(NodeRef commentNodeRef)
{
boolean canDelete = false;
NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef);
if (discussableNodeRef != null)
{
if (! isWorkingCopyOrLocked(discussableNodeRef))
if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE) // eg. delete site (MNT-14671)
&& isWorkingCopyOrLocked(discussableNodeRef))
{
canDelete = canDeletePermission(commentNodeRef);
throw new NodeLockedException(discussableNodeRef);
}
else
{
boolean canDelete = canDeletePermission(commentNodeRef);
if (! canDelete)
{
throw new AccessDeniedException("Cannot delete comment");
}
}
}
return canDelete;
}
}