Repository: syncope Updated Branches: refs/heads/2_0_X 628ac7128 -> 8ae705731 refs/heads/master d4e098a29 -> 9e24b8eeb
Reviewing the AssignableCond doc and implementation Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8ae70573 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8ae70573 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8ae70573 Branch: refs/heads/2_0_X Commit: 8ae7057315d9bafef5a2e84d6eb5565ef1374f87 Parents: 628ac71 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Sep 22 07:29:36 2017 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Sep 22 07:29:36 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/syncope/core/logic/SyncopeLogic.java | 4 +--- .../core/persistence/api/dao/search/AssignableCond.java | 6 +++--- .../syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java | 8 ++++---- .../apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java | 2 +- .../core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java | 6 +++--- src/main/asciidoc/reference-guide/concepts/realms.adoc | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java index 26ed521..620b918 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java @@ -380,9 +380,7 @@ public class SyncopeLogic extends AbstractLogic<AbstractBaseBean> { } @PreAuthorize("isAuthenticated()") - public Pair<Integer, List<GroupTO>> searchAssignableGroups( - final String realm, final int page, final int size) { - + public Pair<Integer, List<GroupTO>> searchAssignableGroups(final String realm, final int page, final int size) { AssignableCond assignableCond = new AssignableCond(); assignableCond.setRealmFullPath(realm); SearchCond searchCond = SearchCond.getLeafCond(assignableCond); http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AssignableCond.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AssignableCond.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AssignableCond.java index 54587f3..93a4d1c 100644 --- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AssignableCond.java +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/AssignableCond.java @@ -25,11 +25,11 @@ public class AssignableCond extends AbstractSearchCond { private String realmFullPath; /** - * Whether this condition should be evaluated from the assignable group (default) - or instead the - * assignee - point of view. + * Whether this condition should be evaluated from the assignable group's or instead the + * assignee's point of view (default). * The converter from FIQL will ignore this setting, which is meant for internal usage. */ - private boolean fromGroup = true; + private boolean fromGroup = false; public String getRealmFullPath() { return realmFullPath; http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java index 6af5f27..dd015d0 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java @@ -608,15 +608,15 @@ public class JPAAnySearchDAO extends AbstractAnySearchDAO { StringBuilder query = new StringBuilder("SELECT DISTINCT any_id FROM "). append(svs.field().name).append(" WHERE ("); if (cond.isFromGroup()) { - for (Realm current = realm; current.getParent() != null; current = current.getParent()) { + for (Realm current : realmDAO.findDescendants(realm)) { query.append("realm_id=?").append(setParameter(parameters, current.getKey())).append(" OR "); } - query.append("realm_id=?").append(setParameter(parameters, realmDAO.getRoot().getKey())); + query.setLength(query.length() - 4); } else { - for (Realm current : realmDAO.findDescendants(realm)) { + for (Realm current = realm; current.getParent() != null; current = current.getParent()) { query.append("realm_id=?").append(setParameter(parameters, current.getKey())).append(" OR "); } - query.setLength(query.length() - 4); + query.append("realm_id=?").append(setParameter(parameters, realmDAO.getRoot().getKey())); } query.append(')'); http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java index 03c7d6a..5121d57 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAGroupDAO.java @@ -283,7 +283,7 @@ public class JPAGroupDAO extends AbstractAnyDAO<Group> implements GroupDAO { private SearchCond buildDynMembershipCond(final String baseCondFIQL, final Realm groupRealm) { AssignableCond cond = new AssignableCond(); cond.setRealmFullPath(groupRealm.getFullPath()); - cond.setFromGroup(false); + cond.setFromGroup(true); return SearchCond.getAndCond(SearchCond.getLeafCond(cond), SearchCondConverter.convert(baseCondFIQL)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java ---------------------------------------------------------------------- diff --git a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java index 3bcc8ed..672a13f 100644 --- a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java +++ b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java @@ -299,14 +299,14 @@ public class ElasticsearchAnySearchDAO extends AbstractAnySearchDAO { DisMaxQueryBuilder builder = QueryBuilders.disMaxQuery(); if (cond.isFromGroup()) { - for (Realm current = realm; current.getParent() != null; current = current.getParent()) { + for (Realm current : realmDAO.findDescendants(realm)) { builder.add(QueryBuilders.termQuery("realm", current.getFullPath())); } - builder.add(QueryBuilders.termQuery("realm", realmDAO.getRoot().getFullPath())); } else { - for (Realm current : realmDAO.findDescendants(realm)) { + for (Realm current = realm; current.getParent() != null; current = current.getParent()) { builder.add(QueryBuilders.termQuery("realm", current.getFullPath())); } + builder.add(QueryBuilders.termQuery("realm", realmDAO.getRoot().getFullPath())); } return builder; http://git-wip-us.apache.org/repos/asf/syncope/blob/8ae70573/src/main/asciidoc/reference-guide/concepts/realms.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/reference-guide/concepts/realms.adoc b/src/main/asciidoc/reference-guide/concepts/realms.adoc index 2ed169b..5e93271 100644 --- a/src/main/asciidoc/reference-guide/concepts/realms.adoc +++ b/src/main/asciidoc/reference-guide/concepts/realms.adoc @@ -36,8 +36,8 @@ smaller pools. This has consequences on <<memberships-relationships,memberships and relationships>>: -* A User or an Any Object can be members of Groups in the same realm or in one of the sub-realms. -* A User or an Any object can be in a relation with Any Objects in the same realm or in one of the sub-realms. +* A User or an Any Object can be members of Groups in the same realm or in one of the parent realms. +* A User or an Any object can be in a relation with Any Objects in the same realm or in one of parent realms. Moreover, this partition allows fine-grained control over policy enforcement and, alongside with <<entitlements,entitlements>> and <<roles,roles>>, helps to implement
