From 72d9ffd8b4a0680a858446c5f753db4f989f3989 Mon Sep 17 00:00:00 2001
From: Matthieu Leboeuf <contact@matthieul.dev>
Date: Mon, 28 Oct 2024 22:14:30 +0100
Subject: [PATCH 1/2] Added support for concatenating multiple LDAP attributes
 in displayName

---
 app/Access/LdapService.php | 30 ++++++++++++++++++++++++++----
 app/Config/services.php    |  2 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/Access/LdapService.php b/app/Access/LdapService.php
index 365cb1db015..ef6d33f4db1 100644
--- a/app/Access/LdapService.php
+++ b/app/Access/LdapService.php
@@ -71,6 +71,28 @@ private function getUserWithAttributes(string $userName, array $attributes): ?ar
         return $users[0];
     }
 
+    /**
+     * Calculate the display name.
+     */
+    protected function getUserDisplayName(array $displayNameAttr, array $userDetails, string $defaultValue): string
+    {
+        $displayName = [];
+        foreach ($displayNameAttr as $dnAttr) {
+            $dnComponent = $this->getUserResponseProperty($userDetails, $dnAttr, null);
+            if ($dnComponent !== null) {
+                $displayName[] = $dnComponent;
+            }
+        }
+
+        if (count($displayName) == 0) {
+            $displayName = $defaultValue;
+        } else {
+            $displayName = implode(' ', $displayName);
+        }
+
+        return $displayName;
+    }
+
     /**
      * Get the details of a user from LDAP using the given username.
      * User found via configurable user filter.
@@ -84,9 +106,9 @@ public function getUserDetails(string $userName): ?array
         $displayNameAttr = $this->config['display_name_attribute'];
         $thumbnailAttr = $this->config['thumbnail_attribute'];
 
-        $user = $this->getUserWithAttributes($userName, array_filter([
-            'cn', 'dn', $idAttr, $emailAttr, $displayNameAttr, $thumbnailAttr,
-        ]));
+        $user = $this->getUserWithAttributes($userName, array_filter(array_merge($displayNameAttr, [
+            'cn', 'dn', $idAttr, $emailAttr, $thumbnailAttr,
+        ])));
 
         if (is_null($user)) {
             return null;
@@ -95,7 +117,7 @@ public function getUserDetails(string $userName): ?array
         $userCn = $this->getUserResponseProperty($user, 'cn', null);
         $formatted = [
             'uid'   => $this->getUserResponseProperty($user, $idAttr, $user['dn']),
-            'name'  => $this->getUserResponseProperty($user, $displayNameAttr, $userCn),
+            'name'  => $this->getUserDisplayName($displayNameAttr, $user, $userCn),
             'dn'    => $user['dn'],
             'email' => $this->getUserResponseProperty($user, $emailAttr, null),
             'avatar' => $thumbnailAttr ? $this->getUserResponseProperty($user, $thumbnailAttr, null) : null,
diff --git a/app/Config/services.php b/app/Config/services.php
index d7345823150..4e27896870a 100644
--- a/app/Config/services.php
+++ b/app/Config/services.php
@@ -127,7 +127,7 @@
         'version'                => env('LDAP_VERSION', false),
         'id_attribute'           => env('LDAP_ID_ATTRIBUTE', 'uid'),
         'email_attribute'        => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
-        'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'),
+        'display_name_attribute' => explode('|', env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn')),
         'follow_referrals'       => env('LDAP_FOLLOW_REFERRALS', false),
         'user_to_groups'         => env('LDAP_USER_TO_GROUPS', false),
         'group_attribute'        => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),

From 87242ce6cb462bc933e63d80e514ae5096ee2b67 Mon Sep 17 00:00:00 2001
From: Matthieu Leboeuf <contact@matthieul.dev>
Date: Mon, 28 Oct 2024 22:27:15 +0100
Subject: [PATCH 2/2] Adapt tests with displayName array

---
 tests/Auth/LdapTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index ef95bc2e8f4..27169a2becf 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
             'auth.defaults.guard'                  => 'ldap',
             'services.ldap.base_dn'                => 'dc=ldap,dc=local',
             'services.ldap.email_attribute'        => 'mail',
-            'services.ldap.display_name_attribute' => 'cn',
+            'services.ldap.display_name_attribute' => ['cn'],
             'services.ldap.id_attribute'           => 'uid',
             'services.ldap.user_to_groups'         => false,
             'services.ldap.version'                => '3',
@@ -581,7 +581,7 @@ public function test_login_group_mapping_does_not_conflict_with_default_role()
     public function test_login_uses_specified_display_name_attribute()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => 'displayName',
+            'services.ldap.display_name_attribute' => ['displayName'],
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);
@@ -606,7 +606,7 @@ public function test_login_uses_specified_display_name_attribute()
     public function test_login_uses_default_display_name_attribute_if_specified_not_present()
     {
         app('config')->set([
-            'services.ldap.display_name_attribute' => 'displayName',
+            'services.ldap.display_name_attribute' => ['displayName'],
         ]);
 
         $this->commonLdapMocks(1, 1, 2, 4, 2);