Skip to content
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

RBAC: LDAP: Support group search filter filter and subtree search #3884

Closed
wants to merge 6 commits into from
Closed

RBAC: LDAP: Support group search filter filter and subtree search #3884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
32e8d3c
RBAC: LDAP: Support group search filter filter alongside with base
Haarolean May 30, 2023
8a62076
Merge branch 'master' into issues/3883
Haarolean May 30, 2023
91af2be
Search subtree true
Haarolean Jun 1, 2023
1c8e930
Review fixes
Haarolean Jun 26, 2023
0f00a29
Merge branch 'master' into issues/3883
iliax Jun 26, 2023
fb9ef2d
Merge branch 'master' into issues/3883
Haarolean Jun 26, 2023
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
1 change: 1 addition & 0 deletions kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class LdapProperties {
private String userFilterSearchBase;
private String userFilterSearchFilter;
private String groupFilterSearchBase;
private String groupFilterSearchFilter;

@Value("${oauth2.ldap.activeDirectory:false}")
private boolean isActiveDirectory;
Expand Down
3 changes: 3 additions & 0 deletions kafka-ui-api/src/main/java/com/provectus/kafka/ui/config/auth/LdapSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.provectus.kafka.ui.service.rbac.AccessControlService;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import javax.annotation.Nullable;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -99,8 +100,10 @@ public BaseLdapPathContextSource contextSource() {
@Primary
public LdapAuthoritiesPopulator ldapAuthoritiesPopulator(BaseLdapPathContextSource contextSource) {
var authoritiesPopulator = new DefaultLdapAuthoritiesPopulator(contextSource, props.getGroupFilterSearchBase());
Optional.ofNullable(props.getGroupFilterSearchFilter()).ifPresent(authoritiesPopulator::setGroupSearchFilter);
authoritiesPopulator.setRolePrefix("");
authoritiesPopulator.setConvertToUpperCase(false);
authoritiesPopulator.setSearchSubtree(true);
return authoritiesPopulator;
}

Expand Down