From 1176d0cfdba189bde72c305d51ade15004e147d4 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Mon, 16 Sep 2019 13:56:17 -0600 Subject: [PATCH] Polish DefaultFilters,Issue55Tests Formatted HttpSecurity and WebSecurity configuration stacks Removed unnecessary code Issue gh-4939 --- .../web/configurers/DefaultFiltersTests.java | 29 ++++++++++------ .../web/configurers/Issue55Tests.java | 34 +++++++++---------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java index f74ace6b52..5629c12452 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java @@ -15,8 +15,15 @@ */ package org.springframework.security.config.annotation.web.configurers; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; +import javax.servlet.Filter; +import javax.servlet.ServletException; + import org.junit.Rule; import org.junit.Test; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,12 +59,6 @@ import org.springframework.security.web.servletapi.SecurityContextHolderAwareReq import org.springframework.security.web.session.SessionManagementFilter; import org.springframework.security.web.util.matcher.AnyRequestMatcher; -import javax.servlet.Filter; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.List; -import java.util.stream.Collectors; - import static org.assertj.core.api.Assertions.assertThat; /** @@ -79,9 +80,11 @@ public class DefaultFiltersTests { static class FilterChainProxyBuilderMissingConfig { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth - .inMemoryAuthentication() + .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } } @@ -146,17 +149,21 @@ public class DefaultFiltersTests { @EnableWebSecurity static class FilterChainProxyBuilderIgnoringConfig extends WebSecurityConfigurerAdapter { @Override - public void configure(WebSecurity builder) throws Exception { - builder - .ignoring() + public void configure(WebSecurity web) throws Exception { + // @formatter:off + web + .ignoring() .antMatchers("/resources/**"); + // @formatter:on } @Override protected void configure(HttpSecurity http) throws Exception { + // @formatter:off http - .authorizeRequests() + .authorizeRequests() .anyRequest().hasRole("USER"); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/Issue55Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/Issue55Tests.java index 26acf4ea25..62aeedce86 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/Issue55Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/Issue55Tests.java @@ -15,8 +15,13 @@ */ package org.springframework.security.config.annotation.web.configurers; +import java.lang.reflect.InvocationTargetException; +import java.util.List; +import javax.servlet.Filter; + import org.junit.Rule; import org.junit.Test; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; @@ -31,14 +36,8 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; -import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.stereotype.Component; -import javax.servlet.Filter; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - import static org.assertj.core.api.Java6Assertions.assertThat; /** @@ -68,9 +67,11 @@ public class Issue55Tests { @Override protected void configure(HttpSecurity http) throws Exception { + // @formatter:off http - .authorizeRequests() + .authorizeRequests() .anyRequest().hasRole("USER"); + // @formatter:on } } @@ -96,12 +97,6 @@ public class Issue55Tests { assertThat(secondFilter.getAuthenticationManager().authenticate(token)).isEqualTo(CustomAuthenticationManager.RESULT); } - private AuthenticationManager getAuthManager(AbstractAuthenticationProcessingFilter filter) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { - final Method getAuthenticationManager = filter.getClass().getDeclaredMethod("getAuthenticationManager"); - getAuthenticationManager.setAccessible(true); - return (AuthenticationManager) getAuthenticationManager.invoke(filter); - } - @EnableWebSecurity static class MultiWebSecurityConfigurerAdapterDefaultsAuthManagerConfig { @Component @@ -109,10 +104,11 @@ public class Issue55Tests { public static class ApiWebSecurityAdapter extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { - http - .antMatcher("/api/**") - .authorizeRequests() + // @formatter:off + http.antMatcher("/api/**") + .authorizeRequests() .anyRequest().hasRole("USER"); + // @formatter:on } } @@ -120,9 +116,11 @@ public class Issue55Tests { public static class WebSecurityAdapter extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { + // @formatter:off http - .authorizeRequests() + .authorizeRequests() .anyRequest().hasRole("USER"); + // @formatter:on } } @@ -143,7 +141,7 @@ public class Issue55Tests { } } - protected Filter findFilter(Class filter, int index) { + Filter findFilter(Class filter, int index) { List filters = filterChain(index).getFilters(); for (Filter it : filters) { if (filter.isAssignableFrom(it.getClass())) {