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

[RM-795] Can't copy/link to record. Links failed because during the RM permission check the applicationContext was being lost. The applicationContext was used to get the internal NodeService bean so that RM could skip additional permission checks beyond the ones that RM was already doing. The bean was already injecting the internal nodeServce bean in the spring bean config. Removed the ApplicationAwareContext and the bean lookup to use the already injected nodeService fixes linking.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jared Ottley
2013-08-30 16:44:42 +00:00
parent 8faff6dcd9
commit 60cd75f75a
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
View File

@@ -37,9 +37,7 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/**
* Common security functions.
@@ -49,7 +47,7 @@ import org.springframework.context.ApplicationContextAware;
* @author Roy Wetherall
* @since 2.0
*/
public class RMSecurityCommon implements ApplicationContextAware
public class RMSecurityCommon
{
/** No set value */
protected int NOSET_VALUE = -100;
@@ -57,25 +55,13 @@ public class RMSecurityCommon implements ApplicationContextAware
/** Logger */
private static Log logger = LogFactory.getLog(RMSecurityCommon.class);
/** Application Context */
private ApplicationContext applicationContext;
/** Services */
protected NodeService nodeService;
protected NodeService nodeService; //This is the internal NodeService -- no permission checks
protected PermissionService permissionService;
protected RecordsManagementService rmService;
protected RMCaveatConfigComponent caveatConfigComponent;
protected FilePlanService filePlanService;
/**
* @param applicationContext application context
*/
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
this.applicationContext = applicationContext;
}
/**
* @param nodeService node service
*/
@@ -179,9 +165,7 @@ public class RMSecurityCommon implements ApplicationContextAware
{
int result = AccessDecisionVoter.ACCESS_ABSTAIN;
// use the internal node service to avoid duplication of method permission checks
NodeService internalNodeService = (NodeService)applicationContext.getBean("nodeService");
if (internalNodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT)== true)
if (nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FILE_PLAN_COMPONENT)== true)
{
result = checkRmRead(nodeRef);
}