SEC-271: added AuthorizationManagerBeanDefinitionParser

sandbox/spring-security-config/basicauth/BasicProcessingFilterEntryPoint.java

@@ -32,26 +32,39 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.Ordered;
 import org.springframework.util.Assert;
 
-
 /**
- * Used by the <code>SecurityEnforcementFilter</code> to commence authentication via the {@link
+ * Used by the <code>SecurityEnforcementFilter</code> to commence
- * BasicProcessingFilter}.<P>Once a user agent is authenticated using BASIC authentication, logout requires that
+ * authentication via the {@link BasicProcessingFilter}.
- * the browser be closed or an unauthorized (401) header be sent. The simplest way of achieving the latter is to call
+ * <P>
- * the {@link #commence(ServletRequest, ServletResponse, AuthenticationException)} method below. This will indicate to
+ * Once a user agent is authenticated using BASIC authentication, logout
- * the browser its credentials are no longer authorized, causing it to prompt the user to login again.</p>
+ * requires that the browser be closed or an unauthorized (401) header be sent.
+ * The simplest way of achieving the latter is to call the
+ * {@link #commence(ServletRequest, ServletResponse, AuthenticationException)}
+ * method below. This will indicate to the browser its credentials are no longer
+ * authorized, causing it to prompt the user to login again.
+ * </p>
  * 
  * @author Ben Alex
- * @version $Id: BasicProcessingFilterEntryPoint.java 1822 2007-05-17 12:20:16Z vishalpuri $
+ * @version $Id: BasicProcessingFilterEntryPoint.java 1822 2007-05-17 12:20:16Z
+ * vishalpuri $
  */
-public class BasicProcessingFilterEntryPoint implements AuthenticationEntryPoint, InitializingBean, Ordered, ApplicationContextAware {
+public class BasicProcessingFilterEntryPoint implements AuthenticationEntryPoint, InitializingBean, Ordered,
-    //~ Instance fields ================================================================================================
+		ApplicationContextAware {
-
+	// ~ Static fields/initializers
+	// =====================================================================================
 	private static final int DEFAULT_ORDER = Integer.MAX_VALUE;
+
+	// ~ Instance fields
+	// ================================================================================================
+
 	private String realmName;
+
 	private int order = DEFAULT_ORDER;
+
 	private ApplicationContext applicationContext;
 
-    //~ Methods ========================================================================================================
+	// ~ Methods
+	// ========================================================================================================
 
 	public int getOrder() {
 		return order;

sandbox/spring-security-config/src/main/java/org/acegisecurity/config/FilterSecurityInterceptorBeanDefinitionParser.java

@@ -1,22 +1,17 @@
 package org.acegisecurity.config;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
+import org.acegisecurity.AccessDecisionManager;
 import org.acegisecurity.intercept.web.FilterInvocationDefinitionDecorator;
 import org.acegisecurity.intercept.web.FilterInvocationDefinitionSourceMapping;
 import org.acegisecurity.intercept.web.FilterSecurityInterceptor;
 import org.acegisecurity.intercept.web.PathBasedFilterInvocationDefinitionMap;
 import org.acegisecurity.intercept.web.RegExpBasedFilterInvocationDefinitionMap;
 import org.acegisecurity.util.BeanDefinitionParserUtils;
-import org.acegisecurity.vote.AffirmativeBased;
-import org.acegisecurity.vote.AuthenticatedVoter;
-import org.acegisecurity.vote.RoleVoter;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -50,7 +45,7 @@ public class FilterSecurityInterceptorBeanDefinitionParser extends AbstractBeanD
 			ParserContext parserContext) {
 		RootBeanDefinition filterInvocationInterceptor = new RootBeanDefinition(FilterSecurityInterceptor.class);
 
-		RootBeanDefinition accessDecisionManager = createAccessDecisionManagerAffirmativeBased();
+		RootBeanDefinition accessDecisionManager = AuthorizationManagerBeanDefinitionParser.createAccessDecisionManagerAffirmativeBased();
 		filterInvocationInterceptor.getPropertyValues()
 				.addPropertyValue("accessDecisionManager", accessDecisionManager);
 
@@ -155,16 +150,6 @@ public class FilterSecurityInterceptorBeanDefinitionParser extends AbstractBeanD
 		return filterInvocationInterceptor;
 	}
 
-	protected static RootBeanDefinition createAccessDecisionManagerAffirmativeBased() {
+	
-		ManagedList decisionVoters = new ManagedList();
-		RootBeanDefinition accessDecisionManager = new RootBeanDefinition(AffirmativeBased.class);
-		accessDecisionManager.getPropertyValues().addPropertyValue("allowIfAllAbstainDecisions", Boolean.FALSE);
-		RootBeanDefinition authenticatedVoter = new RootBeanDefinition(AuthenticatedVoter.class);
-		RootBeanDefinition roleVoter = new RootBeanDefinition(RoleVoter.class);
-		decisionVoters.add(authenticatedVoter);
-		decisionVoters.add(roleVoter);
-		accessDecisionManager.getPropertyValues().addPropertyValue("decisionVoters", decisionVoters);
-		return accessDecisionManager;
-	}
 
 }

sandbox/spring-security-config/src/main/java/org/acegisecurity/config/SecurityNamespaceHandler.java

@@ -28,6 +28,7 @@ public class SecurityNamespaceHandler extends NamespaceHandlerSupport {
 		registerBeanDefinitionParser("logout-support", new LogoutFilterBeanDefinitionParser());
 		registerBeanDefinitionParser("exception-translation", new ExceptionTranslationFilterBeanDefinitionParser());
 		registerBeanDefinitionParser("authentication-form", new AuthenticationProcessingFilterBeanDefinitionParser());
+		registerBeanDefinitionParser("authorization-manager", new AuthorizationManagerBeanDefinitionParser());
 		registerBeanDefinitionParser("authorization-http-url", new FilterSecurityInterceptorBeanDefinitionParser());
 		registerBeanDefinitionParser("autoconfig", new AutoConfigBeanDefinitionParser());
 	}

sandbox/spring-security-config/src/main/resources/org/acegisecurity/config/spring-security-2.0.xsd

@@ -561,6 +561,32 @@
 		<xsd:attribute name="attribute" type="xsd:string" />
 	</xsd:complexType>
 	
+	<xsd:element name="authorization-manager" type="AuthorizationManagerType"/>
+	
+	<xsd:complexType name="AuthorizationManagerType">
+		<xsd:sequence>
+			<xsd:element name="role-voter" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="authenticated-voter" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID">
+			<xsd:annotation>
+				<xsd:documentation>
+					<![CDATA[
+	The unique identifier for a bean.
+				]]>
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="strategy" type="response" default="affirmative"/>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="response">
+		<xsd:restriction base="xsd:NMTOKEN">
+			<xsd:enumeration value="consensus" />
+			<xsd:enumeration value="unanimous" />
+			<xsd:enumeration value="affirmative" />
+		</xsd:restriction>
+	</xsd:simpleType>
 
 	<!-- simple internal types -->
 	<xsd:simpleType name="defaultable-boolean">

sandbox/spring-security-config/src/test/resources/org/acegisecurity/config/security-namespaces.xml

@@ -37,7 +37,7 @@
 		and uses their Ordered interface to apply them; if one doesn't implement Ordered, assume it is Integer.MAX_VALUE -->
 	<security:authorization-manager id="id"
 		strategy="consensus|unanimous|affirmative" />
-	t
+
 
 	<!-- ======================== AUTHENTICATION ======================= -->