Skip to content

KNOX-3546: Fix criteria for determining if a search is for all groups #1503

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

Open
handavid wants to merge 2 commits into
base: master
Choose a base branch
from
Open

KNOX-3546: Fix criteria for determining if a search is for all groups #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8126bc1
KNOX-3546: Fix criteria for determining if a search is for all groups
handavid Nov 10, 2026
d77b37b
remove referral from top-level or node
handavid Nov 13, 2026
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
5 changes: 0 additions & 5 deletions .github/workflows/tests/test_knox_ldap_proxy_search_with_role_lookup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,6 @@ def test_list_all_roles_by_objectclass_presence(self) -> None:
groups = self.rdn_values(self.search(PROXY_GROUPS_BASE, "(objectClass=*)"))
self.assertEqual(ALL_ROLES, set(groups))

# ApacheDS hands the interceptors (|(objectClass=groupOfNames)(objectClass=referral)), which
# the roles lookup does not take for a list search from an ancestor of ou=groups. So the
# backend groups are translated instead and roles assigned only to users (platform:deployer)
# are missing.
@unittest.skip("root-level role listing misses roles assigned only to users")
def test_list_all_roles_from_proxy_root_with_group_filter(self) -> None:
"""Searching from the proxy root with a group objectClass filter lists all roles."""
entries = self.search(PROXY_BASE_DN, "(objectClass=groupOfNames)")
Expand Down
30 changes: 29 additions & 1 deletion ...in/java/org/apache/knox/gateway/services/ldap/interceptor/LDAPRolesLookupInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ public EntryFilteringCursor search(SearchOperationContext ctx) throws LdapExcept
private boolean isAllGroupsSearch(SearchOperationContext ctx) throws LdapException {
Dn proxyGroupSearchBaseDn = new Dn(schemaManager, proxyGroupSearchBase);
Dn searchDn = ctx.getDn();
ExprNode searchFilter = ctx.getFilter();
ExprNode rawSearchFilter = ctx.getFilter();
ExprNode searchFilter = removeReferral(rawSearchFilter);

if (searchDn == null) {
return false;
Expand All @@ -135,6 +136,22 @@ private boolean isAllGroupsSearch(SearchOperationContext ctx) throws LdapExcepti
&& isAllGroupsFilterForAncestor(searchFilter);
}

private ExprNode removeReferral(ExprNode rawSearchFilter) {
if (rawSearchFilter instanceof OrNode) {
OrNode orNode = (OrNode) rawSearchFilter;
if (orNode.getChildren().size() == 2) {
List<ExprNode> children = orNode.getChildren();
if (isReferralObjectClassFilter(children.get(0))) {
return children.get(1);
}
if (isReferralObjectClassFilter(children.get(1))) {
return children.get(0);
}
}
}
return rawSearchFilter;
}

private boolean isGroupObjectClassFilter(ExprNode filter) {
if (filter instanceof EqualityNode) {
EqualityNode<?> eqNode = (EqualityNode<?>) filter;
Expand All @@ -147,6 +164,17 @@ private boolean isGroupObjectClassFilter(ExprNode filter) {
return false;
}

private boolean isReferralObjectClassFilter(ExprNode filter) {
if (filter instanceof EqualityNode) {
EqualityNode<?> eqNode = (EqualityNode<?>) filter;
if ("objectClass".equalsIgnoreCase(eqNode.getAttribute())) {
String value = eqNode.getValue().toString();
return "referral".equalsIgnoreCase(value);
}
}
return false;
}

private boolean isAllGroupsFilterForAncestor(ExprNode filter) {
// Case 1: Simple objectClass evaluation (e.g., objectClass=groupOfNames)
if (isGroupObjectClassFilter(filter)) {
Expand Down
7 changes: 6 additions & 1 deletion ...ava/org/apache/knox/gateway/services/ldap/interceptor/LDAPRolesLookupInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,12 @@ public void testAllGroupsSearchFromRootWithGroupObjectClassFilter() throws Excep
"(objectClass=groupOfUniqueNames)",
"(&(objectClass=groupOfNames)(cn=*))",
"(&(objectClass=groupOfNames)(|(cn=viewer)(cn=*)))",
"(|(objectClass=groupOfUniqueNames)(objectClass=groupOfNames))")) {
"(|(objectClass=groupOfUniqueNames)(objectClass=groupOfNames))",
"(|(objectClass=groupOfNames)(objectClass=referral))",

@smolnar82 smolnar82 Nov 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two cases hand-write the wrapped form for the simple filters only. The other entries in this list (the AND and nested-OR ones) still go to the interceptor unwrapped, which never happens in production unless the client sends ManageDsaIT. That's the same blind spot the JIRA describes. Could we add a helper that wraps the way ApacheDS does, e.g. new OrNode(FilterParser.parse(schemaManager, filter), FilterParser.parse(schemaManager, "(objectClass=referral)")), and use it for every filter in this test? The JIRA also asks for the negative side: please wrap the filters in testRootSearchWithNonGroupFilterIsNotAllGroupsSearch (line 688) as well, so non-group filters are still not treated as listings once wrapped.

"(|(objectClass=groupOfUniqueNames)(objectClass=referral))",
"(|(&(objectClass=groupOfNames)(cn=*))(objectClass=referral))",
"(|(&(objectClass=groupOfNames)(|(cn=viewer)(cn=*)))(objectClass=referral))",
"(|(|(objectClass=groupOfUniqueNames)(objectClass=groupOfNames))(objectClass=referral))")) {
final LDAPRolesLookupService rolesService = EasyMock.createMock(LDAPRolesLookupService.class);
expect(rolesService.listRoles()).andReturn(List.of("viewer"));
replay(rolesService);
Expand Down