Skip to content

Use correct logger for user details configuration warning #19637

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

Open
avsan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use correct logger for user details configuration warning #19637

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
2 changes: 1 addition & 1 deletion ...g/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void init(AuthenticationManagerBuilder auth) {

class InitializeUserDetailsManagerConfigurer extends GlobalAuthenticationConfigurerAdapter {

private final Log logger = LogFactory.getLog(getClass());
private final Log logger = LogFactory.getLog(InitializeUserDetailsBeanManagerConfigurer.class);

@Override
public void configure(AuthenticationManagerBuilder auth) {
Expand Down
30 changes: 30 additions & 0 deletions ...rity/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@

package org.springframework.security.config.annotation.authentication.configuration;

import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -266,6 +271,31 @@ public void getAuthenticationWhenAuthenticationProviderAndUserDetailsBeanThenAut
am.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("user", "password"));
}

@Test
public void getAuthenticationWhenAuthenticationProviderAndUserDetailsBeanThenWarningUsesConfigurerLogger()
throws Exception {
Logger rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
ListAppender<ILoggingEvent> appender = new ListAppender<>();
appender.start();
rootLogger.addAppender(appender);

try {
this.spring.register(AuthenticationProviderBeanAndUserDetailsServiceConfig.class).autowire();

this.spring.getContext().getBean(AuthenticationConfiguration.class).getAuthenticationManager();

assertThat(appender.list)
.filteredOn(
(event) -> event.getFormattedMessage().contains("UserDetailsService beans will not be used"))
.extracting(ILoggingEvent::getLoggerName)
.containsExactly(InitializeUserDetailsBeanManagerConfigurer.class.getName());
}
finally {
rootLogger.detachAppender(appender);
appender.stop();
}
}

// gh-3091
@Test
public void getAuthenticationWhenAuthenticationProviderBeanThenUsed() throws Exception {
Expand Down