Skip to content

BE: Auth: Fix LDAP SPEL #1019

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

Merged
merged 3 commits into from
Apr 21, 2025
Merged

BE: Auth: Fix LDAP SPEL #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00f042f
BE: Auth: Fix LDAP SPEL
Haarolean Apr 13, 2025
4025436
Merge branch 'main' into fix/ldap-spel
Haarolean Apr 13, 2025
31b0dec
Throw a warning when no value is set
Haarolean Apr 13, 2025
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 api/src/main/java/io/kafbat/ui/config/auth/LdapProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class LdapProperties {

@Value("${oauth2.ldap.activeDirectory:false}")
private boolean isActiveDirectory;
@Value("${oauth2.ldap.activeDirectory.domain:@null}")
@Value("${oauth2.ldap.activeDirectory.domain:#{null}}")
private String activeDirectoryDomain;

}
5 changes: 5 additions & 0 deletions api/src/main/java/io/kafbat/ui/config/auth/LdapSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.util.stream.Stream;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
Expand Down Expand Up @@ -163,6 +164,10 @@ public SecurityWebFilterChain configureLdap(ServerHttpSecurity http) {
}

private ActiveDirectoryLdapAuthenticationProvider activeDirectoryProvider(LdapAuthoritiesPopulator populator) {
if (StringUtils.isBlank(props.getActiveDirectoryDomain())) {
throw new IllegalArgumentException("Active Directory domain is required but not specified");
}

ActiveDirectoryLdapAuthenticationProvider provider = new ActiveDirectoryLdapAuthenticationProvider(
props.getActiveDirectoryDomain(),
props.getUrls()
Expand Down
Loading