Improve field visibility in DefaultMethodSecurityExpressionHandler

Fixes gh-210
This commit is contained in:
Kevin Conaway 2015-07-14 10:30:41 -04:00 committed by Joe Grandja
parent c23c7982ca
commit d2a37cb1d6

View File

@ -66,7 +66,7 @@ public class DefaultMethodSecurityExpressionHandler extends
*/ */
public StandardEvaluationContext createEvaluationContextInternal(Authentication auth, public StandardEvaluationContext createEvaluationContextInternal(Authentication auth,
MethodInvocation mi) { MethodInvocation mi) {
return new MethodSecurityEvaluationContext(auth, mi, parameterNameDiscoverer); return new MethodSecurityEvaluationContext(auth, mi, getParameterNameDiscoverer());
} }
/** /**
@ -78,9 +78,9 @@ public class DefaultMethodSecurityExpressionHandler extends
authentication); authentication);
root.setThis(invocation.getThis()); root.setThis(invocation.getThis());
root.setPermissionEvaluator(getPermissionEvaluator()); root.setPermissionEvaluator(getPermissionEvaluator());
root.setTrustResolver(trustResolver); root.setTrustResolver(getTrustResolver());
root.setRoleHierarchy(getRoleHierarchy()); root.setRoleHierarchy(getRoleHierarchy());
root.setDefaultRolePrefix(defaultRolePrefix); root.setDefaultRolePrefix(getDefaultRolePrefix());
return root; return root;
} }
@ -189,6 +189,13 @@ public class DefaultMethodSecurityExpressionHandler extends
this.trustResolver = trustResolver; this.trustResolver = trustResolver;
} }
/**
* @return The current {@link AuthenticationTrustResolver}
*/
protected AuthenticationTrustResolver getTrustResolver() {
return trustResolver;
}
/** /**
* Sets the {@link ParameterNameDiscoverer} to use. The default is * Sets the {@link ParameterNameDiscoverer} to use. The default is
* {@link DefaultSecurityParameterNameDiscoverer}. * {@link DefaultSecurityParameterNameDiscoverer}.
@ -198,6 +205,13 @@ public class DefaultMethodSecurityExpressionHandler extends
this.parameterNameDiscoverer = parameterNameDiscoverer; this.parameterNameDiscoverer = parameterNameDiscoverer;
} }
/**
* @return The current {@link ParameterNameDiscoverer}
*/
protected ParameterNameDiscoverer getParameterNameDiscoverer() {
return parameterNameDiscoverer;
}
public void setPermissionCacheOptimizer( public void setPermissionCacheOptimizer(
PermissionCacheOptimizer permissionCacheOptimizer) { PermissionCacheOptimizer permissionCacheOptimizer) {
this.permissionCacheOptimizer = permissionCacheOptimizer; this.permissionCacheOptimizer = permissionCacheOptimizer;
@ -225,4 +239,11 @@ public class DefaultMethodSecurityExpressionHandler extends
public void setDefaultRolePrefix(String defaultRolePrefix) { public void setDefaultRolePrefix(String defaultRolePrefix) {
this.defaultRolePrefix = defaultRolePrefix; this.defaultRolePrefix = defaultRolePrefix;
} }
/**
* @return The default role prefix
*/
protected String getDefaultRolePrefix() {
return defaultRolePrefix;
}
} }