Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected Javadoc for setRejectPublicInvocations (s/true/false) and tidied up code for validation of attributes

This commit is contained in:
Luke Taylor 2007-03-30 18:27:19 +00:00
parent 993f7e4af0
commit 6bfff55da3
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/main/java/org/acegisecurity/intercept/AbstractSecurityInterceptor.java
View File

@ -194,36 +194,32 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean, A
Iterator iter = this.obtainObjectDefinitionSource().getConfigAttributeDefinitions(); Iterator iter = this.obtainObjectDefinitionSource().getConfigAttributeDefinitions();
if (iter == null) { if (iter == null) {
if (logger.isWarnEnabled()) { logger.warn("Could not validate configuration attributes as the MethodDefinitionSource did not return "
logger.warn( + "a ConfigAttributeDefinition Iterator");
"Could not validate configuration attributes as the MethodDefinitionSource did not return a " return;
+ "ConfigAttributeDefinition Iterator"); }
}
} else {
Set set = new HashSet();
while (iter.hasNext()) { Set unsupportedAttrs = new HashSet();
ConfigAttributeDefinition def = (ConfigAttributeDefinition) iter.next();
Iterator attributes = def.getConfigAttributes();
while (attributes.hasNext()) { while (iter.hasNext()) {
ConfigAttribute attr = (ConfigAttribute) attributes.next(); ConfigAttributeDefinition def = (ConfigAttributeDefinition) iter.next();
Iterator attributes = def.getConfigAttributes();
if (!this.runAsManager.supports(attr) && !this.accessDecisionManager.supports(attr) while (attributes.hasNext()) {
&& ((this.afterInvocationManager == null) || !this.afterInvocationManager.supports(attr))) { ConfigAttribute attr = (ConfigAttribute) attributes.next();
set.add(attr);
} if (!this.runAsManager.supports(attr) && !this.accessDecisionManager.supports(attr)
&& ((this.afterInvocationManager == null) || !this.afterInvocationManager.supports(attr))) {
unsupportedAttrs.add(attr);
} }
} }
if (set.size() == 0) {
if (logger.isInfoEnabled()) {
logger.info("Validated configuration attributes");
}
} else {
throw new IllegalArgumentException("Unsupported configuration attributes: " + set.toString());
}
} }
if (unsupportedAttrs.size() != 0) {
throw new IllegalArgumentException("Unsupported configuration attributes: " + unsupportedAttrs);
}
logger.info("Validated configuration attributes");
} }
} }
@ -431,7 +427,7 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean, A
* attempt is made to invoke a secure object that has no configuration attributes. * attempt is made to invoke a secure object that has no configuration attributes.
* *
* @param rejectPublicInvocations set to <code>true</code> to reject invocations of secure objects that have no * @param rejectPublicInvocations set to <code>true</code> to reject invocations of secure objects that have no
* configuration attributes (by default it is <code>true</code> which treats undeclared secure objects as * configuration attributes (by default it is <code>false</code> which treats undeclared secure objects as
* "public" or unauthorized) * "public" or unauthorized)
*/ */
public void setRejectPublicInvocations(boolean rejectPublicInvocations) { public void setRejectPublicInvocations(boolean rejectPublicInvocations) {