github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-01 22:39:13 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fixed LDAP group sync using wrong user filter

Browse Source 
LDAP group sync was trying to find users based on the external_auth_id
which is not garunteed to match the username entered so somtimes
the search for a user would fail.

This passes the username to the group sync.
Picked up by @yoyokko in #959.
This commit is contained in:
Dan Brown
2018-08-19 15:24:42 +01:00
parent 01260d95f3
commit d2a9b312e9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Services/LdapService.php
View File

@ -299,11 +299,12 @@ class LdapService
/**
* Sync the LDAP groups to the user roles for the current user
* @param \BookStack\User $user
* @param string $username
* @throws LdapException
*/
public function syncGroups(User $user)
public function syncGroups(User $user, string $username)
{
$userLdapGroups = $this->getUserGroups($user->external_auth_id);
$userLdapGroups = $this->getUserGroups($username);
// Get the ids for the roles from the names
$ldapGroupsAsRoles = $this->matchLdapGroupsToSystemsRoles($userLdapGroups);