Fix LDAP related tests

tests/acceptance/Makefile

@@ -15,8 +15,8 @@ ldap:
 	@docker run --rm -d \
 		--name docker-slapd \
 		-e LDAP_TLS_VERIFY_CLIENT=never \
-		-e LDAP_DOMAIN=owncloud.com \
-		-e LDAP_ORGANISATION=ownCloud \
+		-e LDAP_DOMAIN=example.org \
+		-e LDAP_ORGANISATION="Example Organization" \
 		-e LDAP_ADMIN_PASSWORD=admin \
 		-p 389:389 \
 		-p 636:636 \

tests/integration/grpc/fixtures/groupprovider-ldap.toml

@@ -10,24 +10,24 @@ driver = "ldap"
 [grpc.services.groupprovider.drivers.ldap]
 uri="ldaps://openldap:636"
 insecure=true
-user_base_dn="ou=users,dc=owncloud,dc=com"
-group_base_dn="ou=groups,dc=owncloud,dc=com"
+user_base_dn="ou=users,dc=example,dc=org"
+group_base_dn="ou=groups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="groupOfNames"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 
 [grpc.services.groupprovider.drivers.ldap.user_schema]
-id="ownclouduuid"
+id="openclouduuid"
 displayName="displayName"
 userName="cn"
 gid="cn"
 
 [grpc.services.groupprovider.drivers.ldap.group_schema]
-id="ownclouduuid"
+id="openclouduuid"
 displayName="description"
 groupName="cn"
 member="member"

tests/integration/grpc/fixtures/ldap/10_opencloud_schema.ldif

