This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 455d98219a40dd7b454f57d9b8eac020536ddcea Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Wed Feb 19 17:50:07 2020 +0100 Cleanup Realm REST endpoints --- .../syncope/common/rest/api/beans/RealmQuery.java | 18 ++++++++++++++++++ .../syncope/common/rest/api/service/RealmService.java | 4 ++-- .../java/org/apache/syncope/core/logic/RealmLogic.java | 14 +++++++++++--- .../core/rest/cxf/service/RealmServiceImpl.java | 2 +- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/RealmQuery.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/RealmQuery.java index f32d6d7..7bdf463 100644 --- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/RealmQuery.java +++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/RealmQuery.java @@ -36,6 +36,11 @@ public class RealmQuery implements Serializable { return this; } + public Builder base(final String base) { + instance.setBase(base); + return this; + } + public RealmQuery build() { return instance; } @@ -43,6 +48,8 @@ public class RealmQuery implements Serializable { private String keyword; + private String base; + public String getKeyword() { return keyword; } @@ -52,6 +59,15 @@ public class RealmQuery implements Serializable { this.keyword = keyword; } + public String getBase() { + return base; + } + + @QueryParam("base") + public void setBase(final String base) { + this.base = base; + } + @Override public boolean equals(final Object obj) { if (this == obj) { @@ -67,6 +83,7 @@ public class RealmQuery implements Serializable { return new EqualsBuilder(). appendSuper(super.equals(obj)). append(keyword, other.keyword). + append(base, other.base). build(); } @@ -75,6 +92,7 @@ public class RealmQuery implements Serializable { return new HashCodeBuilder(). appendSuper(super.hashCode()). append(keyword). + append(base). build(); } } diff --git a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java index 79cc617..7e18257 100644 --- a/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java +++ b/common/idrepo/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/RealmService.java @@ -60,7 +60,7 @@ public interface RealmService extends JAXRSService { /** * Returns a list of existing realms matching the given query (not including descendant realms) and the total number - * of descedant realms. + * of descendant realms. * * @param query query conditions * @return list of existing realms matching the given query (not including descendant realms) and the total number @@ -86,7 +86,7 @@ public interface RealmService extends JAXRSService { * Creates a new realm under the given path. * * @param parentPath full path of the parent realm - * @param realmTO new realm. + * @param realmTO new realm * @return Response object featuring Location header of created realm as well as the realm itself * enriched with propagation status information */ diff --git a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java index bad86d8..6db99ec 100644 --- a/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java +++ b/core/idrepo/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java @@ -73,11 +73,19 @@ public class RealmLogic extends AbstractTransactionalLogic<RealmTO> { @PreAuthorize("hasRole('" + IdRepoEntitlement.REALM_LIST + "')") @Transactional(readOnly = true) - public Pair<Integer, List<RealmTO>> search(final String keyword) { - Set<String> bases = AuthContextUtils.getAuthorizations().get(IdRepoEntitlement.REALM_LIST); + public Pair<Integer, List<RealmTO>> search(final String keyword, final String base) { + Realm baseRealm = base == null ? realmDAO.getRoot() : realmDAO.findByFullPath(base); + if (baseRealm == null) { + LOG.error("Could not find realm '" + base + "'"); + + throw new NotFoundException(base); + } + + Set<String> roots = AuthContextUtils.getAuthorizations().get(IdRepoEntitlement.REALM_LIST).stream(). + filter(auth -> auth.startsWith(baseRealm.getFullPath())).collect(Collectors.toSet()); Set<Realm> match = realmDAO.findMatching(keyword).stream(). - filter(realm -> bases.stream().anyMatch(base -> realm.getFullPath().startsWith(base))). + filter(realm -> roots.stream().anyMatch(root -> realm.getFullPath().startsWith(root))). collect(Collectors.toSet()); int descendants = Math.toIntExact( diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RealmServiceImpl.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RealmServiceImpl.java index c80403e..7916a20 100644 --- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RealmServiceImpl.java +++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/RealmServiceImpl.java @@ -44,7 +44,7 @@ public class RealmServiceImpl extends AbstractServiceImpl implements RealmServic public PagedResult<RealmTO> search(final RealmQuery query) { String keyword = query.getKeyword() == null ? null : query.getKeyword().replace('*', '%'); - Pair<Integer, List<RealmTO>> result = logic.search(keyword); + Pair<Integer, List<RealmTO>> result = logic.search(keyword, query.getBase()); return buildPagedResult(result.getRight(), 1, result.getRight().size(), result.getLeft()); }
