|
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
+import org.springframework.context.annotation.Primary;
|
|
|
import org.springframework.core.io.ClassPathResource;
|
|
|
import org.springframework.security.config.ObjectPostProcessor;
|
|
|
import org.springframework.security.config.annotation.SecurityContextChangedListenerConfig;
|
|
@@ -77,7 +78,8 @@ public class X509ConfigurerTests {
|
|
|
@Test
|
|
|
public void configureWhenRegisteringObjectPostProcessorThenInvokedOnX509AuthenticationFilter() {
|
|
|
this.spring.register(ObjectPostProcessorConfig.class).autowire();
|
|
|
- verify(ObjectPostProcessorConfig.objectPostProcessor).postProcess(any(X509AuthenticationFilter.class));
|
|
|
+ ObjectPostProcessor<Object> objectPostProcessor = this.spring.getContext().getBean(ObjectPostProcessor.class);
|
|
|
+ verify(objectPostProcessor).postProcess(any(X509AuthenticationFilter.class));
|
|
|
}
|
|
|
|
|
|
@Test
|
|
@@ -193,7 +195,7 @@ public class X509ConfigurerTests {
|
|
|
@EnableWebSecurity
|
|
|
static class ObjectPostProcessorConfig {
|
|
|
|
|
|
- static ObjectPostProcessor<Object> objectPostProcessor = spy(ReflectingObjectPostProcessor.class);
|
|
|
+ ObjectPostProcessor<Object> objectPostProcessor = spy(ReflectingObjectPostProcessor.class);
|
|
|
|
|
|
@Bean
|
|
|
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
|
@@ -205,8 +207,9 @@ public class X509ConfigurerTests {
|
|
|
}
|
|
|
|
|
|
@Bean
|
|
|
- static ObjectPostProcessor<Object> objectPostProcessor() {
|
|
|
- return objectPostProcessor;
|
|
|
+ @Primary
|
|
|
+ ObjectPostProcessor<Object> objectPostProcessor() {
|
|
|
+ return this.objectPostProcessor;
|
|
|
}
|
|
|
|
|
|
}
|