Ravi Nori has uploaded a new change for review. Change subject: engine : [AAA] Get users by domain returns partial list of users ......................................................................
engine : [AAA] Get users by domain returns partial list of users Only partial list of users is returned when querying domain users Change-Id: Ie4c121b0edd6966c518b46aa8e98c24be6cb74c8 Bug-Url: https://bugzilla.redhat.com/1121410 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java 2 files changed, 8 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/30544/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java index 2ca4eff..b8af047 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthzUtils.java @@ -26,7 +26,6 @@ public boolean handle(Collection<ExtMap> queryResults); } - private static final int QUERIES_RESULTS_LIMIT = 1000; private static final int PAGE_SIZE = 500; @@ -166,12 +165,7 @@ public boolean handle(Collection<ExtMap> queryResults) { boolean result = true; for (ExtMap queryResult : queryResults) { - if (principalRecords.size() < QUERIES_RESULTS_LIMIT) { - principalRecords.add(queryResult); - } else { - result = false; - break; - } + principalRecords.add(queryResult); } return result; } @@ -188,11 +182,7 @@ boolean result = true; for (ExtMap queryResult : queryResults) { - if (groups.size() < QUERIES_RESULTS_LIMIT) { - groups.add(queryResult); - } else { - result = false; - } + groups.add(queryResult); } return result; } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java index 911396f..80404af 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthz.java @@ -81,7 +81,7 @@ public KerberosLdapAuthz() { } - public ExtMap queryGroups(ExtMap input, ExtMap output, long pageSize) { + public ExtMap queryGroups(ExtMap input, ExtMap output) { LdapQueryData queryData = new LdapQueryDataImpl(); queryData.setLdapQueryType(LdapQueryType.searchGroups); queryData.setDomain(getDirectoryName()); @@ -98,14 +98,12 @@ List<LdapGroup> ldapGroups = (List<LdapGroup>) ldapResult.getReturnValue(); List<ExtMap> results = new ArrayList<>(); for (LdapGroup ldapGroup : ldapGroups) { - if (results.size() < pageSize) { - results.add(mapLdapGroup(ldapGroup)); - } + results.add(mapLdapGroup(ldapGroup)); } return output.mput(Authz.InvokeKeys.QUERY_RESULT, results); } - public ExtMap queryUsers(ExtMap input, ExtMap output, long pageSize) { + public ExtMap queryUsers(ExtMap input, ExtMap output) { LdapQueryData queryData = new LdapQueryDataImpl(); queryData.setLdapQueryType(LdapQueryType.searchUsers); queryData.setDomain(getDirectoryName()); @@ -122,11 +120,8 @@ ); List<LdapUser> ldapUsers = (List<LdapUser>) ldapResult.getReturnValue(); List<ExtMap> results = new ArrayList<>(); - int addedUsers = 0; for (LdapUser ldapUser : ldapUsers) { - if (addedUsers++ < pageSize) { - results.add(mapLdapUser(ldapUser)); - } + results.add(mapLdapUser(ldapUser)); } return output.mput(Authz.InvokeKeys.QUERY_RESULT, results); } @@ -198,16 +193,15 @@ private void doQueryExecute(ExtMap input, ExtMap output) { Opaque opaque = input.<Opaque> get(Authz.InvokeKeys.QUERY_OPAQUE); - int pageSize = input.<Integer> get(Authz.InvokeKeys.PAGE_SIZE); if (opaque.getQueryInfo() == null) { output.mput(Authz.InvokeKeys.QUERY_RESULT, null); } else { if (opaque.getQueryInfo().<ExtUUID> get(Authz.InvokeKeys.QUERY_ENTITY).equals(Authz.QueryEntity.GROUP)) { - queryGroups(opaque.getQueryInfo(), output, pageSize); + queryGroups(opaque.getQueryInfo(), output); } else if (opaque.getQueryInfo() .<ExtUUID> get(Authz.InvokeKeys.QUERY_ENTITY) .equals(Authz.QueryEntity.PRINCIPAL)) { - queryUsers(opaque.getQueryInfo(), output, pageSize); + queryUsers(opaque.getQueryInfo(), output); } opaque.resetQueryInfo(); } -- To view, visit http://gerrit.ovirt.org/30544 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4c121b0edd6966c518b46aa8e98c24be6cb74c8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
