From 157ec30262b5aeef31c5819e13a9790be27654d0 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Thu, 7 Jul 2022 10:31:41 +0200
Subject: [PATCH] ldap: Add uid- and gidNumber to LDAP queries

For the EOS storage to work correctly the uid- and gidNumber attributes need
to be populated
---
 .../fix-ldap-userprovider-uidnumber.md        |  6 ++++++
 pkg/utils/ldap/identity.go                    | 21 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 changelog/unreleased/fix-ldap-userprovider-uidnumber.md

diff --git a/changelog/unreleased/fix-ldap-userprovider-uidnumber.md b/changelog/unreleased/fix-ldap-userprovider-uidnumber.md
new file mode 100644
index 0000000000..9969730812
--- /dev/null
+++ b/changelog/unreleased/fix-ldap-userprovider-uidnumber.md
@@ -0,0 +1,6 @@
+Bugfix: Add uid- and gidNumber to LDAP queries
+
+For the EOS storage to work correctly the uid- and gidNumber attributes need
+to be populated.
+
+https://github.com/cs3org/reva/pull/3037
diff --git a/pkg/utils/ldap/identity.go b/pkg/utils/ldap/identity.go
index a4d938a8c8..f60ab9b8a0 100644
--- a/pkg/utils/ldap/identity.go
+++ b/pkg/utils/ldap/identity.go
@@ -172,6 +172,8 @@ func (i *Identity) GetLDAPUserByFilter(log *zerolog.Logger, lc ldap.Client, filt
 			i.User.Schema.ID,
 			i.User.Schema.Mail,
 			i.User.Schema.Username,
+			i.User.Schema.UIDNumber,
+			i.User.Schema.GIDNumber,
 		},
 		nil,
 	)
@@ -210,6 +212,8 @@ func (i *Identity) GetLDAPUserByDN(log *zerolog.Logger, lc ldap.Client, dn strin
 			i.User.Schema.ID,
 			i.User.Schema.Mail,
 			i.User.Schema.Username,
+			i.User.Schema.UIDNumber,
+			i.User.Schema.GIDNumber,
 		},
 		nil,
 	)
@@ -235,7 +239,14 @@ func (i *Identity) GetLDAPUsers(log *zerolog.Logger, lc ldap.Client, query strin
 		i.User.BaseDN,
 		i.User.scopeVal, ldap.NeverDerefAliases, 0, 0, false,
 		filter,
-		[]string{i.User.Schema.ID, i.User.Schema.Username, i.User.Schema.Mail, i.User.Schema.DisplayName, i.User.Schema.UIDNumber, i.User.Schema.GIDNumber},
+		[]string{
+			i.User.Schema.ID,
+			i.User.Schema.Username,
+			i.User.Schema.Mail,
+			i.User.Schema.DisplayName,
+			i.User.Schema.UIDNumber,
+			i.User.Schema.GIDNumber,
+		},
 		nil,
 	)
 
@@ -321,6 +332,7 @@ func (i *Identity) GetLDAPGroupByFilter(log *zerolog.Logger, lc ldap.Client, fil
 			i.Group.Schema.Mail,
 			i.Group.Schema.Groupname,
 			i.Group.Schema.Member,
+			i.Group.Schema.GIDNumber,
 		},
 		nil,
 	)
@@ -352,7 +364,12 @@ func (i *Identity) GetLDAPGroups(log *zerolog.Logger, lc ldap.Client, query stri
 		i.Group.BaseDN,
 		ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false,
 		i.getGroupFindFilter(query),
-		[]string{i.Group.Schema.ID, i.Group.Schema.Groupname, i.Group.Schema.Mail, i.Group.Schema.DisplayName, i.Group.Schema.GIDNumber},
+		[]string{
+			i.Group.Schema.DisplayName,
+			i.Group.Schema.ID,
+			i.Group.Schema.Mail,
+			i.Group.Schema.Groupname,
+			i.Group.Schema.GIDNumber},
 		nil,
 	)