github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-03-13 13:55:26 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

LDAP: Fixed php type error when no cn provided for user

Browse Source 
Changes default fallback for name to first DN part, otherwise the whole
DN, rather than leave as null which was causing a type error.

For #5443
This commit is contained in:
Dan Brown 2025-02-20 13:06:49 +00:00
parent 3b4d3430a5
commit 35b45a2b8d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Access/LdapService.php
View File

@ -112,10 +112,14 @@ class LdapService
return null; return null;
} }
$userCn = $this->getUserResponseProperty($user, 'cn', null); $nameDefault = $this->getUserResponseProperty($user, 'cn', null);
if (is_null($nameDefault)) {
$nameDefault = ldap_explode_dn($user['dn'], 1)[0] ?? $user['dn'];
}
$formatted = [ $formatted = [
'uid' => $this->getUserResponseProperty($user, $idAttr, $user['dn']), 'uid' => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
'name' => $this->getUserDisplayName($user, $displayNameAttrs, $userCn), 'name' => $this->getUserDisplayName($user, $displayNameAttrs, $nameDefault),
'dn' => $user['dn'], 'dn' => $user['dn'],
'email' => $this->getUserResponseProperty($user, $emailAttr, null), 'email' => $this->getUserResponseProperty($user, $emailAttr, null),
'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null, 'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,

20
tests/Auth/LdapTest.php
View File

@ -166,6 +166,26 @@ class LdapTest extends TestCase
$this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $ldapDn]); $this->assertDatabaseHas('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $ldapDn]);
} }
public function test_login_works_when_ldap_server_does_not_provide_a_cn_value()
{
$ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
$this->commonLdapMocks(1, 1, 1, 2, 1);
$this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
->andReturn(['count' => 1, 0 => [
'dn' => $ldapDn,
'mail' => [$this->mockUser->email],
]]);
$resp = $this->mockUserLogin();
$resp->assertRedirect('/');
$this->assertDatabaseHas('users', [
'name' => 'test-user',
'email' => $this->mockUser->email,
]);
}
public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properly() public function test_a_custom_uid_attribute_can_be_specified_and_is_used_properly()
{ {
config()->set(['services.ldap.id_attribute' => 'my_custom_id']); config()->set(['services.ldap.id_attribute' => 'my_custom_id']);