@@ -0,0 +1,39 @@
+# This LDIF files describes the OpenCloud schema
+dn: cn=opencloud,cn=schema,cn=config
+objectClass: olcSchemaConfig
+cn: opencloud
+olcObjectIdentifier: openCloudOid 1.3.6.1.4.1.63016
+# We'll use openCloudOid:1 subarc for LDAP related stuff
+#   openCloudOid:1.1 for AttributeTypes and openCloudOid:1.2 for ObjectClasses
+olcAttributeTypes: ( openCloudOid:1.1.1 NAME 'openCloudUUID'
+  DESC 'A non-reassignable and persistent account ID)'
+  EQUALITY uuidMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.1.16.1 SINGLE-VALUE )
+olcAttributeTypes: ( openCloudOid:1.1.2 NAME 'openCloudExternalIdentity'
+  DESC 'A triple separated by "$" representing the objectIdentity resource type of the Graph API ( signInType $ issuer $ issuerAssignedId )'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+olcAttributeTypes: ( openCloudOid:1.1.3 NAME 'openCloudUserEnabled'
+  DESC 'A boolean value indicating if the user is enabled'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE)
+olcAttributeTypes: ( openCloudOid:1.1.4 NAME 'openCloudUserType'
+  DESC 'User type (e.g. Member or Guest)'
+  EQUALITY caseIgnoreMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+olcAttributeTypes: ( openCloudOid:1.1.5 NAME 'openCloudLastSignInTimestamp'
+  DESC 'The timestamp of the last sign-in'
+  EQUALITY generalizedTimeMatch
+  ORDERING generalizedTimeOrderingMatch
+  SYNTAX  1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE )
+olcObjectClasses: ( openCloudOid:1.2.1 NAME 'openCloudObject'
+  DESC 'OpenCloud base objectclass'
+  AUXILIARY
+  MAY ( openCloudUUID ) )
+olcObjectClasses: ( openCloudOid:1.2.2 NAME 'openCloudUser'
+  DESC 'OpenCloud User objectclass'
+  SUP openCloudObject
+  AUXILIARY
+  MAY ( openCloudExternalIdentity $ openCloudUserEnabled $ openCloudUserType $ openCloudLastSignInTimestamp) )

tests/integration/grpc/fixtures/ldap/20_users.ldif

@@ -1,12 +1,12 @@
-dn: ou=users,dc=owncloud,dc=com
+dn: ou=users,dc=example,dc=org
 objectClass: organizationalUnit
 ou: users
 
 # Start dn with uid (user identifier / login), not cn (Firstname + Surname)
-dn: uid=einstein,ou=users,dc=owncloud,dc=com
+dn: uid=einstein,ou=users,dc=example,dc=org
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: person
 objectClass: posixAccount
 objectClass: top
@@ -20,13 +20,13 @@ mail: einstein@example.org
 uidNumber: 123
 gidNumber: 30000
 homeDirectory: /home/einstein
-ownCloudUUID:: NGM1MTBhZGEtYzg2Yi00ODE1LTg4MjAtNDJjZGY4MmMzZDUx
+openCloudUUID:: NGM1MTBhZGEtYzg2Yi00ODE1LTg4MjAtNDJjZGY4MmMzZDUx
 userPassword:: e1NTSEF9TXJEcXpFNGdKbXZxbVRVTGhvWEZ1VzJBbkV3NWFLK3J3WTIvbHc9PQ==
 
-dn: uid=marie,ou=users,dc=owncloud,dc=com
+dn: uid=marie,ou=users,dc=example,dc=org
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: person
 objectClass: posixAccount
 objectClass: top
@@ -40,13 +40,13 @@ mail: marie@example.org
 uidNumber: 20001
 gidNumber: 30000
 homeDirectory: /home/marie
-ownCloudUUID:: ZjdmYmY4YzgtMTM5Yi00Mzc2LWIzMDctY2YwYThjMmQwZDlj
+openCloudUUID:: ZjdmYmY4YzgtMTM5Yi00Mzc2LWIzMDctY2YwYThjMmQwZDlj
 userPassword:: e1NTSEF9UmFvQWs3TU9jRHBIUWY3bXN3MGhHNnVraFZQWnRIRlhOSUNNZEE9PQ==
 
-dn: uid=richard,ou=users,dc=owncloud,dc=com
+dn: uid=richard,ou=users,dc=example,dc=org
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: person
 objectClass: posixAccount
 objectClass: top
@@ -60,13 +60,13 @@ mail: richard@example.org
 uidNumber: 20002
 gidNumber: 30000
 homeDirectory: /home/richard
-ownCloudUUID:: OTMyYjQ1NDAtOGQxNi00ODFlLThlZjQtNTg4ZTRiNmIxNTFj
+openCloudUUID:: OTMyYjQ1NDAtOGQxNi00ODFlLThlZjQtNTg4ZTRiNmIxNTFj
 userPassword:: e1NTSEF9Z05LZTRreHdmOGRUREY5eHlhSmpySTZ3MGxSVUM1d1RGcWROTVE9PQ==
 
-dn: uid=moss,ou=users,dc=owncloud,dc=com
+dn: uid=moss,ou=users,dc=example,dc=org
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: person
 objectClass: posixAccount
 objectClass: top
@@ -80,5 +80,5 @@ mail: moss@example.org
 uidNumber: 20003
 gidNumber: 30000
 homeDirectory: /home/moss
-ownCloudUUID:: MDU4YmZmOTUtNjcwOC00ZmU1LTkxZTQtOWVhM2QzNzc1ODhi
+openCloudUUID:: MDU4YmZmOTUtNjcwOC00ZmU1LTkxZTQtOWVhM2QzNzc1ODhi
 userPassword:: e1NTSEF9N0hEdTRoMkFDVExFWWt4U0RtSDZVQjhmUlpKRExDZDc=

tests/integration/grpc/fixtures/ldap/30_groups.ldif

@@ -1,68 +1,68 @@
-dn: ou=groups,dc=owncloud,dc=com
+dn: ou=groups,dc=example,dc=org
 objectClass: organizationalUnit
 ou: groups
 
-dn: cn=Sailing Lovers,ou=groups,dc=owncloud,dc=com
+dn: cn=Sailing Lovers,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: sailing-lovers
 description: Sailing Lovers
-ownCloudUUID:: NjA0MGFhMTctOWM2NC00ZmVmLTliZDAtNzcyMzRkNzFiYWQw
-member: uid=einstein,ou=users,dc=owncloud,dc=com
+openCloudUUID:: NjA0MGFhMTctOWM2NC00ZmVmLTliZDAtNzcyMzRkNzFiYWQw
+member: uid=einstein,ou=users,dc=example,dc=org
 
-dn: cn=violin-haters,ou=groups,dc=owncloud,dc=com
+dn: cn=violin-haters,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: violin-haters
 description: Violin Haters
-ownCloudUUID:: ZGQ1OGU1ZWMtODQyZS00OThiLTg4MDAtNjFmMmVjNmY5MTFm
-member: uid=einstein,ou=users,dc=owncloud,dc=com
+openCloudUUID:: ZGQ1OGU1ZWMtODQyZS00OThiLTg4MDAtNjFmMmVjNmY5MTFm
+member: uid=einstein,ou=users,dc=example,dc=org
 
-dn: cn=radium-lovers,ou=groups,dc=owncloud,dc=com
+dn: cn=radium-lovers,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: radium-lovers
 description: Radium Lovers
-ownCloudUUID:: N2I4N2ZkNDktMjg2ZS00YTVmLWJhZmQtYzUzNWQ1ZGQ5OTdh
-member: uid=marie,ou=users,dc=owncloud,dc=com
+openCloudUUID:: N2I4N2ZkNDktMjg2ZS00YTVmLWJhZmQtYzUzNWQ1ZGQ5OTdh
+member: uid=marie,ou=users,dc=example,dc=org
 
-dn: cn=polonium-lovers,ou=groups,dc=owncloud,dc=com
+dn: cn=polonium-lovers,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: polonium-lovers
 description: Polonium Lovers
-ownCloudUUID:: Y2VkYzIxYWEtNDA3Mi00NjE0LTg2NzYtZmE5MTY1ZjU5OGZm
-member: uid=marie,ou=users,dc=owncloud,dc=com
+openCloudUUID:: Y2VkYzIxYWEtNDA3Mi00NjE0LTg2NzYtZmE5MTY1ZjU5OGZm
+member: uid=marie,ou=users,dc=example,dc=org
 
-dn: cn=quantum-lovers,ou=groups,dc=owncloud,dc=com
+dn: cn=quantum-lovers,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: quantum-lovers
 description: Quantum Lovers
-ownCloudUUID:: YTE3MjYxMDgtMDFmOC00YzMwLTg4ZGYtMmIxYTlkMWNiYTFh
-member: uid=richard,ou=users,dc=owncloud,dc=com
+openCloudUUID:: YTE3MjYxMDgtMDFmOC00YzMwLTg4ZGYtMmIxYTlkMWNiYTFh
+member: uid=richard,ou=users,dc=example,dc=org
 
-dn: cn=philosophy-haters,ou=groups,dc=owncloud,dc=com
+dn: cn=philosophy-haters,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: philosophy-haters
 description: Philosophy Haters
-ownCloudUUID:: MTY3Y2JlZTItMDUxOC00NTVhLWJmYjItMDMxZmUwNjIxZTVk
-member: uid=richard,ou=users,dc=owncloud,dc=com
+openCloudUUID:: MTY3Y2JlZTItMDUxOC00NTVhLWJmYjItMDMxZmUwNjIxZTVk
+member: uid=richard,ou=users,dc=example,dc=org
 
-dn: cn=physics-lovers,ou=groups,dc=owncloud,dc=com
+dn: cn=physics-lovers,ou=groups,dc=example,dc=org
 objectClass: groupOfNames
-objectClass: ownCloud
+objectClass: openCloudObject
 objectClass: top
 cn: physics-lovers
 description: Physics Lovers
-ownCloudUUID:: MjYyOTgyYzEtMjM2Mi00YWZhLWJmZGYtOGNiZmVmNjRhMDZl
-member: uid=einstein,ou=users,dc=owncloud,dc=com
-member: uid=marie,ou=users,dc=owncloud,dc=com
-member: uid=richard,ou=users,dc=owncloud,dc=com
+openCloudUUID:: MjYyOTgyYzEtMjM2Mi00YWZhLWJmZGYtOGNiZmVmNjRhMDZl
+member: uid=einstein,ou=users,dc=example,dc=org
+member: uid=marie,ou=users,dc=example,dc=org
+member: uid=richard,ou=users,dc=example,dc=org

tests/integration/grpc/fixtures/userprovider-ldap.toml

@@ -10,18 +10,18 @@ driver = "ldap"
 [grpc.services.userprovider.drivers.ldap]
 uri="ldaps://openldap:636"
 insecure=true
-user_base_dn="ou=users,dc=owncloud,dc=com"
-group_base_dn="ou=groups,dc=owncloud,dc=com"
+user_base_dn="ou=users,dc=example,dc=org"
+group_base_dn="ou=groups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="groupOfNames"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 
 [grpc.services.userprovider.drivers.ldap.user_schema]
-id="ownclouduuid"
+id="openclouduuid"
 displayName="displayName"
 userName="cn"
 

tests/oc-integration-tests/drone/ldap-users.toml

@@ -14,10 +14,10 @@ auth_manager = "ldap"
 [grpc.services.authprovider.auth_managers.ldap]
 uri="ldaps://ldap:636"
 insecure=true
-user_base_dn="ou=testusers,dc=owncloud,dc=com"
+user_base_dn="ou=testusers,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 login_attributes=['uid', 'cn']
@@ -33,13 +33,13 @@ driver = "ldap"
 [grpc.services.userprovider.drivers.ldap]
 uri="ldaps://ldap:636"
 insecure=true
-user_base_dn="ou=testusers,dc=owncloud,dc=com"
-group_base_dn="ou=testgroups,dc=owncloud,dc=com"
+user_base_dn="ou=testusers,dc=example,dc=org"
+group_base_dn="ou=testgroups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="posixGroup"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 
@@ -60,13 +60,13 @@ driver = "ldap"
 [grpc.services.groupprovider.drivers.ldap]
 uri="ldaps://ldap:636"
 insecure=true
-user_base_dn="ou=testusers,dc=owncloud,dc=com"
-group_base_dn="ou=testgroups,dc=owncloud,dc=com"
+user_base_dn="ou=testusers,dc=example,dc=org"
+group_base_dn="ou=testgroups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="posixGroup"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 

tests/oc-integration-tests/local-mesh/ldap-users.toml

@@ -14,9 +14,9 @@ auth_manager = "ldap"
 [grpc.services.authprovider.auth_managers.ldap]
 uri="ldaps://localhost:636"
 insecure=true
-base_dn="dc=owncloud,dc=com"
+base_dn="dc=example,dc=org"
 loginfilter="(&(objectclass=posixAccount)(|(cn={{login}}))(uid={{login}}))"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:40080"
 
@@ -32,13 +32,13 @@ driver = "ldap"
 [grpc.services.userprovider.drivers.ldap]
 uri="ldaps://localhost:636"
 insecure=true
-user_base_dn="ou=testusers,dc=owncloud,dc=com"
-group_base_dn="ou=testgroups,dc=owncloud,dc=com"
+user_base_dn="ou=testusers,dc=example,dc=org"
+group_base_dn="ou=testgroups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="posixGroup"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"
 
@@ -59,13 +59,13 @@ driver = "ldap"
 [grpc.services.groupprovider.drivers.ldap]
 uri="ldaps://localhost:636"
 insecure=true
-user_base_dn="ou=testusers,dc=owncloud,dc=com"
-group_base_dn="ou=testgroups,dc=owncloud,dc=com"
+user_base_dn="ou=testusers,dc=example,dc=org"
+group_base_dn="ou=testgroups,dc=example,dc=org"
 user_filter=""
 user_objectclass="posixAccount"
 group_filter=""
 group_objectclass="posixGroup"
-bind_username="cn=admin,dc=owncloud,dc=com"
+bind_username="cn=admin,dc=example,dc=org"
 bind_password="admin"
 idp="http://localhost:20080"