Skip to content

Commit 5f17a42

Browse files
authored
BE: Auth: Fix LDAP SPEL (#1019)
1 parent cbcf582 commit 5f17a42

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

api/src/main/java/io/kafbat/ui/config/auth/LdapProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class LdapProperties {
2020

2121
@Value("${oauth2.ldap.activeDirectory:false}")
2222
private boolean isActiveDirectory;
23-
@Value("${oauth2.ldap.activeDirectory.domain:@null}")
23+
@Value("${oauth2.ldap.activeDirectory.domain:#{null}}")
2424
private String activeDirectoryDomain;
2525

2626
}

api/src/main/java/io/kafbat/ui/config/auth/LdapSecurityConfig.java

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.stream.Stream;
1313
import lombok.RequiredArgsConstructor;
1414
import lombok.extern.slf4j.Slf4j;
15+
import org.apache.commons.lang3.StringUtils;
1516
import org.springframework.beans.factory.annotation.Autowired;
1617
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1718
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -163,6 +164,10 @@ public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
163164
}
164165

165166
private ActiveDirectoryLdapAuthenticationProvider activeDirectoryProvider(LdapAuthoritiesPopulator populator) {
167+
if (StringUtils.isBlank(props.getActiveDirectoryDomain())) {
168+
throw new IllegalArgumentException("Active Directory domain is required but not specified");
169+
}
170+
166171
ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider(
167172
props.getActiveDirectoryDomain(),
168173
props.getUrls()

0 commit comments

Comments
 (0)