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

Made MethodSecurityBean compatible with any MethodInterceptor (see failures around AlwaysProceedMethodInterceptor)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-07-21 14:38:15 +00:00
parent e16e19e2c5
commit dd7facf14a
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/security/permissions/impl/acegi/MethodSecurityBean.java
View File

@@ -28,6 +28,7 @@ import net.sf.acegisecurity.ConfigAttributeDefinition;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.security.permissions.PermissionCheckCollection.PermissionCheckCollectionMixin; import org.alfresco.repo.security.permissions.PermissionCheckCollection.PermissionCheckCollectionMixin;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -43,6 +44,7 @@ public class MethodSecurityBean<R> implements InitializingBean
{ {
private Log logger = LogFactory.getLog(MethodSecurityBean.class); private Log logger = LogFactory.getLog(MethodSecurityBean.class);
private MethodInterceptor methodInterceptor;
private MethodSecurityInterceptor methodSecurityInterceptor; private MethodSecurityInterceptor methodSecurityInterceptor;
private Class<?> service; private Class<?> service;
private String methodName; private String methodName;
@@ -65,9 +67,12 @@ public class MethodSecurityBean<R> implements InitializingBean
this.methodName = methodName; this.methodName = methodName;
} }
public void setMethodSecurityInterceptor(MethodSecurityInterceptor methodSecurityInterceptor) /**
* @param methodInterceptor an method interceptor, ideally a MethodSecurityInterceptor
*/
public void setMethodSecurityInterceptor(MethodInterceptor methodInterceptor)
{ {
this.methodSecurityInterceptor = methodSecurityInterceptor; this.methodInterceptor = methodInterceptor;
} }
public void setService(Class<?> service) public void setService(Class<?> service)
@@ -89,7 +94,7 @@ public class MethodSecurityBean<R> implements InitializingBean
@Override @Override
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {
PropertyCheck.mandatory(this, "methodSecurityInterceptor", methodSecurityInterceptor); PropertyCheck.mandatory(this, "methodInterceptor", methodInterceptor);
PropertyCheck.mandatory(this, "service", service); PropertyCheck.mandatory(this, "service", service);
PropertyCheck.mandatory(this, "methodName", methodName); PropertyCheck.mandatory(this, "methodName", methodName);
@@ -113,8 +118,19 @@ public class MethodSecurityBean<R> implements InitializingBean
" Interface: " + service.getClass() + "\n" + " Interface: " + service.getClass() + "\n" +
" Method: " + methodName); " Method: " + methodName);
} }
if (!(methodInterceptor instanceof MethodSecurityInterceptor))
{
// It is not an interceptor that applies security, so just ignore
this.cad = null;
if (logger.isTraceEnabled())
{
logger.trace("Method interceptor doesn't apply security: " + methodSecurityInterceptor);
}
}
else else
{ {
this.methodSecurityInterceptor = (MethodSecurityInterceptor) this.methodInterceptor;
this.cad = methodSecurityInterceptor.getObjectDefinitionSource().getAttributes(new InternalMethodInvocation(method)); this.cad = methodSecurityInterceptor.getObjectDefinitionSource().getAttributes(new InternalMethodInvocation(method));
// Null means there are no applicable permissions // Null means there are no applicable permissions
} }