Skip to content

Expose bean setters in @Configuration used by @EnableWebFluxSecurity #6761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2019
Merged

Expose bean setters in @Configuration used by @EnableWebFluxSecurity #6761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions ...ingframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,44 @@ class ServerHttpSecurityConfiguration implements WebFluxConfigurer {
private static final String BEAN_NAME_PREFIX = "org.springframework.security.config.annotation.web.reactive.HttpSecurityConfiguration.";
private static final String HTTPSECURITY_BEAN_NAME = BEAN_NAME_PREFIX + "httpSecurity";

@Autowired(required = false)
private ReactiveAdapterRegistry adapterRegistry = new ReactiveAdapterRegistry();

@Autowired(required = false)
private ReactiveAuthenticationManager authenticationManager;

@Autowired(required = false)
private ReactiveUserDetailsService reactiveUserDetailsService;

@Autowired(required = false)
private PasswordEncoder passwordEncoder;

@Autowired(required = false)
private ReactiveUserDetailsPasswordService userDetailsPasswordService;

@Autowired(required = false)
private BeanFactory beanFactory;

@Autowired(required = false)
void setAdapterRegistry(ReactiveAdapterRegistry adapterRegistry) {
this.adapterRegistry = adapterRegistry;
}

@Autowired(required = false)
void setAuthenticationManager(ReactiveAuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
}

@Autowired(required = false)
void setReactiveUserDetailsService(ReactiveUserDetailsService reactiveUserDetailsService) {
this.reactiveUserDetailsService = reactiveUserDetailsService;
}

@Autowired(required = false)
void setPasswordEncoder(PasswordEncoder passwordEncoder) {
this.passwordEncoder = passwordEncoder;
}

@Autowired(required = false)
void setUserDetailsPasswordService(ReactiveUserDetailsPasswordService userDetailsPasswordService) {
this.userDetailsPasswordService = userDetailsPasswordService;
}

@Override
public void configureArgumentResolvers(ArgumentResolverConfigurer configurer) {
configurer.addCustomResolver(authenticationPrincipalArgumentResolver());
Expand Down
6 changes: 5 additions & 1 deletion ...springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,16 @@ class WebFluxSecurityConfiguration {
private static final boolean isOAuth2Present = ClassUtils.isPresent(
REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME, WebFluxSecurityConfiguration.class.getClassLoader());

@Autowired(required = false)
private List<SecurityWebFilterChain> securityWebFilterChains;

@Autowired
ApplicationContext context;

@Autowired(required = false)
void setSecurityWebFilterChains(List<SecurityWebFilterChain> securityWebFilterChains) {
this.securityWebFilterChains = securityWebFilterChains;
}

@Bean(SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME)
@Order(value = WEB_FILTER_CHAIN_FILTER_ORDER)
public WebFilterChainProxy springSecurityWebFilterChainFilter() {
Expand Down