From fffba1c6af521c0f584d760c9cef99cbe034370f Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Mon, 29 Jul 2024 15:32:43 +0200 Subject: fix(ldap): Fix user_ldap attribute casing to fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/user_ldap/lib/Access.php | 6 +++--- apps/user_ldap/tests/AccessTest.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'apps/user_ldap') diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index fbce4092295..2a9bd06d29d 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -502,15 +502,15 @@ class Access extends LDAPUtility { } if ($isUser) { - $nameAttribute = $this->connection->ldapUserDisplayName; + $nameAttribute = strtolower($this->connection->ldapUserDisplayName); $filter = $this->connection->ldapUserFilter; $uuidAttr = 'ldapUuidUserAttribute'; $uuidOverride = $this->connection->ldapExpertUUIDUserAttr; - $usernameAttribute = (string)$this->connection->ldapExpertUsernameAttr; + $usernameAttribute = strtolower($this->connection->ldapExpertUsernameAttr); $attributesToRead = [$nameAttribute,$usernameAttribute]; // TODO fetch also display name attributes and cache them if the user is mapped } else { - $nameAttribute = $this->connection->ldapGroupDisplayName; + $nameAttribute = strtolower($this->connection->ldapGroupDisplayName); $filter = $this->connection->ldapGroupFilter; $uuidAttr = 'ldapUuidGroupAttribute'; $uuidOverride = $this->connection->ldapExpertUUIDGroupAttr; diff --git a/apps/user_ldap/tests/AccessTest.php b/apps/user_ldap/tests/AccessTest.php index 01219fb9f81..62c508fdb09 100644 --- a/apps/user_ldap/tests/AccessTest.php +++ b/apps/user_ldap/tests/AccessTest.php @@ -612,7 +612,8 @@ class AccessTest extends TestCase { $this->prepareMocksForSearchTests($base, $fakeConnection, $fakeSearchResultResource, $fakeLdapEntries); - $this->connection->expects($this->exactly($fakeLdapEntries['count'])) + // Called twice per user, for userExists and userExistsOnLdap + $this->connection->expects($this->exactly(2 * $fakeLdapEntries['count'])) ->method('writeToCache') ->with($this->stringStartsWith('userExists'), true); -- cgit v1.2.3