From d7dd62a4d086474310038b1c2e3cd08d9b023916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 27 Oct 2020 16:15:29 +0100
Subject: [PATCH] update ldap filters in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 tests/oc-integration-tests/drone/ldap-users.toml | 9 +++++----
 tests/oc-integration-tests/local/ldap-users.toml | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/oc-integration-tests/drone/ldap-users.toml b/tests/oc-integration-tests/drone/ldap-users.toml
index bbe07b447a..28e5e7ad91 100644
--- a/tests/oc-integration-tests/drone/ldap-users.toml
+++ b/tests/oc-integration-tests/drone/ldap-users.toml
@@ -14,8 +14,7 @@ auth_manager = "ldap"
 hostname="ldap"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"
@@ -32,8 +31,10 @@ driver = "ldap"
 hostname="ldap"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+userfilter="(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))"
+findfilter="(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))"
+attributefilter="(&(objectclass=posixAccount)({{attr}}={{value}}))"
+groupfilter="(&(objectclass=posixGroup)(cn={{.OpaqueId}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"
diff --git a/tests/oc-integration-tests/local/ldap-users.toml b/tests/oc-integration-tests/local/ldap-users.toml
index 8a124cdd30..3bc0897276 100644
--- a/tests/oc-integration-tests/local/ldap-users.toml
+++ b/tests/oc-integration-tests/local/ldap-users.toml
@@ -14,8 +14,7 @@ auth_manager = "ldap"
 hostname="localhost"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"
@@ -32,8 +31,10 @@ driver = "ldap"
 hostname="localhost"
 port=636
 base_dn="dc=owncloud,dc=com"
-userfilter="(&(objectclass=posixAccount)(cn=%s*))"
-groupfilter="(&(objectclass=posixGroup)(cn=%s*))"
+userfilter="(&(objectclass=posixAccount)(|(uid={{.OpaqueId}})(cn={{.OpaqueId}})))"
+findfilter="(&(objectclass=posixAccount)(|(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)))"
+attributefilter="(&(objectclass=posixAccount)({{attr}}={{value}}))"
+groupfilter="(&(objectclass=posixGroup)(cn={{.OpaqueId}}))"
 bind_username="cn=admin,dc=owncloud,dc=com"
 bind_password="admin"
 idp="http://localhost:18000"