Browse Source

Disable ldap beans auto configuration (#2605)

Roman Zabaluev 2 years ago
parent
commit
596f4233fc

+ 0 - 4
kafka-ui-api/pom.xml

@@ -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>

+ 2 - 1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/KafkaUiApplication.java

@@ -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 {

+ 3 - 0
kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java

@@ -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 {
 
 

+ 0 - 3
kafka-ui-api/src/main/resources/application.yml

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