Skip to content

[stable15] resolve user and groups in nested groups first before filtering the results #14591

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
MorrisJobke merged 8 commits into from
Mar 8, 2019
Merged

[stable15] resolve user and groups in nested groups first before filtering the results #14591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fe169b0
user_ldap: Filter groups after nexted groups
Feb 7, 2018
0997fd9
user_ldap: really resolve nested groups
Feb 7, 2018
0a469e8
Reduce queries to LDAP by caching nested groups
Feb 7, 2018
3384e25
Fixed unit test: groupsMatchFilter will not be called multiple times …
Feb 8, 2018
a6c0d53
fix nested group retrieval also for 2 other cases
blizzz Mar 1, 2019
3ea24fa
with LDAP server set offline, config cannot be controlled via ocs any…
blizzz Mar 5, 2019
5c21e94
add missing config bits to integration tests
blizzz Mar 5, 2019
a358c4d
remove unused use statement
blizzz Mar 5, 2019
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
Prev Previous commit
Next Next commit
add missing config bits to integration tests 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Mar 7, 2019
commit 5c21e94db8ba88b907a3bd95af9715cfe964cb54
6 changes: 6 additions & 0 deletions build/integration/ldap_features/ldap-openldap.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ Feature: LDAP
| ldapNestedGroups | 1 |
| useMemberOfToDetectMembership | 1 |
| ldapUserFilter | (&(objectclass=inetorgperson)(!(uid=alice))) |
| ldapExpertUsernameAttr | uid |
| ldapGroupMemberAssocAttr | member |
And As an "admin"
# for population
And sending "GET" to "/cloud/groups"
Expand All @@ -129,6 +131,8 @@ Feature: LDAP
| ldapNestedGroups | 1 |
| useMemberOfToDetectMembership | 0 |
| ldapUserFilter | (&(objectclass=inetorgperson)(!(uid=alice))) |
| ldapExpertUsernameAttr | uid |
| ldapGroupMemberAssocAttr | member |
And As an "admin"
# for population
And sending "GET" to "/cloud/groups"
Expand All @@ -148,6 +152,8 @@ Feature: LDAP
| ldapNestedGroups | 1 |
| useMemberOfToDetectMembership | 1 |
| ldapUserFilter | (&(objectclass=inetorgperson)(!(uid=alice))) |
| ldapExpertUsernameAttr | uid |
| ldapGroupMemberAssocAttr | member |
And As an "admin"
# for population
And sending "GET" to "/cloud/groups"
Expand Down
1 change: 1 addition & 0 deletions build/integration/ldap_features/openldap-numerical-id.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Scenario: Test LDAP group membership with intermediate groups not matching filte
| ldapNestedGroups | 1 |
| useMemberOfToDetectMembership | 1 |
| ldapUserFilter | (&(objectclass=inetorgperson)(!(uid=alice))) |
| ldapGroupMemberAssocAttr | member |
And As an "admin"
# for population
And sending "GET" to "/cloud/groups"
Expand Down