Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1202: Removed SpringSecurityFilter and replaced with use of GenericFilterBean from spring-web

Browse Source
This commit is contained in:
Luke Taylor
2009-08-10 14:18:18 +00:00
parent b807f7cbdd
commit f536c80020
36 changed files with 225 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java
View File

@@ -149,9 +149,7 @@ public class ChannelProcessingFilterTests {
filter.setSecurityMetadataSource(fids);
assertSame(fids, filter.getSecurityMetadataSource());
filter.init(null);
filter.afterPropertiesSet();
filter.destroy();
}
//~ Inner Classes ==================================================================================================

7
web/src/test/java/org/springframework/security/web/authentication/AnonymousProcessingFilterTests.java
View File

@@ -58,11 +58,10 @@ public class AnonymousProcessingFilterTests extends TestCase {
//~ Methods ========================================================================================================
private void executeFilterInContainerSimulator(FilterConfig filterConfig, Filter filter, ServletRequest request,
ServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
filter.init(filterConfig);
ServletResponse response, FilterChain filterChain) throws ServletException, IOException {
// filter.init(filterConfig);
filter.doFilter(request, response, filterChain);
filter.destroy();
// filter.destroy();
}
protected void setUp() throws Exception {

2
web/src/test/java/org/springframework/security/web/authentication/AuthenticationProcessingFilterTests.java
View File

@@ -52,7 +52,7 @@ public class AuthenticationProcessingFilterTests extends TestCase {
UsernamePasswordAuthenticationProcessingFilter filter = new UsernamePasswordAuthenticationProcessingFilter();
assertEquals("/j_spring_security_check", filter.getFilterProcessesUrl());
filter.setAuthenticationManager(createAuthenticationManager());
filter.init(null);
// filter.init(null);
Authentication result = filter.attemptAuthentication(request, new MockHttpServletResponse());
assertTrue(result != null);

1
web/src/test/java/org/springframework/security/web/authentication/preauth/header/RequestHeaderPreAuthenticatedProcessingFilterTests.java
View File

@@ -37,7 +37,6 @@ public class RequestHeaderPreAuthenticatedProcessingFilterTests {
MockHttpServletResponse response = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain();
RequestHeaderPreAuthenticatedProcessingFilter filter = new RequestHeaderPreAuthenticatedProcessingFilter();
filter.getOrder();
filter.doFilter(request, response, chain);
}

7
web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeProcessingFilterTests.java
View File

@@ -56,11 +56,10 @@ public class RememberMeProcessingFilterTests extends TestCase {
//~ Methods ========================================================================================================
private void executeFilterInContainerSimulator(FilterConfig filterConfig, Filter filter, ServletRequest request,
ServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
filter.init(filterConfig);
ServletResponse response, FilterChain filterChain) throws ServletException, IOException {
// filter.init(filterConfig);
filter.doFilter(request, response, filterChain);
filter.destroy();
// filter.destroy();
}
protected void setUp() throws Exception {

4
web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserProcessingFilterTests.java
View File

@@ -161,7 +161,7 @@ public class SwitchUserProcessingFilterTests {
// Check it with no url set (should get a text response)
FilterChain chain = mock(FilterChain.class);
filter.doFilterHttp(request, response, chain);
filter.doFilter(request, response, chain);
verify(chain, never()).doFilter(request, response);
assertEquals("Authentication Failed: User is disabled", response.getErrorMessage());
@@ -177,7 +177,7 @@ public class SwitchUserProcessingFilterTests {
response = new MockHttpServletResponse();
chain = mock(FilterChain.class);
filter.doFilterHttp(request, response, chain);
filter.doFilter(request, response, chain);
verify(chain, never()).doFilter(request, response);
assertEquals("/mywebapp/switchfailed", response.getRedirectedUrl());

5
web/src/test/java/org/springframework/security/web/authentication/www/BasicProcessingFilterTests.java
View File

@@ -24,7 +24,6 @@ import java.io.IOException;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -63,13 +62,13 @@ public class BasicProcessingFilterTests {
private MockHttpServletResponse executeFilterInContainerSimulator(Filter filter, final ServletRequest request,
final boolean expectChainToProceed) throws ServletException, IOException {
filter.init(mock(FilterConfig.class));
// filter.init(mock(FilterConfig.class));
final MockHttpServletResponse response = new MockHttpServletResponse();
FilterChain chain = mock(FilterChain.class);
filter.doFilter(request, response, chain);
filter.destroy();
// filter.destroy();
verify(chain, expectChainToProceed ? times(1) : never()).doFilter(any(ServletRequest.class), any(ServletResponse.class));
return response;

4
web/src/test/java/org/springframework/security/web/authentication/www/DigestProcessingFilterTests.java
View File

@@ -87,8 +87,6 @@ public class DigestProcessingFilterTests {
private MockHttpServletResponse executeFilterInContainerSimulator(Filter filter, final ServletRequest request,
final boolean expectChainToProceed) throws ServletException, IOException {
filter.init(mock(FilterConfig.class));
final MockHttpServletResponse response = new MockHttpServletResponse();
Mockery jmockContext = new JUnit4Mockery();
@@ -99,7 +97,7 @@ public class DigestProcessingFilterTests {
}});
filter.doFilter(request, response, chain);
filter.destroy();
jmockContext.assertIsSatisfied();
return response;
}

4
web/src/test/java/org/springframework/security/web/context/HttpSessionContextIntegrationFilterTests.java
View File

@@ -59,9 +59,9 @@ public class HttpSessionContextIntegrationFilterTests extends TestCase {
FilterConfig filterConfig, Filter filter, ServletRequest request,
ServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
filter.init(filterConfig);
// filter.init(filterConfig);
filter.doFilter(request, response, filterChain);
filter.destroy();
// filter.destroy();
}
public void testDetectsIncompatibleSessionProperties() throws Exception {

2
web/src/test/java/org/springframework/security/web/wrapper/SecurityContextHolderAwareRequestFilterTests.java
View File

@@ -42,7 +42,7 @@ public class SecurityContextHolderAwareRequestFilterTests {
public void expectedRequestWrapperClassIsUsed() throws Exception {
SecurityContextHolderAwareRequestFilter filter = new SecurityContextHolderAwareRequestFilter();
filter.setRolePrefix("ROLE_");
filter.init(jmock.mock(FilterConfig.class));
// filter.init(jmock.mock(FilterConfig.class));
final FilterChain filterChain = jmock.mock(FilterChain.class);
jmock.checking(new Expectations() {{