Disable ldap beans auto configuration (#2605)

This commit is contained in:
Roman Zabaluev 2022-09-19 16:32:47 +04:00 committed by GitHub
parent 3b8cbd1dbf
commit 596f4233fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions

View file

@ -192,10 +192,6 @@
<version>${antlr4-maven-plugin.version}</version> <version>${antlr4-maven-plugin.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-ldap</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId> <artifactId>spring-security-ldap</artifactId>

View file

@ -2,10 +2,11 @@ package com.provectus.kafka.ui;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication @SpringBootApplication(exclude = LdapAutoConfiguration.class)
@EnableScheduling @EnableScheduling
@EnableAsync @EnableAsync
public class KafkaUiApplication { public class KafkaUiApplication {

View file

@ -4,8 +4,10 @@ import java.util.List;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.ldap.core.support.BaseLdapPathContextSource; import org.springframework.ldap.core.support.BaseLdapPathContextSource;
import org.springframework.ldap.core.support.LdapContextSource; import org.springframework.ldap.core.support.LdapContextSource;
import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.AuthenticationManager;
@ -25,6 +27,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
@Configuration @Configuration
@EnableWebFluxSecurity @EnableWebFluxSecurity
@ConditionalOnProperty(value = "auth.type", havingValue = "LDAP") @ConditionalOnProperty(value = "auth.type", havingValue = "LDAP")
@Import(LdapAutoConfiguration.class)
@Slf4j @Slf4j
public class LdapSecurityConfig extends AbstractAuthSecurityConfig { public class LdapSecurityConfig extends AbstractAuthSecurityConfig {

View file

@ -11,9 +11,6 @@ management:
web: web:
exposure: exposure:
include: "info,health" include: "info,health"
health:
ldap:
enabled: false
logging: logging:
level: level: