Roman Zabaluev 2 лет назад
Родитель
Сommit
dbead4dadc

+ 2 - 2
kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java

@@ -9,7 +9,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class LdapProperties {
 
   private String urls;
-  private String base; // TODO was dnPattern
+  private String base;
   private String adminUser;
   private String adminPassword;
   private String userFilterSearchBase;
@@ -17,7 +17,7 @@ public class LdapProperties {
 
   @Value("${oauth2.ldap.activeDirectory:false}")
   private boolean isActiveDirectory;
-  @Value("${oauth2.ldap.aсtiveDirectory.domain:null}") // TODO null is a string here for some reason
+  @Value("${oauth2.ldap.aсtiveDirectory.domain:@null}")
   private String activeDirectoryDomain;
 
   @Value("${oauth2.ldap.groupRoleAttribute:cn}")

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

@@ -71,7 +71,7 @@ public class LdapSecurityConfig {
           : new LdapAuthenticationProvider(ba);
     } else {
       authenticationProvider = new ActiveDirectoryLdapAuthenticationProvider(props.getActiveDirectoryDomain(),
-          props.getUrls()); // TODO authority extractor
+          props.getUrls()); // TODO verify authorities get extracted properly
       authenticationProvider.setUseAuthenticationRequestCredentials(true);
     }
 
@@ -102,8 +102,6 @@ public class LdapSecurityConfig {
       log.info("Active Directory support for LDAP has been enabled.");
     }
 
-    //http.authenticationManager(authenticationManager())
-
     return http
         .authorizeExchange()
         .pathMatchers(AUTH_WHITELIST)