SEC-144: Separate SecurityEnforcementFilter from FilterSecurityInterceptor.
This commit is contained in:
@@ -48,7 +48,7 @@
|
||||
<xsl:message terminate="yes">Unsupported auth-method in web.xml, must be FORM or BASIC</xsl:message>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<xsl:text>,rememberMeProcessingFilter,anonymousProcessingFilter,securityEnforcementFilter</xsl:text>
|
||||
<xsl:text>,rememberMeProcessingFilter,anonymousProcessingFilter,exceptionTranslationFilter,filterInvocationInterceptor</xsl:text>
|
||||
</xsl:variable>
|
||||
|
||||
<!--
|
||||
@@ -137,13 +137,12 @@
|
||||
</xsl:template>
|
||||
|
||||
<!--
|
||||
| Processes the login-config definition and inserts the SecurityEnforcementFilter with
|
||||
| Processes the login-config definition and inserts the ExceptionTranslationFilter with
|
||||
| the appropriate beans for either form or basic authentication.
|
||||
-->
|
||||
<xsl:template match="login-config">
|
||||
|
||||
<bean id="securityEnforcementFilter" class="org.acegisecurity.intercept.web.SecurityEnforcementFilter">
|
||||
<property name="filterSecurityInterceptor"><ref local="filterInvocationInterceptor"/></property>
|
||||
<bean id="exceptionTranslationFilter" class="org.acegisecurity.ui.ExceptionTranslationFilter">
|
||||
<property name="authenticationEntryPoint">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$auth-method = 'FORM'">
|
||||
|
||||
@@ -7,10 +7,9 @@ import javax.xml.transform.TransformerFactoryConfigurationError;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.acegisecurity.intercept.web.FilterSecurityInterceptor;
|
||||
import org.acegisecurity.intercept.web.SecurityEnforcementFilter;
|
||||
import org.acegisecurity.providers.ProviderManager;
|
||||
import org.acegisecurity.providers.dao.DaoAuthenticationProvider;
|
||||
import org.acegisecurity.ui.ExceptionTranslationFilter;
|
||||
import org.acegisecurity.userdetails.UserDetails;
|
||||
import org.acegisecurity.userdetails.memory.InMemoryDaoImpl;
|
||||
import org.acegisecurity.util.InMemoryResource;
|
||||
@@ -73,11 +72,10 @@ public class WebXmlConverterTests extends TestCase {
|
||||
assertNotNull(bf.getBean("rememberMeProcessingFilter"));
|
||||
assertNotNull(bf.getBean("rememberMeAuthenticationProvider"));
|
||||
|
||||
SecurityEnforcementFilter sef =
|
||||
(SecurityEnforcementFilter) bf.getBean("securityEnforcementFilter");
|
||||
assertNotNull(sef);
|
||||
assertNotNull(sef.getAuthenticationEntryPoint());
|
||||
FilterSecurityInterceptor fsi = sef.getFilterSecurityInterceptor();
|
||||
ExceptionTranslationFilter etf =
|
||||
(ExceptionTranslationFilter) bf.getBean("exceptionTranslationFilter");
|
||||
assertNotNull(etf);
|
||||
assertNotNull(etf.getAuthenticationEntryPoint());
|
||||
System.out.println(prettyPrint(converter.getNewWebXml()));
|
||||
System.out.println(prettyPrint(converter.getAcegiBeans()));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user