mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-03 21:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from owncloud/fix-search

Browse Source 
Extend query if searchBaseDN already is a user/group
This commit is contained in:
Jörn Friedrich Dreyer
2020-09-09 08:36:52 +02:00
committed by GitHub
parent 1081de7c60 d5c5b3b16f
commit 796c8be20c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/fix-searchbasedn.md Normal file
View File

@@ -0,0 +1,6 @@
Bugfix: Use searchBaseDN if already a user/group name
In case of the searchBaseDN already referencing a user or group, the search query was ignoring the user/group name entirely, because the searchBaseDN is not part of the LDAP filters. We fixed this by including an additional query part if the searchBaseDN contains a CN.
https://github.com/owncloud/product/issues/214
https://github.com/owncloud/ocis-glauth/pull/32

11
pkg/server/glauth/handler.go
View File

@@ -143,6 +143,15 @@ func (h ocisHandler) Search(bindDN string, searchReq ldap.SearchRequest, conn ne
ResultCode: code,
}, fmt.Errorf("Search Error: error parsing filter: %s", searchReq.Filter)
}
// check if the searchBaseDN already has a username and add it to the query
parts := strings.Split(strings.TrimSuffix(searchBaseDN, baseDN), ",")
if len(parts) > 0 && strings.HasPrefix(parts[0], "cn=") {
if len(query) > 0 {
query += " AND "
}
query += fmt.Sprintf("on_premises_sam_account_name eq '%s'", escapeValue(strings.TrimPrefix(parts[0], "cn=")))
}
}
entries := []*ldap.Entry{}
@@ -292,7 +301,7 @@ func (h ocisHandler) mapGroups(groups []*accounts.Group) []*ldap.Entry {
return entries
}
// LDAP filters might ask for grouips and users at the same time, eg.
// LDAP filters might ask for groups and users at the same time, eg.
// (|
// (&(objectClass=posixaccount)(cn=einstein))
// (&(objectClass=posixgroup)(cn=users))