forked from keycloak/keycloak
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make LDAP
searchForUsersStream consistent with other storages
Co-authored-by: mhajas <[email protected]> Closes keycloak#17294
- Loading branch information
Showing
13 changed files
with
427 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
243 changes: 156 additions & 87 deletions
243
federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
...rc/test/java/org/keycloak/testsuite/federation/ldap/LDAPSearchForUsersPaginationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * Copyright 2023 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.keycloak.testsuite.federation.ldap; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.TreeSet; | ||
| import java.util.stream.Collectors; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.contains; | ||
| import static org.hamcrest.Matchers.hasItems; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
| import static org.hamcrest.Matchers.not; | ||
| import org.junit.ClassRule; | ||
| import org.junit.FixMethodOrder; | ||
| import org.junit.Test; | ||
| import org.junit.runners.MethodSorters; | ||
| import org.keycloak.models.RealmModel; | ||
| import org.keycloak.representations.idm.UserRepresentation; | ||
| import org.keycloak.testsuite.util.LDAPRule; | ||
| import org.keycloak.testsuite.util.LDAPTestUtils; | ||
|
|
||
| @FixMethodOrder(MethodSorters.NAME_ASCENDING) | ||
| public class LDAPSearchForUsersPaginationTest extends AbstractLDAPTest { | ||
|
|
||
| @ClassRule | ||
| public static LDAPRule ldapRule = new LDAPRule(); | ||
|
|
||
| @Override | ||
| protected LDAPRule getLDAPRule() { | ||
| return ldapRule; | ||
| } | ||
|
|
||
| @Override | ||
| protected void afterImportTestRealm() { | ||
| testingClient.server().run(session -> { | ||
|
|
||
| LDAPTestContext ctx = LDAPTestContext.init(session); | ||
| RealmModel appRealm = ctx.getRealm(); | ||
|
|
||
| // Delete all local users and add some new for testing | ||
| session.users().searchForUserStream(appRealm, new HashMap<>()).collect(Collectors.toList()).forEach(u -> session.users().removeUser(appRealm, u)); | ||
|
|
||
| // Delete all LDAP users and add some new for testing | ||
| LDAPTestUtils.removeAllLDAPUsers(ctx.getLdapProvider(), appRealm); | ||
|
|
||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john", "Some", "Some", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john00", "john", "Doe", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john01", "john", "Doe", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john02", "john", "Doe", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john03", "john", "Doe", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john04", "john", "Doe", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john05", "Some", "john", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john06", "Some", "john", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john07", "Some", "john", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john08", "Some", "john", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john09", "Some", "john", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john10", "Some", "Some", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john11", "Some", "Some", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john12", "Some", "Some", "[email protected]", null, "1234"); | ||
| LDAPTestUtils.addLDAPUser(ctx.getLdapProvider(), appRealm, "john13", "Some", "Some", "[email protected]", null, "1234"); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPagination() { | ||
| //this call should import some users into local database | ||
| //collecting to TreeSet for ordering as users are orderd by username when querying from local database | ||
| @SuppressWarnings("unchecked") | ||
| LinkedList<String> importedUsers = new LinkedList(adminClient.realm(TEST_REALM_NAME).users().search("*", 0, 5).stream().map(UserRepresentation::getUsername).collect(Collectors.toCollection(TreeSet::new))); | ||
|
|
||
| //this call should ommit first 3 already imported users from local db | ||
| //it should return 2 local(imported) users and 8 users from ldap | ||
| List<String> search = adminClient.realm(TEST_REALM_NAME).users().search("*", 3, 10).stream().map(UserRepresentation::getUsername).collect(Collectors.toList()); | ||
|
|
||
| assertThat(search, hasSize(10)); | ||
| assertThat(search, not(contains(importedUsers.get(0)))); | ||
| assertThat(search, not(contains(importedUsers.get(1)))); | ||
| assertThat(search, not(contains(importedUsers.get(2)))); | ||
| assertThat(search, hasItems(importedUsers.get(3), importedUsers.get(4))); | ||
| } | ||
| } |
Oops, something went wrong.