diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2019-05-22 19:09:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-22 19:09:28 +0200 |
| commit | 755611866ec8a33fe653bc651930a353d4fd12fd (patch) | |
| tree | 1f051237f274adb643fe80bc172d4c8e45000c54 /build | |
| parent | 78c1492df9beea57df4ec54310824e038c02f237 (diff) | |
| parent | 54299f4e66085b9ed6da914167e324bf69bbb9b8 (diff) | |
| download | nextcloud-server-755611866ec8a33fe653bc651930a353d4fd12fd.tar.gz nextcloud-server-755611866ec8a33fe653bc651930a353d4fd12fd.zip | |
Merge pull request #15604 from nextcloud/fix/12682/fix-possible-override-of-uniquemember
fixes possible override of uniqueMember by autodetection
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/ldap_features/ldap-openldap.feature | 15 | ||||
| -rw-r--r-- | build/integration/ldap_features/openldap-numerical-id.feature | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/build/integration/ldap_features/ldap-openldap.feature b/build/integration/ldap_features/ldap-openldap.feature index 6c5ed8b462b..570cf287a2e 100644 --- a/build/integration/ldap_features/ldap-openldap.feature +++ b/build/integration/ldap_features/ldap-openldap.feature @@ -42,8 +42,9 @@ Feature: LDAP Scenario: Test group filter with one specific group Given modify LDAP configuration - | ldapGroupFilter | cn=RedGroup | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | cn=RedGroup | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" @@ -55,8 +56,9 @@ Feature: LDAP Scenario: Test group filter with two specific groups Given modify LDAP configuration - | ldapGroupFilter | (\|(cn=RedGroup)(cn=GreenGroup)) | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | (\|(cn=RedGroup)(cn=GreenGroup)) | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" @@ -68,8 +70,9 @@ Feature: LDAP Scenario: Test group filter ruling out a group from a different base Given modify LDAP configuration - | ldapGroupFilter | (objectClass=groupOfNames) | - | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | + | ldapGroupFilter | (objectClass=groupOfNames) | + | ldapGroupMemberAssocAttr | member | + | ldapBaseGroups | ou=Groups,ou=Ordinary,dc=nextcloud,dc=ci | And As an "admin" And sending "GET" to "/cloud/groups" Then the OCS status code should be "200" diff --git a/build/integration/ldap_features/openldap-numerical-id.feature b/build/integration/ldap_features/openldap-numerical-id.feature index 4112df0ae1a..4ea63823295 100644 --- a/build/integration/ldap_features/openldap-numerical-id.feature +++ b/build/integration/ldap_features/openldap-numerical-id.feature @@ -35,6 +35,7 @@ Scenario: Test LDAP group retrieval with numeric group ids and nesting Given modify LDAP configuration | ldapBaseGroups | ou=NumericGroups,dc=nextcloud,dc=ci | | ldapGroupFilter | (objectclass=groupOfNames) | + | ldapGroupMemberAssocAttr | member | | ldapNestedGroups | 1 | | useMemberOfToDetectMembership | 1 | And As an "admin" |