Repository: syncope Updated Branches: refs/heads/master 6a0a6ffb3 -> 98673c0ee
[SYNCOPE-856] Added REST methods for bulk (de)provisioning group members + handles in console Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/98673c0e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/98673c0e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/98673c0e Branch: refs/heads/master Commit: 98673c0ee44eaa1a8575ceeaa63968ff82e0e9af Parents: 6a0a6ff Author: Francesco Chicchiriccò <[email protected]> Authored: Wed May 25 17:18:09 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Wed May 25 17:18:09 2016 +0200 ---------------------------------------------------------------------- .../console/panels/AnyDirectoryPanel.java | 14 +- .../console/panels/AnyObjectDirectoryPanel.java | 4 +- .../console/panels/GroupDirectoryPanel.java | 46 ++++++- .../console/panels/UserDirectoryPanel.java | 4 +- .../AnyObjectSelectionDirectoryPanel.java | 5 +- .../search/AnySelectionDirectoryPanel.java | 54 ++++---- .../search/GroupSelectionDirectoryPanel.java | 4 +- .../search/UserSelectionDirectoryPanel.java | 4 +- .../client/console/rest/GroupRestClient.java | 4 + .../console/tasks/SchedTaskDirectoryPanel.java | 8 +- .../wicket/markup/html/form/ActionLink.java | 2 + .../markup/html/form/ActionLinksPanel.java | 43 +++++- .../resources/META-INF/resources/css/bulk.css | 10 -- .../META-INF/resources/css/syncopeConsole.css | 10 ++ .../console/panels/ActionDataTablePanel.html | 5 - .../console/panels/AjaxDataTablePanel.html | 3 - .../markup/html/form/ActionLinksPanel.html | 18 ++- .../common/lib/types/BulkMembersActionType.java | 29 ++++ .../common/lib/types/UnmatchingRule.java | 2 +- .../common/rest/api/service/GroupService.java | 18 +++ .../apache/syncope/core/logic/GroupLogic.java | 82 ++++++++++++ .../init/ClassPathScanImplementationLookup.java | 4 +- .../persistence/jpa/dao/AbstractAnyDAO.java | 2 +- .../api/job/SchedTaskJobDelegate.java | 3 +- .../java/job/AbstractSchedTaskJobDelegate.java | 5 +- .../GroupMemberProvisionTaskJobDelegate.java | 132 +++++++++++++++++++ .../core/provisioning/java/job/TaskJob.java | 4 +- .../core/rest/cxf/service/GroupServiceImpl.java | 7 + .../apache/syncope/fit/core/GroupITCase.java | 70 ++++++++++ pom.xml | 2 +- 30 files changed, 516 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java index 0a873ec..f2e8aec 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java @@ -54,8 +54,8 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.util.ListModel; -public abstract class AnyDirectoryPanel<A extends AnyTO> - extends DirectoryPanel<A, AnyWrapper<A>, AnyDataProvider<A>, AbstractAnyRestClient<A, ?>> { +public abstract class AnyDirectoryPanel<A extends AnyTO, E extends AbstractAnyRestClient<A, ?>> + extends DirectoryPanel<A, AnyWrapper<A>, AnyDataProvider<A>, E> { private static final long serialVersionUID = -1100228004207271270L; @@ -82,7 +82,7 @@ public abstract class AnyDirectoryPanel<A extends AnyTO> protected final BaseModal<Serializable> utilityModal = new BaseModal<>("outer"); - protected AnyDirectoryPanel(final String id, final Builder<A> builder) { + protected AnyDirectoryPanel(final String id, final Builder<A, E> builder) { super(id, builder); this.realm = builder.realm; this.type = builder.type; @@ -153,8 +153,8 @@ public abstract class AnyDirectoryPanel<A extends AnyTO> List<AnyTypeClassTO> getAnyTypeClassTOs(); } - public abstract static class Builder<A extends AnyTO> - extends DirectoryPanel.Builder<A, AnyWrapper<A>, AbstractAnyRestClient<A, ?>> + public abstract static class Builder<A extends AnyTO, E extends AbstractAnyRestClient<A, ?>> + extends DirectoryPanel.Builder<A, AnyWrapper<A>, E> implements AnyDirectoryPanelBuilder { private static final long serialVersionUID = -6828423611982275640L; @@ -173,7 +173,7 @@ public abstract class AnyDirectoryPanel<A extends AnyTO> public Builder( final List<AnyTypeClassTO> anyTypeClassTOs, - final AbstractAnyRestClient<A, ?> restClient, + final E restClient, final String type, final PageReference pageRef) { @@ -182,7 +182,7 @@ public abstract class AnyDirectoryPanel<A extends AnyTO> this.type = type; } - public Builder<A> setRealm(final String realm) { + public Builder<A, E> setRealm(final String realm) { this.realm = realm; return this; } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java index 8969e32..d9c42f6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java @@ -56,7 +56,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; import org.springframework.util.ReflectionUtils; -public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO> { +public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyObjectRestClient> { private static final long serialVersionUID = -1100228004207271270L; @@ -240,7 +240,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO> { } - public static class Builder extends AnyDirectoryPanel.Builder<AnyObjectTO> { + public static class Builder extends AnyDirectoryPanel.Builder<AnyObjectTO, AnyObjectRestClient> { private static final long serialVersionUID = -6828423611982275641L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java index 129705b..218db10 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java @@ -45,6 +45,7 @@ import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.to.AnyTypeClassTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.types.AnyTypeKind; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.wicket.PageReference; @@ -58,7 +59,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; import org.springframework.util.ReflectionUtils; -public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO> { +public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestClient> { private static final long serialVersionUID = -1100228004207271270L; @@ -144,7 +145,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO> { public void onClick(final AjaxRequestTarget target, final GroupTO ignore) { send(GroupDirectoryPanel.this, Broadcast.EXACT, new AjaxWizard.EditItemActionEvent<>(new GroupWrapper( - new GroupRestClient().read(model.getObject().getKey())), target)); + restClient.read(model.getObject().getKey())), target)); } }, ActionType.EDIT, StandardEntitlement.GROUP_UPDATE).add(new ActionLink<GroupTO>() { @@ -207,7 +208,44 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO> { } SyncopeConsoleSession.get().getNotificationPanel().refresh(target); } - }, ActionType.DELETE, StandardEntitlement.GROUP_DELETE); + }, ActionType.DELETE, StandardEntitlement.GROUP_DELETE).add(new ActionLink<GroupTO>() { + + private static final long serialVersionUID = -7978723352517770644L; + + @Override + public void onClick(final AjaxRequestTarget target, final GroupTO ignore) { + try { + restClient.bulkMembersAction(model.getObject().getKey(), BulkMembersActionType.PROVISION); + info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(container); + } catch (SyncopeClientException e) { + LOG.error("While provisioning members of group {}", model.getObject().getKey(), e); + error(StringUtils.isBlank(e.getMessage()) + ? e.getClass().getName() : e.getMessage()); + } + SyncopeConsoleSession.get().getNotificationPanel().refresh(target); + } + }, ActionType.PROVISION_MEMBERS, + String.format("%s,%s", StandardEntitlement.TASK_CREATE, StandardEntitlement.TASK_EXECUTE)).add( + new ActionLink<GroupTO>() { + + private static final long serialVersionUID = -7978723352517770644L; + + @Override + public void onClick(final AjaxRequestTarget target, final GroupTO ignore) { + try { + restClient.bulkMembersAction(model.getObject().getKey(), BulkMembersActionType.DEPROVISION); + info(getString(Constants.OPERATION_SUCCEEDED)); + target.add(container); + } catch (SyncopeClientException e) { + LOG.error("While provisioning members of group {}", model.getObject().getKey(), e); + error(StringUtils.isBlank(e.getMessage()) + ? e.getClass().getName() : e.getMessage()); + } + SyncopeConsoleSession.get().getNotificationPanel().refresh(target); + } + }, ActionType.DEPROVISION_MEMBERS, + String.format("%s,%s", StandardEntitlement.TASK_CREATE, StandardEntitlement.TASK_EXECUTE)); return panel.build(componentId); } @@ -245,7 +283,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO> { return columns; } - public static class Builder extends AnyDirectoryPanel.Builder<GroupTO> { + public static class Builder extends AnyDirectoryPanel.Builder<GroupTO, GroupRestClient> { private static final long serialVersionUID = 3844281520756293159L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java index 166abbb..88963a6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java @@ -57,7 +57,7 @@ import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; import org.springframework.util.ReflectionUtils; -public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO> { +public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient> { private static final long serialVersionUID = -1100228004207271270L; @@ -278,7 +278,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO> { return columns; } - public static class Builder extends AnyDirectoryPanel.Builder<UserTO> { + public static class Builder extends AnyDirectoryPanel.Builder<UserTO, UserRestClient> { private static final long serialVersionUID = -6603152478702381900L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionDirectoryPanel.java index 57e0a32..e9eb5bf 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnyObjectSelectionDirectoryPanel.java @@ -28,7 +28,8 @@ import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AnyTypeClassTO; import org.apache.wicket.PageReference; -public final class AnyObjectSelectionDirectoryPanel extends AnySelectionDirectoryPanel<AnyObjectTO> { +public final class AnyObjectSelectionDirectoryPanel + extends AnySelectionDirectoryPanel<AnyObjectTO, AnyObjectRestClient> { private static final long serialVersionUID = -1100228004207271272L; @@ -61,7 +62,7 @@ public final class AnyObjectSelectionDirectoryPanel extends AnySelectionDirector return String.format(Constants.PREF_ANY_OBJECT_DER_ATTRS_VIEW, type); } - public static final class Builder extends AnySelectionDirectoryPanel.Builder<AnyObjectTO> { + public static final class Builder extends AnySelectionDirectoryPanel.Builder<AnyObjectTO, AnyObjectRestClient> { private static final long serialVersionUID = 5155811461060452446L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionDirectoryPanel.java index cb9de6d..3a0815c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AnySelectionDirectoryPanel.java @@ -53,76 +53,77 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; import org.springframework.util.ReflectionUtils; -public abstract class AnySelectionDirectoryPanel<T extends AnyTO> extends AnyDirectoryPanel<T> { +public abstract class AnySelectionDirectoryPanel<A extends AnyTO, E extends AbstractAnyRestClient<A, ?>> + extends AnyDirectoryPanel<A, E> { private static final long serialVersionUID = -1100228004207271272L; - private final Class<T> reference; + private final Class<A> reference; protected AnySelectionDirectoryPanel( - final String id, final AnyDirectoryPanel.Builder<T> builder, final Class<T> reference) { + final String id, final AnyDirectoryPanel.Builder<A, E> builder, final Class<A> reference) { super(id, builder); this.reference = reference; } @Override - protected List<IColumn<T, String>> getColumns() { - final List<IColumn<T, String>> columns = new ArrayList<>(); + protected List<IColumn<A, String>> getColumns() { + final List<IColumn<A, String>> columns = new ArrayList<>(); for (String name : prefMan.getList(getRequest(), getPrefDetailsView())) { final Field field = ReflectionUtils.findField(AnyObjectTO.class, name); if ("key".equalsIgnoreCase(name)) { - columns.add(new KeyPropertyColumn<T>(new ResourceModel(name, name), name, name)); + columns.add(new KeyPropertyColumn<A>(new ResourceModel(name, name), name, name)); } else if (reference == UserTO.class && "token".equalsIgnoreCase(name)) { - columns.add(new TokenColumn<T>(new ResourceModel(name, name), name)); + columns.add(new TokenColumn<A>(new ResourceModel(name, name), name)); } else if (field != null && (field.getType().equals(Boolean.class) || field.getType().equals(boolean.class))) { - columns.add(new BooleanPropertyColumn<T>(new ResourceModel(name, name), name, name)); + columns.add(new BooleanPropertyColumn<A>(new ResourceModel(name, name), name, name)); } else if (field != null && field.getType().equals(Date.class)) { - columns.add(new DatePropertyColumn<T>(new ResourceModel(name, name), name, name)); + columns.add(new DatePropertyColumn<A>(new ResourceModel(name, name), name, name)); } else { - columns.add(new PropertyColumn<T, String>(new ResourceModel(name, name), name, name)); + columns.add(new PropertyColumn<A, String>(new ResourceModel(name, name), name, name)); } } for (String name : prefMan.getList(getRequest(), getPrefPlainAttributesView())) { if (pSchemaNames.contains(name)) { - columns.add(new AttrColumn<T>(name, SchemaType.PLAIN)); + columns.add(new AttrColumn<A>(name, SchemaType.PLAIN)); } } for (String name : prefMan.getList(getRequest(), getPrefDerivedAttributesView())) { if (dSchemaNames.contains(name)) { - columns.add(new AttrColumn<T>(name, SchemaType.DERIVED)); + columns.add(new AttrColumn<A>(name, SchemaType.DERIVED)); } } // Add defaults in case of no selection if (columns.isEmpty()) { for (String name : getDisplayAttributes()) { - columns.add(new PropertyColumn<T, String>(new ResourceModel(name, name), name, name)); + columns.add(new PropertyColumn<A, String>(new ResourceModel(name, name), name, name)); } prefMan.setList(getRequest(), getResponse(), getPrefDetailsView(), Arrays.asList(getDisplayAttributes())); } - columns.add(new ActionColumn<T, String>(new ResourceModel("actions")) { + columns.add(new ActionColumn<A, String>(new ResourceModel("actions")) { private static final long serialVersionUID = -3503023501954863131L; @Override - public ActionLinksPanel<T> getActions(final String componentId, final IModel<T> model) { - final ActionLinksPanel.Builder<T> panel = ActionLinksPanel.builder(); + public ActionLinksPanel<A> getActions(final String componentId, final IModel<A> model) { + final ActionLinksPanel.Builder<A> panel = ActionLinksPanel.builder(); - panel.add(new ActionLink<T>() { + panel.add(new ActionLink<A>() { private static final long serialVersionUID = -7978723352517770644L; @Override - public void onClick(final AjaxRequestTarget target, final T ignore) { + public void onClick(final AjaxRequestTarget target, final A ignore) { send(AnySelectionDirectoryPanel.this, Broadcast.BUBBLE, new ItemSelection<>(target, model.getObject())); } @@ -132,15 +133,15 @@ public abstract class AnySelectionDirectoryPanel<T extends AnyTO> extends AnyDir } @Override - public ActionLinksPanel<T> getHeader(final String componentId) { - final ActionLinksPanel.Builder<T> panel = ActionLinksPanel.builder(); + public ActionLinksPanel<A> getHeader(final String componentId) { + final ActionLinksPanel.Builder<A> panel = ActionLinksPanel.builder(); - return panel.add(new ActionLink<T>() { + return panel.add(new ActionLink<A>() { private static final long serialVersionUID = -7978723352517770644L; @Override - public void onClick(final AjaxRequestTarget target, final T ignore) { + public void onClick(final AjaxRequestTarget target, final A ignore) { // still missing content target.add(altDefaultModal.setContent(new AnyObjectDisplayAttributesModalPanel<>( altDefaultModal, page.getPageReference(), pSchemaNames, dSchemaNames, type))); @@ -149,12 +150,12 @@ public abstract class AnySelectionDirectoryPanel<T extends AnyTO> extends AnyDir altDefaultModal.header(new ResourceModel("any.attr.display")); altDefaultModal.show(true); } - }, ActionType.CHANGE_VIEW, AnyEntitlement.READ.getFor(type)).add(new ActionLink<T>() { + }, ActionType.CHANGE_VIEW, AnyEntitlement.READ.getFor(type)).add(new ActionLink<A>() { private static final long serialVersionUID = -7978723352517770644L; @Override - public void onClick(final AjaxRequestTarget target, final T ignore) { + public void onClick(final AjaxRequestTarget target, final A ignore) { if (target != null) { target.add(container); } @@ -180,13 +181,14 @@ public abstract class AnySelectionDirectoryPanel<T extends AnyTO> extends AnyDir protected abstract String getPrefDerivedAttributesView(); - public abstract static class Builder<A extends AnyTO> extends AnyDirectoryPanel.Builder<A> { + public abstract static class Builder<A extends AnyTO, E extends AbstractAnyRestClient<A, ?>> + extends AnyDirectoryPanel.Builder<A, E> { private static final long serialVersionUID = 5460024856989891156L; public Builder( final List<AnyTypeClassTO> anyTypeClassTOs, - final AbstractAnyRestClient<A, ?> restClient, + final E restClient, final String type, final PageReference pageRef) { http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionDirectoryPanel.java index d2e21bd..0076af9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/GroupSelectionDirectoryPanel.java @@ -28,7 +28,7 @@ import org.apache.syncope.common.lib.to.AnyTypeClassTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.wicket.PageReference; -public final class GroupSelectionDirectoryPanel extends AnySelectionDirectoryPanel<GroupTO> { +public final class GroupSelectionDirectoryPanel extends AnySelectionDirectoryPanel<GroupTO, GroupRestClient> { private static final long serialVersionUID = -1100228004207271271L; @@ -61,7 +61,7 @@ public final class GroupSelectionDirectoryPanel extends AnySelectionDirectoryPan return Constants.PREF_GROUP_DER_ATTRS_VIEW; } - public static final class Builder extends AnySelectionDirectoryPanel.Builder<GroupTO> { + public static final class Builder extends AnySelectionDirectoryPanel.Builder<GroupTO, GroupRestClient> { private static final long serialVersionUID = -8774023867045850683L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionDirectoryPanel.java index 6398e82..7545ec7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/UserSelectionDirectoryPanel.java @@ -28,7 +28,7 @@ import org.apache.syncope.common.lib.to.AnyTypeClassTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.wicket.PageReference; -public final class UserSelectionDirectoryPanel extends AnySelectionDirectoryPanel<UserTO> { +public final class UserSelectionDirectoryPanel extends AnySelectionDirectoryPanel<UserTO, UserRestClient> { private static final long serialVersionUID = -1100228004207271272L; @@ -61,7 +61,7 @@ public final class UserSelectionDirectoryPanel extends AnySelectionDirectoryPane return Constants.PREF_USERS_DER_ATTRS_VIEW; } - public static final class Builder extends AnySelectionDirectoryPanel.Builder<UserTO> { + public static final class Builder extends AnySelectionDirectoryPanel.Builder<UserTO, UserRestClient> { private static final long serialVersionUID = -1555789797531054422L; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java index 0fddcb2..7b45005 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/GroupRestClient.java @@ -21,6 +21,7 @@ package org.apache.syncope.client.console.rest; import java.util.List; import org.apache.syncope.common.lib.patch.GroupPatch; import org.apache.syncope.common.lib.to.GroupTO; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.rest.api.beans.AnyListQuery; import org.apache.syncope.common.rest.api.beans.AnySearchQuery; import org.apache.syncope.common.rest.api.service.AnyService; @@ -74,4 +75,7 @@ public class GroupRestClient extends AbstractAnyRestClient<GroupTO, GroupPatch> getResult(); } + public void bulkMembersAction(final String key, final BulkMembersActionType actionType) { + getService(GroupService.class).bulkMembersAction(key, actionType); + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java index 504bb0d..6655949 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java @@ -53,6 +53,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.event.Broadcast; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; +import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.basic.Label; @@ -314,16 +315,15 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO> public SchedTasksProvider(final Class<T> reference, final TaskType id, final int paginatorRows) { super(paginatorRows, id, restClient); + setSort("name", SortOrder.DESCENDING); this.reference = reference; } @Override public Iterator<T> iterator(final long first, final long count) { - final int page = ((int) first / paginatorRows); - - final List<T> tasks = restClient.list( - reference, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); + int page = ((int) first / paginatorRows); + List<T> tasks = restClient.list(reference, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); Collections.sort(tasks, getComparator()); return tasks.iterator(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java index 528fa03..4faf86e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java @@ -81,6 +81,8 @@ public abstract class ActionLink<T extends Serializable> implements Serializable ASSIGN("update"), DEPROVISION("update"), PROVISION("update"), + DEPROVISION_MEMBERS("update"), + PROVISION_MEMBERS("update"), MANAGE_RESOURCES("update"), MANAGE_USERS("update"), MANAGE_GROUPS("update"), http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java index 1e153d8..4ba5a0e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java @@ -95,6 +95,8 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel { super.add(new Fragment("panelAssign", "emptyFragment", this)); super.add(new Fragment("panelDeprovision", "emptyFragment", this)); super.add(new Fragment("panelProvision", "emptyFragment", this)); + super.add(new Fragment("panelDeprovisionMembers", "emptyFragment", this)); + super.add(new Fragment("panelProvisionMembers", "emptyFragment", this)); super.add(new Fragment("panelPropagationTasks", "emptyFragment", this)); super.add(new Fragment("panelNotificationTasks", "emptyFragment", this)); super.add(new Fragment("panelZoomIn", "emptyFragment", this)); @@ -899,8 +901,7 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel { case DEPROVISION: fragment = new Fragment("panelDeprovision", "fragmentDeprovision", this); - fragment.addOrReplace( - new IndicatingOnConfirmAjaxLink<Void>("deprovisionLink", "confirmDeprovision", enabled) { + fragment.addOrReplace(new IndicatingAjaxLink<Void>("deprovisionLink") { private static final long serialVersionUID = -6957616042924610295L; @@ -935,6 +936,44 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel { }.setVisible(link.isEnabled(model.getObject()))); break; + case DEPROVISION_MEMBERS: + fragment = new Fragment("panelDeprovisionMembers", "fragmentDeprovisionMembers", this); + + fragment.addOrReplace(new IndicatingAjaxLink<Void>("deprovisionMembersLink") { + + private static final long serialVersionUID = -6957616042924610295L; + + @Override + public void onClick(final AjaxRequestTarget target) { + link.onClick(target, model.getObject()); + } + + @Override + public String getAjaxIndicatorMarkupId() { + return disableIndicator ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId(); + } + }.setVisible(link.isEnabled(model.getObject()))); + break; + + case PROVISION_MEMBERS: + fragment = new Fragment("panelProvisionMembers", "fragmentProvisionMembers", this); + + fragment.addOrReplace(new IndicatingAjaxLink<Void>("provisionMembersLink") { + + private static final long serialVersionUID = -1876519166660008562L; + + @Override + public void onClick(final AjaxRequestTarget target) { + link.onClick(target, model.getObject()); + } + + @Override + public String getAjaxIndicatorMarkupId() { + return disableIndicator ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId(); + } + }.setVisible(link.isEnabled(model.getObject()))); + break; + case PROPAGATION_TASKS: fragment = new Fragment("panelPropagationTasks", "fragmentPropagationTasks", this); http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/resources/META-INF/resources/css/bulk.css ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/META-INF/resources/css/bulk.css b/client/console/src/main/resources/META-INF/resources/css/bulk.css index 2f56bd6..0cf6b23 100644 --- a/client/console/src/main/resources/META-INF/resources/css/bulk.css +++ b/client/console/src/main/resources/META-INF/resources/css/bulk.css @@ -16,16 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -th.checkGroupColumn{ - width: 20px; - text-align: center; - padding-right: 8px !important; -} - -td.checkGroupColumn{ - text-align: center; -} - div.bulkAction{ display:inline-table; } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css index 592bdb3..7e4d088 100644 --- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css +++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css @@ -335,6 +335,16 @@ div#outer.modal-lg, div#utilityModal.modal-lg, section#notifications .modal-lg { display: block } +th.checkGroupColumn { + width: 20px; + text-align: center; + padding-right: 8px !important; +} + +td.checkGroupColumn { + text-align: center; +} + /** BEGIN - Style for Information panel */ http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/resources/org/apache/syncope/client/console/panels/ActionDataTablePanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ActionDataTablePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ActionDataTablePanel.html index 9f21f52..3c0a008 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ActionDataTablePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ActionDataTablePanel.html @@ -17,11 +17,7 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org"> - <wicket:head> - <!--<link rel="stylesheet" type="text/css" href="css/bulk.css" media="all"/>--> - </wicket:head> <wicket:panel> - <form wicket:id="groupForm"> <span wicket:id="checkgroup"> <table class="ui-widget ui-widget-content table-hover" wicket:id="dataTable">[Data Table]</table> @@ -40,6 +36,5 @@ under the License. </div> </div> </form> - </wicket:panel> </html> http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AjaxDataTablePanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AjaxDataTablePanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AjaxDataTablePanel.html index 1966ec4..0032e7f 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AjaxDataTablePanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AjaxDataTablePanel.html @@ -17,9 +17,6 @@ specific language governing permissions and limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org"> - <wicket:head> - <!--<link rel="stylesheet" type="text/css" href="css/bulk.css" media="all"/>--> - </wicket:head> <wicket:panel> <span wicket:id="tablePanel">[Table panel]</span> <div wicket:id="bulkModal" /> http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html index c9a8aa7..5b20816 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html @@ -59,6 +59,8 @@ under the License. <span wicket:id="panelExportXML">[plus]</span> <span wicket:id="panelPropagationTasks">[plus]</span> <span wicket:id="panelNotificationTasks">[plus]</span> + <span wicket:id="panelDeprovisionMembers">[plus]</span> + <span wicket:id="panelProvisionMembers">[plus]</span> <span wicket:id="panelDelete">[plus]</span> <span wicket:id="panelSelect">[select]</span> <span wicket:id="panelClose">[close]</span> @@ -244,19 +246,27 @@ under the License. </wicket:fragment> <wicket:fragment wicket:id="fragmentUnassign"> - <a href="#" wicket:id="unassignLink" class="btn"><i class="glyphicon glyphicon-remove" alt="Unassign icon" title="Unassign"></i></a> + <a href="#" wicket:id="unassignLink" class="btn"><i class="glyphicon glyphicon-resize-full" alt="Unassign icon" title="Unassign"></i></a> </wicket:fragment> <wicket:fragment wicket:id="fragmentAssign"> - <a href="#" wicket:id="assignLink" class="btn"><i class="glyphicon glyphicon-ok" alt="Assign icon" title="Assign"></i></a> + <a href="#" wicket:id="assignLink" class="btn"><i class="glyphicon glyphicon-resize-small" alt="Assign icon" title="Assign"></i></a> </wicket:fragment> <wicket:fragment wicket:id="fragmentDeprovision"> - <a href="#" wicket:id="deprovisionLink" class="btn"><i class="glyphicon glyphicon-minus" alt="De-provision icon" title="De-provision"></i></a> + <a href="#" wicket:id="deprovisionLink" class="btn"><i class="glyphicon glyphicon-fast-backward" alt="Deprovision icon" title="Deprovision"></i></a> </wicket:fragment> <wicket:fragment wicket:id="fragmentProvision"> - <a href="#" wicket:id="provisionLink" class="btn"><i class="glyphicon glyphicon-share-alt" alt="Provision icon" title="Provision"></i></a> + <a href="#" wicket:id="provisionLink" class="btn"><i class="glyphicon glyphicon-fast-forward" alt="Provision icon" title="Provision"></i></a> + </wicket:fragment> + + <wicket:fragment wicket:id="fragmentDeprovisionMembers"> + <a href="#" wicket:id="deprovisionMembersLink" class="btn"><i class="glyphicon glyphicon-fast-backward" alt="Deprovision icon" title="Deprovision members"></i></a> + </wicket:fragment> + + <wicket:fragment wicket:id="fragmentProvisionMembers"> + <a href="#" wicket:id="provisionMembersLink" class="btn"><i class="glyphicon glyphicon-fast-forward" alt="Provision icon" title="Provision members"></i></a> </wicket:fragment> <wicket:fragment wicket:id="fragmentZoomIn"> http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java new file mode 100644 index 0000000..c86559a --- /dev/null +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/BulkMembersActionType.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.syncope.common.lib.types; + +import javax.xml.bind.annotation.XmlEnum; + +@XmlEnum +public enum BulkMembersActionType { + + PROVISION, + DEPROVISION; + +} http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java index ef3b732..3387137 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/UnmatchingRule.java @@ -21,7 +21,7 @@ package org.apache.syncope.common.lib.types; import javax.xml.bind.annotation.XmlEnum; /** - * Sync/Push task un-matching rule. + * Pull/Push task un-matching rule. */ @XmlEnum public enum UnmatchingRule { http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java index 4193771..cc0d677 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/GroupService.java @@ -19,14 +19,19 @@ package org.apache.syncope.common.rest.api.service; import java.util.List; +import javax.validation.constraints.NotNull; import javax.ws.rs.BeanParam; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import org.apache.syncope.common.lib.patch.GroupPatch; +import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.PagedResult; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.rest.api.beans.AnyListQuery; /** @@ -55,4 +60,17 @@ public interface GroupService extends AnyService<GroupTO, GroupPatch> { @GET @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) PagedResult<GroupTO> list(@BeanParam AnyListQuery listQuery); + + /** + * (De)provision all members of the given group from / onto all the resources associated to it. + * + * @param key group key + * @param actionType action type to perform on all group members + * @return execution report for the task generated on purpose + */ + @POST + @Path("{key}/members/{actionType}") + ExecTO bulkMembersAction( + @NotNull @PathParam("key") String key, + @NotNull @PathParam("actionType") BulkMembersActionType actionType); } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java index 232010e..f66750e 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/GroupLogic.java @@ -21,7 +21,9 @@ package org.apache.syncope.core.logic; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; @@ -34,11 +36,14 @@ import org.apache.syncope.common.lib.SyncopeClientException; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.syncope.common.lib.patch.GroupPatch; import org.apache.syncope.common.lib.patch.StringPatchItem; +import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.to.PropagationStatus; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.ProvisioningResult; import org.apache.syncope.common.lib.types.AnyTypeKind; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.lib.types.ClientExceptionType; +import org.apache.syncope.common.lib.types.JobType; import org.apache.syncope.common.lib.types.PatchOperation; import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.core.provisioning.api.utils.RealmUtils; @@ -52,8 +57,20 @@ import org.apache.syncope.core.provisioning.api.data.GroupDataBinder; import org.apache.syncope.core.spring.security.AuthContextUtils; import org.apache.syncope.core.spring.security.DelegatedAdministrationException; import org.apache.syncope.core.persistence.api.dao.AnySearchDAO; +import org.apache.syncope.core.persistence.api.dao.ConfDAO; +import org.apache.syncope.core.persistence.api.dao.NotFoundException; +import org.apache.syncope.core.persistence.api.dao.TaskDAO; +import org.apache.syncope.core.persistence.api.entity.EntityFactory; +import org.apache.syncope.core.persistence.api.entity.task.SchedTask; import org.apache.syncope.core.provisioning.api.LogicActions; +import org.apache.syncope.core.provisioning.api.data.TaskDataBinder; +import org.apache.syncope.core.provisioning.api.job.JobManager; +import org.apache.syncope.core.provisioning.api.job.JobNamer; +import org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate; +import org.apache.syncope.core.provisioning.java.job.TaskJob; +import org.quartz.JobDataMap; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -75,11 +92,29 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> { protected AnySearchDAO searchDAO; @Autowired + protected TaskDAO taskDAO; + + @Autowired + protected ConfDAO confDAO; + + @Autowired protected GroupDataBinder binder; @Autowired protected GroupProvisioningManager provisioningManager; + @Autowired + protected TaskDataBinder taskDataBinder; + + @Autowired + protected JobManager jobManager; + + @Autowired + protected SchedulerFactoryBean scheduler; + + @Autowired + protected EntityFactory entityFactory; + @Override protected void securityChecks(final Set<String> effectiveRealms, final String realm, final String key) { if (!IterableUtils.matchesAny(effectiveRealms, new Predicate<String>() { @@ -382,6 +417,53 @@ public class GroupLogic extends AbstractAnyLogic<GroupTO, GroupPatch> { return result; } + @PreAuthorize("hasRole('" + StandardEntitlement.TASK_CREATE + "') " + + "and hasRole('" + StandardEntitlement.TASK_EXECUTE + "')") + @Transactional + public ExecTO bulkMembersAction(final String key, final BulkMembersActionType actionType) { + Group group = groupDAO.find(key); + if (group == null) { + throw new NotFoundException("Group " + key); + } + + SchedTask task = entityFactory.newEntity(SchedTask.class); + task.setName("Bulk member provision for group " + group.getName()); + task.setActive(true); + task.setJobDelegateClassName(GroupMemberProvisionTaskJobDelegate.class.getName()); + task = taskDAO.save(task); + + try { + Map<String, Object> jobDataMap = jobManager.register( + task, + null, + confDAO.find("tasks.interruptMaxRetries", "1").getValues().get(0).getLongValue()); + + jobDataMap.put(TaskJob.DRY_RUN_JOBDETAIL_KEY, false); + jobDataMap.put(GroupMemberProvisionTaskJobDelegate.GROUP_KEY_JOBDETAIL_KEY, key); + jobDataMap.put(GroupMemberProvisionTaskJobDelegate.ACTION_TYPE_JOBDETAIL_KEY, actionType); + + scheduler.getScheduler().triggerJob( + JobNamer.getJobKey(task), + new JobDataMap(jobDataMap)); + } catch (Exception e) { + LOG.error("While executing task {}", task, e); + + SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.Scheduling); + sce.getElements().add(e.getMessage()); + throw sce; + } + + ExecTO result = new ExecTO(); + result.setJobType(JobType.TASK); + result.setRefKey(task.getKey()); + result.setRefDesc(taskDataBinder.buildRefDesc(task)); + result.setStart(new Date()); + result.setStatus("JOB_FIRED"); + result.setMessage("Job fired; waiting for results..."); + + return result; + } + @Override protected GroupTO resolveReference(final Method method, final Object... args) throws UnresolvedReferenceException { String key = null; http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java index beff515..0192a2a 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/ClassPathScanImplementationLookup.java @@ -56,6 +56,7 @@ import org.apache.syncope.core.provisioning.api.pushpull.ReconciliationFilterBui import org.apache.syncope.core.provisioning.api.pushpull.PullCorrelationRule; import org.apache.syncope.core.provisioning.api.pushpull.PullActions; import org.apache.syncope.core.provisioning.java.data.JEXLMappingItemTransformer; +import org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate; /** * Cache class names for all implementations of Syncope interfaces found in classpath, for later usage. @@ -145,7 +146,8 @@ public class ClassPathScanImplementationLookup implements ImplementationLookup { if (SchedTaskJobDelegate.class.isAssignableFrom(clazz) && !isAbsractClazz && !PullJobDelegate.class.isAssignableFrom(clazz) - && !PushJobDelegate.class.isAssignableFrom(clazz)) { + && !PushJobDelegate.class.isAssignableFrom(clazz) + && !GroupMemberProvisionTaskJobDelegate.class.isAssignableFrom(clazz)) { classNames.get(Type.TASKJOBDELEGATE).add(bd.getBeanClassName()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java index 03c426a..379d386 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java @@ -93,7 +93,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>> extends AbstractDAO<A> im @Override public A authFind(final String key) { if (key == null) { - throw new NotFoundException("Null id"); + throw new NotFoundException("Null key"); } A any = find(key); http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/SchedTaskJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/SchedTaskJobDelegate.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/SchedTaskJobDelegate.java index 0217dda..a03f36b 100644 --- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/SchedTaskJobDelegate.java +++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/job/SchedTaskJobDelegate.java @@ -18,9 +18,10 @@ */ package org.apache.syncope.core.provisioning.api.job; +import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; public interface SchedTaskJobDelegate { - void execute(String taskKey, boolean dryRun) throws JobExecutionException; + void execute(String taskKey, boolean dryRun, JobExecutionContext context) throws JobExecutionException; } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java index 0d5884f..5fc5405 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/AbstractSchedTaskJobDelegate.java @@ -29,6 +29,7 @@ import org.apache.syncope.core.persistence.api.entity.task.TaskExec; import org.apache.syncope.core.provisioning.api.AuditManager; import org.apache.syncope.core.provisioning.api.job.SchedTaskJobDelegate; import org.apache.syncope.core.provisioning.api.notification.NotificationManager; +import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +74,9 @@ public abstract class AbstractSchedTaskJobDelegate implements SchedTaskJobDelega @Transactional @Override - public void execute(final String taskKey, final boolean dryRun) throws JobExecutionException { + public void execute(final String taskKey, final boolean dryRun, final JobExecutionContext context) + throws JobExecutionException { + task = taskDAO.find(taskKey); if (task == null) { throw new JobExecutionException("Task " + taskKey + " not found"); http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/GroupMemberProvisionTaskJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/GroupMemberProvisionTaskJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/GroupMemberProvisionTaskJobDelegate.java new file mode 100644 index 0000000..3040d13 --- /dev/null +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/GroupMemberProvisionTaskJobDelegate.java @@ -0,0 +1,132 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.syncope.core.provisioning.java.job; + +import java.util.List; +import org.apache.commons.lang3.StringUtils; +import org.apache.syncope.common.lib.to.PropagationStatus; +import org.apache.syncope.common.lib.types.AnyTypeKind; +import org.apache.syncope.common.lib.types.BulkMembersActionType; +import org.apache.syncope.core.persistence.api.dao.AnySearchDAO; +import org.apache.syncope.core.persistence.api.dao.GroupDAO; +import org.apache.syncope.core.persistence.api.dao.search.MembershipCond; +import org.apache.syncope.core.persistence.api.dao.search.SearchCond; +import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject; +import org.apache.syncope.core.persistence.api.entity.group.Group; +import org.apache.syncope.core.persistence.api.entity.task.TaskExec; +import org.apache.syncope.core.persistence.api.entity.user.User; +import org.apache.syncope.core.provisioning.api.AnyObjectProvisioningManager; +import org.apache.syncope.core.provisioning.api.UserProvisioningManager; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +public class GroupMemberProvisionTaskJobDelegate extends AbstractSchedTaskJobDelegate { + + public static final String ACTION_TYPE_JOBDETAIL_KEY = "actionType"; + + public static final String GROUP_KEY_JOBDETAIL_KEY = "groupKey"; + + @Autowired + private GroupDAO groupDAO; + + @Autowired + private AnySearchDAO searchDAO; + + @Autowired + private UserProvisioningManager userProvisioningManager; + + @Autowired + private AnyObjectProvisioningManager anyObjectProvisioningManager; + + private String groupKey; + + private BulkMembersActionType actionType; + + @Transactional + @Override + public void execute(final String taskKey, final boolean dryRun, final JobExecutionContext context) + throws JobExecutionException { + + groupKey = context.getMergedJobDataMap().getString(GROUP_KEY_JOBDETAIL_KEY); + actionType = (BulkMembersActionType) context.getMergedJobDataMap().get(ACTION_TYPE_JOBDETAIL_KEY); + + super.execute(taskKey, dryRun, context); + } + + @Override + protected String doExecute(final boolean dryRun) throws JobExecutionException { + Group group = groupDAO.authFind(groupKey); + + StringBuilder result = new StringBuilder("Group ").append(group.getName()).append(" members "); + if (actionType == BulkMembersActionType.DEPROVISION) { + result.append("de"); + } + result.append("provision\n\n"); + + MembershipCond membershipCond = new MembershipCond(); + membershipCond.setGroupKey(groupKey); + List<User> users = searchDAO.search(SearchCond.getLeafCond(membershipCond), AnyTypeKind.USER); + for (User user : users) { + List<PropagationStatus> statuses = actionType == BulkMembersActionType.DEPROVISION + ? userProvisioningManager.deprovision(user.getKey(), group.getResourceNames(), false) + : userProvisioningManager.provision(user.getKey(), true, null, group.getResourceNames(), false); + for (PropagationStatus status : statuses) { + result.append("User ").append(user.getKey()).append('\t'). + append("Resource ").append(status.getResource()).append('\t'). + append(status.getStatus()); + if (StringUtils.isNotBlank(status.getFailureReason())) { + result.append('\n').append(status.getFailureReason()).append('\n'); + } + result.append("\n"); + } + result.append("\n"); + } + + membershipCond = new MembershipCond(); + membershipCond.setGroupKey(groupKey); + List<AnyObject> anyObjects = searchDAO.search(SearchCond.getLeafCond(membershipCond), AnyTypeKind.ANY_OBJECT); + for (AnyObject anyObject : anyObjects) { + List<PropagationStatus> statuses = actionType == BulkMembersActionType.DEPROVISION + ? anyObjectProvisioningManager.deprovision(anyObject.getKey(), group.getResourceNames(), false) + : anyObjectProvisioningManager.provision(anyObject.getKey(), group.getResourceNames(), false); + + for (PropagationStatus status : statuses) { + result.append(anyObject.getType().getKey()).append(' ').append(anyObject.getKey()).append('\t'). + append("Resource ").append(status.getResource()).append('\t'). + append(status.getStatus()); + if (StringUtils.isNotBlank(status.getFailureReason())) { + result.append('\n').append(status.getFailureReason()).append('\n'); + } + result.append("\n"); + } + result.append("\n"); + } + + return result.toString(); + } + + @Override + protected boolean hasToBeRegistered(final TaskExec execution) { + // always record execution result + return true; + } + +} http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java index 1036a1f..041d3b4 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/TaskJob.java @@ -77,7 +77,9 @@ public class TaskJob extends AbstractInterruptableJob { ((SchedTaskJobDelegate) ApplicationContextProvider.getBeanFactory(). createBean(delegateClass, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false)). - execute(taskKey, context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY)); + execute(taskKey, + context.getMergedJobDataMap().getBoolean(DRY_RUN_JOBDETAIL_KEY), + context); } catch (Exception e) { LOG.error("While executing task {}", taskKey, e); throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/GroupServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/GroupServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/GroupServiceImpl.java index d32d87c..f19b6fa 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/GroupServiceImpl.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/GroupServiceImpl.java @@ -20,8 +20,10 @@ package org.apache.syncope.core.rest.cxf.service; import java.util.List; import org.apache.syncope.common.lib.patch.GroupPatch; +import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.PagedResult; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.rest.api.beans.AnyListQuery; import org.apache.syncope.common.rest.api.service.GroupService; import org.apache.syncope.core.logic.AbstractAnyLogic; @@ -57,4 +59,9 @@ public class GroupServiceImpl extends AbstractAnyService<GroupTO, GroupPatch> im return super.list(listQuery); } + @Override + public ExecTO bulkMembersAction(final String key, final BulkMembersActionType actionType) { + return logic.bulkMembersAction(key, actionType); + } + } http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java index e8d03d0..b654ac1 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java @@ -48,6 +48,7 @@ import org.apache.syncope.common.lib.patch.AssociationPatch; import org.apache.syncope.common.lib.patch.AttrPatch; import org.apache.syncope.common.lib.patch.DeassociationPatch; import org.apache.syncope.common.lib.patch.GroupPatch; +import org.apache.syncope.common.lib.patch.StringPatchItem; import org.apache.syncope.common.lib.patch.StringReplacePatchItem; import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AnyTypeClassTO; @@ -56,18 +57,23 @@ import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.to.BulkActionResult; import org.apache.syncope.common.lib.to.ConnInstanceTO; import org.apache.syncope.common.lib.to.ConnObjectTO; +import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.to.MappingItemTO; import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.to.PlainSchemaTO; import org.apache.syncope.common.lib.to.ResourceTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.MappingTO; +import org.apache.syncope.common.lib.to.MembershipTO; +import org.apache.syncope.common.lib.to.PropagationStatus; import org.apache.syncope.common.lib.to.ProvisionTO; import org.apache.syncope.common.lib.to.ProvisioningResult; +import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.to.TypeExtensionTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.AttrSchemaType; +import org.apache.syncope.common.lib.types.BulkMembersActionType; import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.ConnectorCapability; import org.apache.syncope.common.lib.types.IntMappingType; @@ -80,6 +86,7 @@ import org.apache.syncope.common.lib.types.SchemaType; import org.apache.syncope.common.rest.api.beans.AnyListQuery; import org.apache.syncope.common.rest.api.beans.AnySearchQuery; import org.apache.syncope.common.rest.api.service.GroupService; +import org.apache.syncope.core.provisioning.java.job.TaskJob; import org.apache.syncope.fit.AbstractITCase; import org.junit.FixMethodOrder; import org.junit.Test; @@ -775,6 +782,69 @@ public class GroupITCase extends AbstractITCase { } @Test + public void bulkMembersAction() throws InterruptedException { + // 1. create group without resources + GroupTO groupTO = getBasicSampleTO("forProvision"); + groupTO = createGroup(groupTO).getAny(); + + // 2. create user with such group assigned + UserTO userTO = UserITCase.getUniqueSampleTO("[email protected]"); + userTO.getMemberships().add(new MembershipTO.Builder().group(groupTO.getKey()).build()); + userTO = createUser(userTO).getAny(); + + // 3. modify the group by assiging the LDAP resource + GroupPatch groupPatch = new GroupPatch(); + groupPatch.setKey(groupTO.getKey()); + groupPatch.getResources().add(new StringPatchItem.Builder().value(RESOURCE_NAME_LDAP).build()); + ProvisioningResult<GroupTO> groupUpdateResult = updateGroup(groupPatch); + groupTO = groupUpdateResult.getAny(); + + PropagationStatus propStatus = groupUpdateResult.getPropagationStatuses().get(0); + assertEquals(RESOURCE_NAME_LDAP, propStatus.getResource()); + assertEquals(PropagationTaskExecStatus.SUCCESS, propStatus.getStatus()); + + // 4. verify that the user above is not found on LDAP + try { + resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), userTO.getKey()); + fail(); + } catch (SyncopeClientException e) { + assertEquals(ClientExceptionType.NotFound, e.getType()); + } + + try { + // 5. bulk provision group members + ExecTO exec = groupService.bulkMembersAction(groupTO.getKey(), BulkMembersActionType.PROVISION); + assertNotNull(exec.getRefKey()); + + int i = 0; + int maxit = 50; + + // wait for task exec completion (executions incremented) + SchedTaskTO taskTO; + do { + Thread.sleep(1000); + + taskTO = taskService.read(exec.getRefKey(), true); + + assertNotNull(taskTO); + assertNotNull(taskTO.getExecutions()); + i++; + } while (taskTO.getExecutions().isEmpty() && i < maxit); + assertFalse(taskTO.getExecutions().isEmpty()); + + assertEquals(TaskJob.Status.SUCCESS.name(), taskTO.getExecutions().get(0).getStatus()); + + // 6. verify that the user above is now fond on LDAP + ConnObjectTO userOnLdap = + resourceService.readConnObject(RESOURCE_NAME_LDAP, AnyTypeKind.USER.name(), userTO.getKey()); + assertNotNull(userOnLdap); + } finally { + groupService.delete(groupTO.getKey()); + userService.delete(userTO.getKey()); + } + } + + @Test public void issue178() { GroupTO groupTO = new GroupTO(); String groupName = "torename" + getUUIDString(); http://git-wip-us.apache.org/repos/asf/syncope/blob/98673c0e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 610bf0e..b66a0c0 100644 --- a/pom.xml +++ b/pom.xml @@ -401,7 +401,7 @@ under the License. <angular.version>1.5.5</angular.version> <angular-ui-router.version>0.2.18</angular-ui-router.version> - <angular-ui-bootstrap.version>1.3.2</angular-ui-bootstrap.version> + <angular-ui-bootstrap.version>1.3.3</angular-ui-bootstrap.version> <angular-ui-select.version>0.14.8</angular-ui-select.version> <angular-treasure-overlay-spinner.version>1.1.0</angular-treasure-overlay-spinner.version> <ng-password-strength.version>0.2.1</ng-password-strength.version>
