update ldap filters in tests

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Oct 27, 2020 · d7dd62a · d7dd62a
1 parent 69e189a
commit d7dd62a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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"