root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 21 Packages Projects Releases Wiki Activity

Support add nested security configurers during builder initialization 

Closes gh-17011

Signed-off-by: DingHao <dh.hiekn@gmail.com>
This commit is contained in:
DingHao 2025-04-30 14:54:32 +08:00
parent 9df3a57d9e
commit e712ccda9b
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,6 +50,7 @@ import org.springframework.web.filter.DelegatingFilterProxy;
* @param <O> The object that this builder returns * @param <O> The object that this builder returns
* @param <B> The type of this builder (that is returned by the base class) * @param <B> The type of this builder (that is returned by the base class)
* @author Rob Winch * @author Rob Winch
* @author DingHao
* @see WebSecurity * @see WebSecurity
*/ */
public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBuilder<O>> public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBuilder<O>>
@ -386,8 +387,10 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
for (SecurityConfigurer<O, B> configurer : configurers) { for (SecurityConfigurer<O, B> configurer : configurers) {
configurer.init((B) this); configurer.init((B) this);
} }
for (SecurityConfigurer<O, B> configurer : this.configurersAddedInInitializing) { while (!this.configurersAddedInInitializing.isEmpty()) {
configurer.init((B) this); for (SecurityConfigurer<O, B> configurer : getConfigurersInInitializing()) {
configurer.init((B) this);
}
} }
} }
@ -407,6 +410,12 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
return result; return result;
} }
private List<SecurityConfigurer<O, B>> getConfigurersInInitializing() {
List<SecurityConfigurer<O, B>> result = new ArrayList<>(this.configurersAddedInInitializing);
this.configurersAddedInInitializing.clear();
return result;
}
/** /**
* Determines if the object is unbuilt. * Determines if the object is unbuilt.
* @return true, if unbuilt else false * @return true, if unbuilt else false

30
config/src/test/java/org/springframework/security/config/annotation/web/AbstractConfiguredSecurityBuilderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -163,6 +163,34 @@ public class AbstractConfiguredSecurityBuilderTests {
assertThat(this.builder.getConfigurers(TestSecurityConfigurer.class)).hasSize(1); assertThat(this.builder.getConfigurers(TestSecurityConfigurer.class)).hasSize(1);
} }
@Test
public void withWhenConfigurerAddInitializing() throws Exception {
this.builder.with(new FooConfigurer(), Customizer.withDefaults());
assertThat(this.builder.build()).isEqualTo("success");
}
private static class FooConfigurer extends SecurityConfigurerAdapter<Object, TestConfiguredSecurityBuilder> {
@Override
public void init(TestConfiguredSecurityBuilder builder) throws Exception {
builder.with(new BarConfigurer(), Customizer.withDefaults());
}
}
private static class BarConfigurer extends SecurityConfigurerAdapter<Object, TestConfiguredSecurityBuilder> {
@Override
public void init(TestConfiguredSecurityBuilder http) throws Exception {
http.with(new CooConfigurer(), Customizer.withDefaults());
}
}
private static class CooConfigurer extends SecurityConfigurerAdapter<Object, TestConfiguredSecurityBuilder> {
}
private static class ApplyAndRemoveSecurityConfigurer private static class ApplyAndRemoveSecurityConfigurer
extends SecurityConfigurerAdapter<Object, TestConfiguredSecurityBuilder> { extends SecurityConfigurerAdapter<Object, TestConfiguredSecurityBuilder> {