Adapt for new LDAP config

owncloud · Apr 12, 2022 · c0b878d · c0b878d
1 parent a5b780f
commit c0b878d
Showing 1 changed file with 14 additions and 22 deletions.
diff --git a/.drone.star b/.drone.star
@@ -1623,42 +1623,34 @@ def ocisServerWithIdp():
     ldapUri = "ldaps://%s:%d" % (ldapHost, ldapPort)
     environment = {
         "GRAPH_IDENTITY_BACKEND": "ldap",
-        "GRAPH_LDAP_URI": ldapUri,
-        "GRAPH_LDAP_BIND_DN": "uid=libregraph,ou=sysusers,o=libregraph-idm",
-        "GRAPH_LDAP_BIND_PASSWORD": "idm",
-        "GRAPH_LDAP_USER_EMAIL_ATTRIBUTE": "mail",
-        "GRAPH_LDAP_USER_NAME_ATTRIBUTE": "uid",
-        "GRAPH_LDAP_USER_BASE_DN": "ou=users,o=libregraph-idm",
-        "GRAPH_LDAP_GROUP_BASE_DN": "ou=groups,o=libregraph-idm",
         "GRAPH_LDAP_SERVER_WRITE_ENABLED": "true",
+        "LDAP_URI": ldapUri,
+        "LDAP_INSECURE": "true",
+        "LDAP_BIND_DN": "uid=libregraph,ou=sysusers,o=libregraph-idm",
+        "LDAP_BIND_PASSWORD": "idm",
+        "LDAP_USER_BASE_DN": "ou=users,o=libregraph-idm",
+        "LDAP_USER_SCHEMA_ID": "ownclouduuid",
+        "LDAP_USER_SCHEMA_MAIL": "mail",
+        "LDAP_USER_SCHEMA_USERNAME": "uid",
+        "LDAP_USER_OBJECTCLASS": "inetOrgPerson",
+        "LDAP_GROUP_BASE_DN": "ou=groups,o=libregraph-idm",
+        "LDAP_GROUP_SCHEMA_ID": "ownclouduuid",
+        "LDAP_GROUP_SCHEMA_MAIL": "mail",
+        "LDAP_GROUP_SCHEMA_GROUPNAME": "cn",
+        "LDAP_GROUP_OBJECTCLASS": "groupOfNames",
         "IDP_INSECURE": "true",
-        "IDP_LDAP_FILTER": "(&(objectclass=inetOrgPerson)(objectClass=owncloud))",
-        "IDP_LDAP_URI": ldapUri,
         "IDP_LDAP_BIND_DN": "uid=idp,ou=sysusers,o=libregraph-idm",
         "IDP_LDAP_BIND_PASSWORD": "idp",
         "IDP_LDAP_BASE_DN": "ou=users,o=libregraph-idm",
         "IDP_LDAP_LOGIN_ATTRIBUTE": "uid",
-        "IDP_LDAP_UUID_ATTRIBUTE": "ownclouduuid",
-        "IDP_LDAP_UUID_ATTRIBUTE_TYPE": "binary",
         "PROXY_ACCOUNT_BACKEND_TYPE": "cs3",
         "OCS_ACCOUNT_BACKEND_TYPE": "cs3",
-        "STORAGE_LDAP_HOSTNAME": ldapHost,
-        "STORAGE_LDAP_PORT": ldapPort,
-        "STORAGE_LDAP_INSECURE": "true",
-        "STORAGE_LDAP_BASE_DN": "o=libregraph-idm",
         "STORAGE_LDAP_BIND_DN": "uid=reva,ou=sysusers,o=libregraph-idm",
         "STORAGE_LDAP_BIND_PASSWORD": "reva",
-        "STORAGE_LDAP_LOGINFILTER": "(&(objectclass=inetOrgPerson)(objectclass=owncloud)(|(uid={{login}})(mail={{login}})))",
-        "STORAGE_LDAP_USERFILTER": "(&(objectclass=inetOrgPerson)(objectclass=owncloud)(|(ownclouduuid={{.OpaqueId}})(uid={{.OpaqueId}})))",
-        "STORAGE_LDAP_USERATTRIBUTEFILTER": "(&(objectclass=owncloud)({{attr}}={{value}}))",
-        "STORAGE_LDAP_USERFINDFILTER": "(&(objectclass=owncloud)(|(uid={{query}}*)(cn={{query}}*)(displayname={{query}}*)(mail={{query}}*)(description={{query}}*)))",
-        "STORAGE_LDAP_USERGROUPFILER": "(&(objectclass=groupOfNames)(member={{query}}*))",
-        "STORAGE_LDAP_GROUPFILTER": "(&(objectclass=groupOfNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))",
         "OCIS_RUN_EXTENSIONS": "settings,storage-metadata,graph,graph-explorer,ocs,store,thumbnails,web,webdav,storage-frontend,storage-gateway,storage-userprovider,storage-groupprovider,storage-authbasic,storage-authbearer,storage-authmachine,storage-users,storage-shares,storage-public-link,storage-appprovider,storage-sharing,proxy,idp,nats,idm",
         "PROXY_ENABLE_BASIC_AUTH": "true",
         "OCIS_LOG_LEVEL": "debug",
         "OCIS_INSECURE": "true",
-        "ACCOUNTS_DEMO_USERS_AND_GROUPS": "true",
     }
     return [
         {