diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java index 4d4d2eb907d..af46d2f88d0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java @@ -62,6 +62,7 @@ import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.task.api.TaskCategory; import com.evolveum.midpoint.task.api.TaskManager; +import com.evolveum.midpoint.util.CheckedProducer; import com.evolveum.midpoint.util.Holder; import com.evolveum.midpoint.util.Producer; import com.evolveum.midpoint.util.QNameUtil; @@ -2305,6 +2306,26 @@ public T runPrivileged(Producer producer) { return securityContextManager.runPrivileged(producer); } + public T runAsChecked(CheckedProducer producer, PrismObject user) throws CommonException { + return securityContextManager.runAsChecked(producer, user); + } + + @NotNull public PrismObject getAdministratorPrivileged(OperationResult parentResult) throws CommonException { + OperationResult result = parentResult.createSubresult(OPERATION_LOAD_USER); + try { + return securityContextManager.runPrivilegedChecked(() -> { + Task task = createAnonymousTask(OPERATION_LOAD_USER); + return getModelService() + .getObject(UserType.class, SystemObjectsType.USER_ADMINISTRATOR.value(), null, task, result); + }); + } catch (Throwable t) { + result.recordFatalError("Couldn't get administrator user: " + t.getMessage(), t); + throw t; + } finally { + result.computeStatusIfUnknown(); + } + } + public void setBreadcrumbs(List breadcrumbs) { getBreadcrumbs().clear(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java index fb9afa779c6..e352d0932d2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java @@ -185,7 +185,7 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu System.setProperty(MIDPOINT_HOME_PROPERTY, mpHome); } - System.setProperty("spring.config.location", MidPointSpringApplication.class.getResource("/") + ",${midpoint.home}/"); + System.setProperty("spring.config.additional-location", "${midpoint.home}/"); application.bannerMode(Banner.Mode.LOG); @@ -267,6 +267,8 @@ public class ServerCustomization implements WebServerFactoryCustomizer * This could not be done with midPoint servlets or servlet filters. The entire * midPoint application is under /midpoint/, so the application won't even receive * requests to root URL. We need to use dirty Tomcat-specific tricks for this. - * - * @author semancik * + * @author semancik */ public class TomcatRootValve extends ValveBase { private static final Trace LOGGER = TraceManager.getTrace(TomcatRootValve.class); - + + private String servletPath; + + public TomcatRootValve(String serlvetPath) { + super(); + + this.servletPath = serlvetPath == null ? "" : serlvetPath; + } + @Override public void invoke(Request request, Response response) throws IOException, ServletException { - + Context context = request.getContext(); if (context instanceof RootRootContext) { String uri = request.getDecodedRequestURI(); if (uri.endsWith("favicon.ico")) { LOGGER.trace("Redirecting favicon request to real application (URI={})", request.getDecodedRequestURI()); - response.sendRedirect("/midpoint/favicon.ico"); + response.sendRedirect(servletPath + "/favicon.ico"); return; } else { LOGGER.trace("Redirecting request to real application root (URI={})", request.getDecodedRequestURI()); - response.sendRedirect("/midpoint/"); + response.sendRedirect(servletPath + "/"); return; } } - + getNext().invoke(request, response); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java index 1728c3b5648..7893095ec02 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java @@ -230,6 +230,11 @@ static String getDisplayNameFromItem(Item item) { QName name = item.getElementName(); if (name != null) { displayName = name.getLocalPart(); + + PrismValue val = item.getParent(); + if (val != null && val.getTypeName() != null) { + displayName = val.getTypeName().getLocalPart() + "." + displayName; + } } else { displayName = item.getDefinition().getTypeName().getLocalPart(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html index cfad081ed7d..643f46e9097 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html @@ -24,7 +24,7 @@ -
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.html new file mode 100644 index 00000000000..ac9191d8ebe --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.html @@ -0,0 +1,26 @@ + + + + + +
+
+
+
+
+ + \ No newline at end of file diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.java new file mode 100644 index 00000000000..9d4f406e176 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowDetailsTabPanel.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2010-2018 Evolveum + * + * 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 com.evolveum.midpoint.web.page.admin.resources; + +import com.evolveum.midpoint.gui.api.model.LoadableModel; +import com.evolveum.midpoint.gui.api.page.PageBase; +import com.evolveum.midpoint.prism.path.ItemPath; +import com.evolveum.midpoint.web.component.form.Form; +import com.evolveum.midpoint.web.component.objectdetails.AbstractObjectTabPanel; +import com.evolveum.midpoint.web.component.prism.ObjectWrapper; +import com.evolveum.midpoint.web.component.prism.PrismPanel; +import com.evolveum.midpoint.web.model.ContainerWrapperListFromObjectWrapperModel; +import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Created by Viliam Repan (lazyman). + */ +public class ShadowDetailsTabPanel extends AbstractObjectTabPanel { + + private static final long serialVersionUID = 1L; + + private static final String ID_ACCOUNT = "account"; + + public ShadowDetailsTabPanel(String id, Form> mainForm, + LoadableModel> objectWrapperModel, PageBase pageBase) { + super(id, mainForm, objectWrapperModel, pageBase); + } + + @Override + protected void onInitialize() { + super.onInitialize(); + + PrismPanel panel = new PrismPanel<>(ID_ACCOUNT, + new ContainerWrapperListFromObjectWrapperModel(getObjectWrapperModel(), getVisibleContainers()), + null, getMainForm(), null, getPageBase()); + add(panel); + } + + private List getVisibleContainers() { + // todo maybe everything should be visible, but for now this should be fine + return Arrays.asList( + new ItemPath(ShadowType.F_ATTRIBUTES), + new ItemPath(ShadowType.F_CREDENTIALS, CredentialsType.F_PASSWORD), + new ItemPath(ShadowType.F_ACTIVATION) + ); + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.html new file mode 100644 index 00000000000..90f6c975190 --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.html @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.java new file mode 100644 index 00000000000..2454ca1ebce --- /dev/null +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ShadowSummaryPanel.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2010-2018 Evolveum + * + * 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 com.evolveum.midpoint.web.page.admin.resources; + +import com.evolveum.midpoint.gui.api.GuiStyleConstants; +import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; +import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.web.component.ObjectSummaryPanel; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; +import org.apache.wicket.model.IModel; + +/** + * Created by Viliam Repan (lazyman). + */ +public class ShadowSummaryPanel extends ObjectSummaryPanel { + + private static final long serialVersionUID = 1L; + + public ShadowSummaryPanel(String id, IModel> model, ModelServiceLocator locator) { + super(id, ShadowType.class, model, locator); + + initLayoutCommon(locator); + } + + @Override + protected void onBeforeRender() { + super.onBeforeRender(); + + + // todo implement custom layout + } + + @Override + protected String getIconCssClass() { + return GuiStyleConstants.CLASS_OBJECT_RESOURCE_ICON; //todo fix + } + + @Override + protected String getIconBoxAdditionalCssClass() { + return "summary-panel-resource"; //todo fix + } + + @Override + protected String getBoxAdditionalCssClass() { + return "summary-panel-resource"; //todo fix + } +} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/accept.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/accept.png deleted file mode 100644 index 89c8129a490..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/accept.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh.png deleted file mode 100644 index 0de26566d41..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh_gray.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh_gray.png deleted file mode 100644 index 060ba7383b6..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/arrow_refresh_gray.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.html index 64ce94aca68..9bf7efe61d5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.html @@ -18,15 +18,14 @@ -
-
-
+
+
-
-
-
-
-
+
+ + + +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java index 63b533adcfc..8465c85d0ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java @@ -15,6 +15,7 @@ */ package com.evolveum.midpoint.web.page.admin.resources.content; +import com.evolveum.midpoint.gui.api.component.tabs.PanelTab; import com.evolveum.midpoint.gui.api.model.LoadableModel; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; @@ -34,213 +35,247 @@ import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.component.AjaxButton; import com.evolveum.midpoint.web.component.AjaxSubmitButton; +import com.evolveum.midpoint.web.component.AjaxTabbedPanel; import com.evolveum.midpoint.web.component.prism.ContainerStatus; import com.evolveum.midpoint.web.component.prism.ObjectWrapper; -import com.evolveum.midpoint.web.component.prism.PrismPanel; import com.evolveum.midpoint.web.component.util.ObjectWrapperUtil; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; -import com.evolveum.midpoint.web.model.ContainerWrapperListFromObjectWrapperModel; import com.evolveum.midpoint.web.page.admin.resources.PageAdminResources; import com.evolveum.midpoint.web.page.admin.resources.PageResources; -import com.evolveum.midpoint.web.resource.img.ImgResources; +import com.evolveum.midpoint.web.page.admin.resources.ShadowDetailsTabPanel; +import com.evolveum.midpoint.web.page.admin.resources.ShadowSummaryPanel; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType; - import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.extensions.markup.html.tabs.ITab; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.util.string.StringValue; import java.util.ArrayList; import java.util.Collection; +import java.util.List; /** * @author lazyman */ @PageDescriptor(url = "/admin/resources/account", encoder = OnePageParameterEncoder.class, action = { - @AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL, - label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL, - description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION), - @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCES_ACCOUNT_URL, - label = "PageAccount.auth.resourcesAccount.label", - description = "PageAccount.auth.resourcesAccount.description")}) + @AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL, + label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL, + description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION), + @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCES_ACCOUNT_URL, + label = "PageAccount.auth.resourcesAccount.label", + description = "PageAccount.auth.resourcesAccount.description")}) public class PageAccount extends PageAdminResources { - private static final Trace LOGGER = TraceManager.getTrace(PageAccount.class); - private static final String DOT_CLASS = PageAccount.class.getName() + "."; - private static final String OPERATION_LOAD_ACCOUNT = DOT_CLASS + "loadAccount"; - private static final String OPERATION_SAVE_ACCOUNT = DOT_CLASS + "saveAccount"; + private static final Trace LOGGER = TraceManager.getTrace(PageAccount.class); + private static final String DOT_CLASS = PageAccount.class.getName() + "."; + private static final String OPERATION_LOAD_ACCOUNT = DOT_CLASS + "loadAccount"; + private static final String OPERATION_SAVE_ACCOUNT = DOT_CLASS + "saveAccount"; + + private static final String ID_MAIN_FORM = "mainForm"; + private static final String ID_SUMMARY = "summary"; + private static final String ID_TAB_PANEL = "tabPanel"; + private static final String ID_PROTECTED_MESSAGE = "protectedMessage"; + private static final String ID_SAVE = "save"; + private static final String ID_BACK = "back"; - private static final String ID_PROTECTED_MESSAGE = "protectedMessage"; + public static final String PARAMETER_SELECTED_TAB = "tab"; - private IModel> accountModel; + private LoadableModel> accountModel; - public PageAccount(final PageParameters parameters) { - accountModel = new LoadableModel>(false) { + public PageAccount(final PageParameters parameters) { + accountModel = new LoadableModel>(false) { - @Override - protected ObjectWrapper load() { - return loadAccount(parameters); - } - }; - initLayout(); - } + @Override + protected ObjectWrapper load() { + return loadAccount(parameters); + } + }; + initLayout(); + } - private ObjectWrapper loadAccount(PageParameters parameters) { - Task task = createSimpleTask(OPERATION_LOAD_ACCOUNT); - OperationResult result = task.getResult(); + private ObjectWrapper loadAccount(PageParameters parameters) { + Task task = createSimpleTask(OPERATION_LOAD_ACCOUNT); + OperationResult result = task.getResult(); - Collection> options = SelectorOptions.createCollection( - ShadowType.F_RESOURCE, GetOperationOptions.createResolve()); + Collection> options = SelectorOptions.createCollection( + ShadowType.F_RESOURCE, GetOperationOptions.createResolve()); - StringValue oid = parameters != null ? parameters.get(OnePageParameterEncoder.PARAMETER) : null; - PrismObject account = WebModelServiceUtils.loadObject(ShadowType.class, oid.toString(), options, - PageAccount.this, task, result); + StringValue oid = parameters != null ? parameters.get(OnePageParameterEncoder.PARAMETER) : null; + PrismObject account = WebModelServiceUtils.loadObject(ShadowType.class, oid.toString(), options, + PageAccount.this, task, result); - if (account == null) { - getSession().error(getString("pageAccount.message.cantEditAccount")); - showResult(result); - throw new RestartResponseException(PageResources.class); - } + if (account == null) { + getSession().error(getString("pageAccount.message.cantEditAccount")); + showResult(result); + throw new RestartResponseException(PageResources.class); + } - ObjectWrapper wrapper = ObjectWrapperUtil.createObjectWrapper(null, null, account, ContainerStatus.MODIFYING, task, this); - OperationResultType fetchResult = account.getPropertyRealValue(ShadowType.F_FETCH_RESULT, OperationResultType.class); - try { + ObjectWrapper wrapper = ObjectWrapperUtil.createObjectWrapper(null, null, account, ContainerStatus.MODIFYING, task, this); + OperationResultType fetchResult = account.getPropertyRealValue(ShadowType.F_FETCH_RESULT, OperationResultType.class); + try { wrapper.setFetchResult(OperationResult.createOperationResult(fetchResult)); } catch (SchemaException e) { throw new SystemException(e.getMessage(), e); } - wrapper.setShowEmpty(false); - return wrapper; - } - - private void initLayout() { - Form mainForm = new com.evolveum.midpoint.web.component.form.Form("mainForm"); - mainForm.setMultiPart(true); - add(mainForm); - - WebMarkupContainer protectedMessage = new WebMarkupContainer(ID_PROTECTED_MESSAGE); - protectedMessage.add(new VisibleEnableBehaviour() { - - @Override - public boolean isVisible() { - ObjectWrapper wrapper = accountModel.getObject(); - return wrapper.isProtectedAccount(); - } - }); - mainForm.add(protectedMessage); - - PrismPanel userForm = new PrismPanel<>("account", new ContainerWrapperListFromObjectWrapperModel<>(accountModel, WebComponentUtil.getShadowItemsToShow()), new PackageResourceReference( - ImgResources.class, ImgResources.HDD_PRISM), mainForm, - itemWrapper -> WebComponentUtil.checkShadowActivationAndPasswordVisibility(itemWrapper, accountModel), this); - mainForm.add(userForm); - - initButtons(mainForm); - } - - - private void initButtons(Form mainForm) { - AjaxSubmitButton save = new AjaxSubmitButton("save", createStringResource("pageAccount.button.save")) { - - @Override - protected void onSubmit(AjaxRequestTarget target, Form form) { - savePerformed(target); - } - - @Override - protected void onError(AjaxRequestTarget target, Form form) { - target.add(getFeedbackPanel()); - } - }; - save.add(new VisibleEnableBehaviour() { - - @Override - public boolean isVisible() { - ObjectWrapper wrapper = accountModel.getObject(); - return !wrapper.isProtectedAccount(); - } - }); - mainForm.add(save); - - AjaxButton back = new AjaxButton("back", createStringResource("pageAccount.button.back")) { - - @Override - public void onClick(AjaxRequestTarget target) { - cancelPerformed(target); - } - }; - mainForm.add(back); - } - - @Override - protected IModel createPageTitleModel() { - return new LoadableModel(false) { - - @Override - protected String load() { - PrismObject account = accountModel.getObject().getObject(); - String accName = WebComponentUtil.getName(account); - - ResourceType resource = account.asObjectable().getResource(); - String name = WebComponentUtil.getName(resource); - - return createStringResourceStatic(PageAccount.this, "PageAccount.title", accName, name).getString(); - } - }; - } - - private void savePerformed(AjaxRequestTarget target) { - LOGGER.debug("Saving account changes."); - - OperationResult result = new OperationResult(OPERATION_SAVE_ACCOUNT); - try { - WebComponentUtil.revive(accountModel, getPrismContext()); - ObjectWrapper wrapper = accountModel.getObject(); - ObjectDelta delta = wrapper.getObjectDelta(); - if (delta == null) { - return; - } - if (delta.getPrismContext() == null) { - getPrismContext().adopt(delta); - } - if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Account delta computed from form:\n{}", new Object[]{delta.debugDump(3)}); - } - - if (delta.isEmpty()) { - return; - } - WebComponentUtil.encryptCredentials(delta, true, getMidpointApplication()); - - Task task = createSimpleTask(OPERATION_SAVE_ACCOUNT); - Collection> deltas = new ArrayList<>(); - deltas.add(delta); - - getModelService().executeChanges(deltas, null, task, result); - result.recomputeStatus(); - } catch (Exception ex) { - result.recordFatalError("Couldn't save account.", ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save account", ex); - } - - if (!result.isSuccess()) { - showResult(result); - target.add(getFeedbackPanel()); - } else { - showResult(result); - - redirectBack(); - } - } - - private void cancelPerformed(AjaxRequestTarget target) { - redirectBack(); - } + wrapper.setShowEmpty(false); + return wrapper; + } + + private void initLayout() { + add(new ShadowSummaryPanel(ID_SUMMARY, new PropertyModel<>(accountModel, "object"), this)); + + + WebMarkupContainer protectedMessage = new WebMarkupContainer(ID_PROTECTED_MESSAGE); + protectedMessage.add(new VisibleEnableBehaviour() { + + @Override + public boolean isVisible() { + ObjectWrapper wrapper = accountModel.getObject(); + return wrapper.isProtectedAccount(); + } + }); + add(protectedMessage); + + com.evolveum.midpoint.web.component.form.Form mainForm = new com.evolveum.midpoint.web.component.form.Form(ID_MAIN_FORM); + mainForm.setMultiPart(true); + add(mainForm); + + mainForm.add(createTabsPanel(mainForm)); + + initButtons(mainForm); + } + + + private AjaxTabbedPanel createTabsPanel(com.evolveum.midpoint.web.component.form.Form> form) { + List tabs = new ArrayList<>(); + + tabs.add(new PanelTab(createStringResource("PageAccount.tab.details")) { + private static final long serialVersionUID = 1L; + + @Override + public WebMarkupContainer createPanel(String panelId) { + return new ShadowDetailsTabPanel(panelId, form, accountModel, PageAccount.this); + } + }); + + AjaxTabbedPanel tabPanel = new AjaxTabbedPanel(ID_TAB_PANEL, tabs) { + + private static final long serialVersionUID = 1L; + + @Override + protected void onTabChange(int index) { + updateBreadcrumbParameters(PARAMETER_SELECTED_TAB, index); + } + }; + tabPanel.setOutputMarkupId(true); + return tabPanel; + } + + + private void initButtons(Form mainForm) { + AjaxSubmitButton save = new AjaxSubmitButton(ID_SAVE, createStringResource("pageAccount.button.save")) { + + @Override + protected void onSubmit(AjaxRequestTarget target, Form form) { + savePerformed(target); + } + + @Override + protected void onError(AjaxRequestTarget target, Form form) { + target.add(getFeedbackPanel()); + } + }; + save.add(new VisibleEnableBehaviour() { + + @Override + public boolean isVisible() { + ObjectWrapper wrapper = accountModel.getObject(); + return !wrapper.isProtectedAccount(); + } + }); + mainForm.add(save); + + AjaxButton back = new AjaxButton(ID_BACK, createStringResource("pageAccount.button.back")) { + + @Override + public void onClick(AjaxRequestTarget target) { + cancelPerformed(target); + } + }; + mainForm.add(back); + } + + @Override + protected IModel createPageTitleModel() { + return new LoadableModel(false) { + + @Override + protected String load() { + PrismObject account = accountModel.getObject().getObject(); + String accName = WebComponentUtil.getName(account); + + ResourceType resource = account.asObjectable().getResource(); + String name = WebComponentUtil.getName(resource); + + return createStringResourceStatic(PageAccount.this, "PageAccount.title", accName, name).getString(); + } + }; + } + + private void savePerformed(AjaxRequestTarget target) { + LOGGER.debug("Saving account changes."); + + OperationResult result = new OperationResult(OPERATION_SAVE_ACCOUNT); + try { + WebComponentUtil.revive(accountModel, getPrismContext()); + ObjectWrapper wrapper = accountModel.getObject(); + ObjectDelta delta = wrapper.getObjectDelta(); + if (delta == null) { + return; + } + if (delta.getPrismContext() == null) { + getPrismContext().adopt(delta); + } + if (LOGGER.isTraceEnabled()) { + LOGGER.trace("Account delta computed from form:\n{}", new Object[]{delta.debugDump(3)}); + } + + if (delta.isEmpty()) { + return; + } + WebComponentUtil.encryptCredentials(delta, true, getMidpointApplication()); + + Task task = createSimpleTask(OPERATION_SAVE_ACCOUNT); + Collection> deltas = new ArrayList<>(); + deltas.add(delta); + + getModelService().executeChanges(deltas, null, task, result); + result.recomputeStatus(); + } catch (Exception ex) { + result.recordFatalError("Couldn't save account.", ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save account", ex); + } + + if (!result.isSuccess()) { + showResult(result); + target.add(getFeedbackPanel()); + } else { + showResult(result); + + redirectBack(); + } + } + + private void cancelPerformed(AjaxRequestTarget target) { + redirectBack(); + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go.png deleted file mode 100644 index fc53379efcd..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go_gray.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go_gray.png deleted file mode 100644 index 476bc7c2676..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/drive_go_gray.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java deleted file mode 100644 index 286fe90de6d..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.util.List; - -import com.evolveum.midpoint.schema.result.OperationResultStatus; - -import org.apache.commons.lang.Validate; - -import com.evolveum.midpoint.schema.constants.ConnectorTestOperation; -import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AvailabilityStatusType; - -/** - * @author mserbak - */ -public class ResourceController { - - public static void updateResourceState(ResourceState state, OperationResult result) { - Validate.notNull(result, "Operation result must not be null."); - - List subResults = result.getSubresults(); - state.setConConnection(getStatusFromResultType(ConnectorTestOperation.CONNECTOR_CONNECTION, - subResults)); - state.setConfValidation(getStatusFromResultType(ConnectorTestOperation.CONNECTOR_CONFIGURATION, - subResults)); - state.setConInitialization(getStatusFromResultType(ConnectorTestOperation.CONNECTOR_INITIALIZATION, - subResults)); - state.setConSanity(getStatusFromResultType(ConnectorTestOperation.RESOURCE_SANITY, subResults)); - state.setConSchema(getStatusFromResultType(ConnectorTestOperation.RESOURCE_SCHEMA, subResults)); - } - - private static OperationResultStatus getStatusFromResultType(ConnectorTestOperation operation, - List results) { - OperationResultStatus status = OperationResultStatus.UNKNOWN; - - OperationResult resultFound = null; - for (OperationResult result : results) { - try { - if (operation.getOperation().equals(result.getOperation())) { - resultFound = result; - break; - } - } catch (IllegalArgumentException ex) { - //result.recordFatalError("Result operation name " + result.getOperation() + " returned from test connection is not type of " + ConnectorTestOperation.class + ".", ex); - } - } - - if (resultFound == null) { - return status; - } - - switch (resultFound.getStatus()) { - case UNKNOWN: - status = OperationResultStatus.UNKNOWN; - break; - case SUCCESS: - status = OperationResultStatus.SUCCESS; - break; - case WARNING: - status = OperationResultStatus.WARNING; - break; - case FATAL_ERROR: - status = OperationResultStatus.FATAL_ERROR; - break; - case PARTIAL_ERROR: - status = OperationResultStatus.PARTIAL_ERROR; - break; - case HANDLED_ERROR: - status = OperationResultStatus.HANDLED_ERROR; - break; - case IN_PROGRESS: - status = OperationResultStatus.IN_PROGRESS; - break; - default: - status = OperationResultStatus.UNKNOWN; - } - return status; - } - - public static void updateLastAvailabilityState(ResourceState state, AvailabilityStatusType lastAvailabilityStatus) { - OperationResultStatus lastAvailability = OperationResultStatus.UNKNOWN; - - if (lastAvailabilityStatus == null) { - if (state.getOverall().equals(OperationResultStatus.SUCCESS)) { - lastAvailability = OperationResultStatus.SUCCESS; - } else if ((state.getOverall().equals(OperationResultStatus.PARTIAL_ERROR) - || state.getOverall().equals(OperationResultStatus.FATAL_ERROR) - || state.getOverall().equals(OperationResultStatus.HANDLED_ERROR))) { - lastAvailability = OperationResultStatus.PARTIAL_ERROR; - } - state.setLastAvailability(lastAvailability); - return; - } - - if (state.getOverall().equals(OperationResultStatus.SUCCESS) - && !lastAvailabilityStatus.equals(AvailabilityStatusType.UP)) { - lastAvailability = OperationResultStatus.SUCCESS; - } else if ((state.getOverall().equals(OperationResultStatus.PARTIAL_ERROR) - || state.getOverall().equals(OperationResultStatus.FATAL_ERROR) - || state.getOverall().equals(OperationResultStatus.HANDLED_ERROR)) - && !lastAvailabilityStatus.equals(AvailabilityStatusType.DOWN)) { - lastAvailability = OperationResultStatus.PARTIAL_ERROR; - } - - if (!lastAvailability.equals(OperationResultStatus.UNKNOWN)) { - state.setLastAvailability(lastAvailability); - return; - } - - switch (lastAvailabilityStatus) { - case UP: - lastAvailability = OperationResultStatus.SUCCESS; - break; - case DOWN: - lastAvailability = OperationResultStatus.PARTIAL_ERROR; - break; - } - state.setLastAvailability(lastAvailability); - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.java deleted file mode 100644 index 6bea5f3a4a6..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl; -import com.evolveum.midpoint.prism.PrismReference; -import com.evolveum.midpoint.schema.result.OperationResultStatus; -import com.evolveum.midpoint.web.component.data.column.InlineMenuable; -import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; -import org.apache.commons.lang.Validate; - -import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.prism.PrismContext; -import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition; -import com.evolveum.midpoint.schema.processor.ResourceSchema; -import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.web.component.util.Selectable; - -import javax.xml.namespace.QName; - -/** - * @author lazyman - */ -public class ResourceDto extends Selectable implements InlineMenuable { - - private static final String DOT_CLASS = ResourceDto.class.getName() + "."; - private static final String OPERATION_LOAD_RESOURCE_DEFINITION = DOT_CLASS + "ResourceDto - load resource attribute container definition"; - - private String oid; - private String name; - private String bundle; - private String version; - private String progress; - private String type; - private ResourceState state; - private AvailabilityStatusType lastAvailabilityStatus; - private List objectTypes; - private List capabilities; - private ResourceSync sync; - private ResourceImport resImport; - private QName defaultAccountObjectClass; - private List menuItems; - - public ResourceDto() { - } - - public ResourceDto(PrismObject resource) { - oid = resource.getOid(); - name = WebComponentUtil.getName(resource); - - PrismReference ref = resource.findReference(ResourceType.F_CONNECTOR_REF); - ConnectorType connector = null; - if (ref != null && ref.getValue().getObject() != null) { - connector = (ConnectorType) ref.getValue().getObject().asObjectable(); - } - bundle = connector != null ? connector.getConnectorBundle() : null; - version = connector != null ? connector.getConnectorVersion() : null; - type = connector != null ? connector.getConnectorType() : null; - lastAvailabilityStatus = resource.asObjectable().getOperationalState() != null ? resource.asObjectable().getOperationalState().getLastAvailabilityStatus() : null; - - if(resource.asObjectable().getFetchResult() != null && resource.asObjectable().getFetchResult().getStatus() != null){ - if(OperationResultStatusType.PARTIAL_ERROR.equals(resource.asObjectable().getFetchResult().getStatus())){ - lastAvailabilityStatus = null; - } - } - } - - public ResourceDto(PrismObject resource, PrismContext prismContext, ConnectorType connector, List capabilities) { - Validate.notNull(resource); - - OperationResult result = new OperationResult(OPERATION_LOAD_RESOURCE_DEFINITION); - - oid = resource.getOid(); - name = WebComponentUtil.getName(resource); - bundle = connector != null ? connector.getConnectorBundle() : null; - version = connector != null ? connector.getConnectorVersion() : null; - type = connector != null ? connector.getConnectorType() : null; - this.capabilities = capabilities; - - try { - ResourceSchema resourceSchema = RefinedResourceSchemaImpl.getResourceSchema(resource, prismContext); - Collection definitions = resourceSchema.getObjectClassDefinitions(); - for (ObjectClassComplexTypeDefinition definition : definitions) { - if (!(definition instanceof ObjectClassComplexTypeDefinition)) { - continue; - } - if(objectTypes == null){ - objectTypes = new ArrayList<>(); - } - objectTypes.add(new ResourceObjectTypeDto(definition)); - } - - //default account object class qname - ObjectClassComplexTypeDefinition def = resourceSchema.findDefaultObjectClassDefinition(ShadowKindType.ACCOUNT); - defaultAccountObjectClass = def.getTypeName(); - } catch (Exception ex) { - result.recordFatalError("Couldn't load resource attribute container definition.", ex); - } - } - - public QName getDefaultAccountObjectClass() { - return defaultAccountObjectClass; - } - - public String getBundle() { - return bundle; - } - - public String getName() { - return name; - } - - public String getOid() { - return oid; - } - - public String getVersion() { - return version; - } - - public String getProgress() { - return progress; - } - - public String getType() { - return type; - } - - public List getCapabilities() { - return capabilities; - } - - public ResourceState getState() { - if (state == null) { - state = new ResourceState(); - } - return state; - } - - public OperationResultStatus getOverallStatus() { - if (state == null) { - return OperationResultStatus.UNKNOWN; - } - return state.getOverall(); - } - - public AvailabilityStatusType getLastAvailabilityStatus() { - return lastAvailabilityStatus; - } - - public List getObjectTypes() { - if (objectTypes == null) { - objectTypes = new ArrayList<>(); - } - return objectTypes; - } - - public ResourceSyncStatus getSyncStatus() { - if (sync == null || !sync.isEnabled()) { - return ResourceSyncStatus.DISABLE; - } - return ResourceSyncStatus.ENABLE; - } - - public ResourceImportStatus getResImport() { - if (resImport == null || !resImport.isEnabled()) { - return ResourceImportStatus.DISABLE; - } - return ResourceImportStatus.ENABLE; - } - - @Override - public List getMenuItems() { - if (menuItems == null) { - menuItems = new ArrayList<>(); - } - return menuItems; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImport.java deleted file mode 100644 index c4284e9a0a9..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImport.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -public class ResourceImport { - private boolean enabled; - - public boolean isEnabled() { - return enabled; - } - - public void setEnabled(boolean enabled) { - this.enabled = enabled; - } - - public String getImportTitle() { - if (enabled) { - return "Import running"; - } - return "Import not running"; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportDto.java deleted file mode 100644 index e64c516f860..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportDto.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.io.Serializable; -import java.util.Date; -import com.evolveum.midpoint.schema.result.OperationResult; - -/** - * @author Katuska - */ -public class ResourceImportDto implements Serializable { - - private String name; - private Date launchTime; - private Date finishTime; - private String lastStatus; - private long numberOfErrors; - private OperationResult lastError; - private long progress; - private boolean running; - - public ResourceImportDto(){ - //TODO - } - - public String getName() { - return name; - } - - public Date getLaunchTime() { - return launchTime; - } - - public String getLaunchTimeString() { - return launchTime.toString(); - } - - public String getFinishTimeString() { - return finishTime.toString(); - } - - public Date getFinishTime() { - return finishTime; - } - - public String getLastStatus() { - return lastStatus; - } - - public OperationResult getLastError() { - return lastError; - } - - public long getProgress() { - return progress; - } - - public boolean isRunning() { - return running; - } - - public long getNumberOfErrors() { - return numberOfErrors; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceObjectTypeDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceObjectTypeDto.java deleted file mode 100644 index caba741e096..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceObjectTypeDto.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.io.Serializable; - -import org.apache.commons.lang.Validate; - -import com.evolveum.midpoint.schema.processor.ObjectClassComplexTypeDefinition; - -/** - * @author lazyman - */ -public class ResourceObjectTypeDto implements Serializable { - - private static final long serialVersionUID = 4664988785770149299L; - private String displayName; - private String nativeObjectClass; - private String help; - private String type; - - public ResourceObjectTypeDto(ObjectClassComplexTypeDefinition definition) { - Validate.notNull(definition, "Resource object definition can't be null."); - - displayName = definition.getDisplayName(); - if(displayName == null){ - displayName = "-"; - } - - nativeObjectClass = definition.getNativeObjectClass(); - help = definition.getHelp(); - if (definition.getTypeName() != null) { - this.type = definition.getTypeName().getLocalPart(); - } - } - - public String getDisplayName() { - if (displayName == null) { - return ""; - } - return displayName; - } - - public String getNativeObjectClass() { - if (nativeObjectClass == null) { - return ""; - } - return nativeObjectClass; - } - - public String getHelp() { - if (help == null) { - return ""; - } - return help; - } - - public String getType() { - return type; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceState.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceState.java deleted file mode 100644 index 4c25f19b3fe..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceState.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.io.Serializable; - -import com.evolveum.midpoint.schema.result.OperationResultStatus; -import org.apache.commons.lang.StringUtils; - -/** - * @author lazyman - */ -public class ResourceState implements Serializable { - - private OperationResultStatus lastAvailability; - private OperationResultStatus overall; - private OperationResultStatus confValidation; - private OperationResultStatus conInitialization; - private OperationResultStatus conConnection; - private OperationResultStatus conSanity; - private OperationResultStatus conSchema; - private OperationResultStatus extra; - private String extraName; - - public OperationResultStatus getOverall() { - overall = updateOverallStatus(); - if (overall == null) { - return OperationResultStatus.UNKNOWN; - } - return overall; - } - - public OperationResultStatus getConfValidation() { - if (confValidation == null) { - return OperationResultStatus.UNKNOWN; - } - return confValidation; - } - - public void setConfValidation(OperationResultStatus confValidation) { - this.confValidation = confValidation; - } - - public OperationResultStatus getConInitialization() { - if (conInitialization == null) { - return OperationResultStatus.UNKNOWN; - } - return conInitialization; - } - - public void setConInitialization(OperationResultStatus conInitialization) { - this.conInitialization = conInitialization; - } - - public OperationResultStatus getConConnection() { - if (conConnection == null) { - return OperationResultStatus.UNKNOWN; - } - return conConnection; - } - - public void setConConnection(OperationResultStatus conConnection) { - this.conConnection = conConnection; - } - - public OperationResultStatus getConSanity() { - if (conSanity == null) { - return OperationResultStatus.UNKNOWN; - } - return conSanity; - } - - public void setConSanity(OperationResultStatus conSanity) { - this.conSanity = conSanity; - } - - public OperationResultStatus getConSchema() { - if (conSchema == null) { - return OperationResultStatus.UNKNOWN; - } - return conSchema; - } - - public void setConSchema(OperationResultStatus conSchema) { - this.conSchema = conSchema; - } - - public OperationResultStatus getExtra() { - if (extra == null) { - return OperationResultStatus.UNKNOWN; - } - return extra; - } - - public void setExtra(OperationResultStatus extra) { - this.extra = extra; - } - - public String getExtraName() { - if (StringUtils.isEmpty(extraName)) { - return "Unknown"; - } - return extraName; - } - - public void setExtraName(String extraName) { - this.extraName = extraName; - } - - public OperationResultStatus getLastAvailability() { - if (lastAvailability == null) { - return OperationResultStatus.UNKNOWN; - } - return lastAvailability; - } - - public void setLastAvailability(OperationResultStatus lastAvailability) { - this.lastAvailability = lastAvailability; - } - - private OperationResultStatus updateOverallStatus() { - OperationResultStatus overall = OperationResultStatus.UNKNOWN; - overall = getOverallBasedOnPartialStatus(overall, getConConnection()); - overall = getOverallBasedOnPartialStatus(overall, getConfValidation()); - overall = getOverallBasedOnPartialStatus(overall, getConInitialization()); - overall = getOverallBasedOnPartialStatus(overall, getConSanity()); - overall = getOverallBasedOnPartialStatus(overall, getConSchema()); - overall = getOverallBasedOnPartialStatus(overall, getExtra()); - - return overall; - } - - private OperationResultStatus getOverallBasedOnPartialStatus(OperationResultStatus overall, OperationResultStatus partial) { - switch (overall) { - case UNKNOWN: - case SUCCESS: - if (!OperationResultStatus.UNKNOWN.equals(partial)) { - overall = partial; - } - break; - case WARNING: - if (!OperationResultStatus.UNKNOWN.equals(partial) && !OperationResultStatus.SUCCESS.equals(partial)) { - overall = partial; - } - break; - case FATAL_ERROR: - break; - case PARTIAL_ERROR: - break; - case HANDLED_ERROR: - break; - case IN_PROGRESS: - break; - } - - return overall; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSync.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSync.java deleted file mode 100644 index 8302c9fe91e..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSync.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author lazyman - */ -public class ResourceSync implements Serializable { - - private boolean enabled; - private int pollingInterval; - private Date lastRunTime; - private long timeToProcess; - private String message; - - public boolean isEnabled() { - return enabled; - } - - public int getPollingInterval() { - return pollingInterval; - } - - public Date getLastRunTime() { - return lastRunTime; - } - - public long getTimeToProcess() { - return timeToProcess; - } - - public String getMessage() { - return message; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncStatus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncStatus.java deleted file mode 100644 index e71e762fb32..00000000000 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncStatus.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -/** - * @author lazyman - */ -public enum ResourceSyncStatus { - - ENABLE("arrow_refresh.png"), - - DISABLE("arrow_refresh_gray.png"); - - private String icon; - - private ResourceSyncStatus(String icon) { - this.icon = icon; - } - - public String getIcon() { - return icon; - } -} diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/error.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/error.png deleted file mode 100644 index 628cf2dae3d..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/error.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/exclamation.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/exclamation.png deleted file mode 100644 index c37bd062e60..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/exclamation.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/help.png b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/help.png deleted file mode 100644 index 5c870176d4d..00000000000 Binary files a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/help.png and /dev/null differ diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java index 407baaaf016..1e0cdf476a9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java @@ -2,7 +2,15 @@ import java.util.ArrayList; import java.util.List; - +import java.util.stream.Collectors; + +import com.evolveum.midpoint.prism.Objectable; +import com.evolveum.midpoint.prism.PrismContext; +import com.evolveum.midpoint.prism.PrismObject; +import com.evolveum.midpoint.prism.delta.builder.DeltaBuilder; +import com.evolveum.midpoint.util.exception.CommonException; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.Validate; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -25,19 +33,12 @@ import com.evolveum.midpoint.schema.util.ObjectTypeUtil; import com.evolveum.midpoint.security.api.ConnectionEnvironment; import com.evolveum.midpoint.task.api.Task; -import com.evolveum.midpoint.util.Producer; -import com.evolveum.midpoint.util.exception.SchemaException; import com.evolveum.midpoint.util.logging.LoggingUtils; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.application.PageDescriptor; import com.evolveum.midpoint.web.application.Url; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; -import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.NonceType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; //CONFIRMATION_LINK = "http://localhost:8080/midpoint/confirm/registration/"; @PageDescriptor(urls = {@Url(mountUrl = SchemaConstants.REGISTRATION_CONFIRAMTION_PREFIX)}, permitAll = true) @@ -53,8 +54,11 @@ public class PageRegistrationConfirmation extends PageRegistrationBase { private static final String ID_SUCCESS_PANEL = "successPanel"; private static final String ID_ERROR_PANEL = "errorPanel"; - private static final String OPERATION_ASSIGN_DEFAULT_ROLES = DOT_CLASS + ".assignDefaultRoles"; + private static final String OPERATION_ASSIGN_DEFAULT_ROLES = DOT_CLASS + "assignDefaultRoles"; + private static final String OPERATION_ASSIGN_ADDITIONAL_ROLE = DOT_CLASS + "assignAdditionalRole"; private static final String OPERATION_FINISH_REGISTRATION = DOT_CLASS + "finishRegistration"; + private static final String OPERATION_CHECK_CREDENTIALS = DOT_CLASS + "checkCredentials"; + private static final String OPERATION_REMOVE_NONCE_AND_SET_LIFECYCLE_STATE = DOT_CLASS + "removeNonceAndSetLifecycleState"; private static final long serialVersionUID = 1L; @@ -90,156 +94,127 @@ private void init(final PageParameters pageParameters) { StringValue tokenValue = params.get(SchemaConstants.TOKEN); Validate.notEmpty(tokenValue.toString()); - UserType userType = checkUserCredentials(userNameValue.toString(), tokenValue.toString(), result); - if (userType == null) { + try { + UserType user = checkUserCredentials(userNameValue.toString(), tokenValue.toString(), result); + PrismObject administrator = getAdministratorPrivileged(result); + + assignDefaultRoles(user.getOid(), administrator, result); + result.computeStatus(); + if (result.getStatus() == OperationResultStatus.FATAL_ERROR) { + LOGGER.error("Failed to assign default roles, {}", result.getMessage()); + } else { + NonceType nonceClone = user.getCredentials().getNonce().clone(); + removeNonceAndSetLifecycleState(user.getOid(), nonceClone, administrator, result); + assignAdditionalRoleIfPresent(user.getOid(), nonceClone, administrator, result); + result.computeStatus(); + } initLayout(result); - return; - } - - result = assignDefaultRoles(userType.getOid()); - if (result.getStatus() == OperationResultStatus.FATAL_ERROR) { - LOGGER.error("Failed to assign default roles, {}", result.getMessage()); + } catch (CommonException|AuthenticationException e) { + result.computeStatus(); initLayout(result); - return; } - - final NonceType nonceClone = userType.getCredentials().getNonce().clone(); - - result = removeNonce(userType.getOid(), nonceClone); - result = assignAdditionalRoleIfPresent(userType.getOid(), nonceClone, result); - - initLayout(result); } -// private UsernamePasswordAuthenticationToken authenticateUser(String username, String nonce, OperationResult result){ -// ConnectionEnvironment connEnv = new ConnectionEnvironment(); -// connEnv.setChannel(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI); -// try { -// return getAuthenticationEvaluator().authenticate(connEnv, new NonceAuthenticationContext( username, -// nonce, getSelfRegistrationConfiguration().getNoncePolicy())); -// } catch (AuthenticationException ex) { -// getSession() -// .error(getString(ex.getMessage())); -// result.recordFatalError("Failed to validate user"); -// LoggingUtils.logException(LOGGER, ex.getMessage(), ex); -// return null; -// } catch (Exception ex) { -// getSession() -// .error(createStringResource("PageRegistrationConfirmation.authnetication.failed").getString()); -// LoggingUtils.logException(LOGGER, "Failed to confirm registration", ex); -// return null; -// } -// } - - private UserType checkUserCredentials(String username, String nonce, OperationResult result) { - ConnectionEnvironment connEnv = ConnectionEnvironment.create(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI); + private UserType checkUserCredentials(String username, String nonce, OperationResult parentResult) { + OperationResult result = parentResult.createSubresult(OPERATION_CHECK_CREDENTIALS); try { - return getAuthenticationEvaluator().checkCredentials(connEnv, new NonceAuthenticationContext( username, + ConnectionEnvironment connEnv = ConnectionEnvironment.create(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI); + return getAuthenticationEvaluator().checkCredentials(connEnv, new NonceAuthenticationContext(username, nonce, getSelfRegistrationConfiguration().getNoncePolicy())); } catch (AuthenticationException ex) { - getSession() - .error(getString(ex.getMessage())); - result.recordFatalError("Failed to validate user"); + getSession().error(getString(ex.getMessage())); + result.recordFatalError("Failed to validate user", ex); LoggingUtils.logException(LOGGER, ex.getMessage(), ex); - return null; + throw ex; } catch (Exception ex) { - getSession() - .error(createStringResource("PageRegistrationConfirmation.authnetication.failed").getString()); + getSession().error(createStringResource("PageRegistrationConfirmation.authnetication.failed").getString()); + result.recordFatalError("Failed to confirm registration", ex); LoggingUtils.logException(LOGGER, "Failed to confirm registration", ex); - return null; + throw ex; + } finally { + result.computeStatusIfUnknown(); } } - private OperationResult assignDefaultRoles(final String userOid){ - List> assignments = new ArrayList<>(); - for (ObjectReferenceType defaultRole : getSelfRegistrationConfiguration().getDefaultRoles()) { - AssignmentType assignment = new AssignmentType(); - assignment.setTargetRef(defaultRole); - try { - getPrismContext().adopt(assignment); - assignments.add(ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT, UserType.class, getPrismContext(), assignment)); - } catch (SchemaException e) { - //nothing to do - } + private void assignDefaultRoles(String userOid, PrismObject administrator, OperationResult parentResult) throws CommonException { + List rolesToAssign = getSelfRegistrationConfiguration().getDefaultRoles(); + if (CollectionUtils.isEmpty(rolesToAssign)) { + return; } - final ObjectDelta delta = ObjectDelta.createModifyDelta(userOid, assignments, UserType.class, getPrismContext()); - - return runPrivileged(new Producer() { - - @Override - public OperationResult run() { - OperationResult result = new OperationResult(OPERATION_ASSIGN_DEFAULT_ROLES); - Task task = createAnonymousTask(OPERATION_ASSIGN_DEFAULT_ROLES); + OperationResult result = parentResult.createSubresult(OPERATION_ASSIGN_DEFAULT_ROLES); + try { + PrismContext prismContext = getPrismContext(); + List assignmentsToCreate = rolesToAssign.stream() + .map(ref -> ObjectTypeUtil.createAssignmentTo(ref, prismContext)) + .collect(Collectors.toList()); + ObjectDelta delta = DeltaBuilder.deltaFor(UserType.class, prismContext) + .item(UserType.F_ASSIGNMENT).addRealValues(assignmentsToCreate) + .asObjectDelta(userOid); + runAsChecked(() -> { + Task task = createSimpleTask(OPERATION_ASSIGN_DEFAULT_ROLES); WebModelServiceUtils.save(delta, result, task, PageRegistrationConfirmation.this); - result.computeStatusIfUnknown(); - - return result; - } - }); - - + return null; + }, administrator); + } catch (CommonException|RuntimeException e) { + result.recordFatalError("Couldn't assign default roles", e); + throw e; + } finally { + result.computeStatusIfUnknown(); + } } - private OperationResult removeNonce(final String userOid, final NonceType nonce){ - return runPrivileged(() -> { - OperationResult result = new OperationResult("assignDefaultRoles"); - Task task = createAnonymousTask("assignDefaultRoles"); - - ObjectDelta userAssignmentsDelta; - try { - userAssignmentsDelta = ObjectDelta.createModificationDeleteContainer(UserType.class, userOid, new ItemPath(UserType.F_CREDENTIALS, CredentialsType.F_NONCE), getPrismContext(), nonce); - userAssignmentsDelta.addModificationReplaceProperty(UserType.F_LIFECYCLE_STATE, SchemaConstants.LIFECYCLE_ACTIVE); - } catch (SchemaException e) { - result.recordFatalError("Could not create delta"); - LOGGER.error("Could not prepare delta for removing nonce and lyfecycle state {}", e.getMessage()); - return result; - } - WebModelServiceUtils.save(userAssignmentsDelta, result, task, PageRegistrationConfirmation.this); + private void removeNonceAndSetLifecycleState(String userOid, NonceType nonce, PrismObject administrator, + OperationResult parentResult) throws CommonException { + OperationResult result = parentResult.createSubresult(OPERATION_REMOVE_NONCE_AND_SET_LIFECYCLE_STATE); + try { + runAsChecked(() -> { + Task task = createSimpleTask(OPERATION_REMOVE_NONCE_AND_SET_LIFECYCLE_STATE); + ObjectDelta delta = ObjectDelta.createModificationDeleteContainer(UserType.class, userOid, + new ItemPath(UserType.F_CREDENTIALS, CredentialsType.F_NONCE), getPrismContext(), nonce); + delta.addModificationReplaceProperty(UserType.F_LIFECYCLE_STATE, SchemaConstants.LIFECYCLE_ACTIVE); + WebModelServiceUtils.save(delta, result, task, PageRegistrationConfirmation.this); + return null; + }, administrator); + } catch (CommonException|RuntimeException e) { + result.recordFatalError("Couldn't remove nonce and set lifecycle state", e); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't remove nonce and set lifecycle state", e); + throw e; + } finally { result.computeStatusIfUnknown(); - return result; - }); + } } - private OperationResult assignAdditionalRoleIfPresent(String userOid, NonceType nonceType, OperationResult result){ -// SecurityContextHolder.getContext().setAuthentication(token); - return runPrivileged(() -> { - List userDeltas = new ArrayList<>(); - if (nonceType.getName() != null) { - - Task task = createAnonymousTask(OPERATION_FINISH_REGISTRATION); - - ObjectDelta assignRoleDelta = null; - - try { - AssignmentType assignment = new AssignmentType(); - assignment.setTargetRef( - ObjectTypeUtil.createObjectRef(nonceType.getName(), ObjectTypes.ABSTRACT_ROLE)); - getPrismContext().adopt(assignment); - userDeltas.add((ItemDelta) ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT, - UserType.class, getPrismContext(), assignment)); - - assignRoleDelta = ObjectDelta.createModifyDelta(userOid, userDeltas, - UserType.class, getPrismContext()); - assignRoleDelta.setPrismContext(getPrismContext()); - } catch (SchemaException e) { - result.recordFatalError("Could not create delta"); - return result; - - } - + private void assignAdditionalRoleIfPresent(String userOid, NonceType nonceType, + PrismObject administrator, OperationResult parentResult) throws CommonException { + if (nonceType.getName() == null) { + return; + } + OperationResult result = parentResult.createSubresult(OPERATION_ASSIGN_ADDITIONAL_ROLE); + try { + runAsChecked(() -> { + Task task = createAnonymousTask(OPERATION_ASSIGN_ADDITIONAL_ROLE); + ObjectDelta assignRoleDelta; + AssignmentType assignment = new AssignmentType(); + assignment.setTargetRef(ObjectTypeUtil.createObjectRef(nonceType.getName(), ObjectTypes.ABSTRACT_ROLE)); + getPrismContext().adopt(assignment); + List userDeltas = new ArrayList<>(); + userDeltas.add(ContainerDelta.createModificationAdd(UserType.F_ASSIGNMENT, + UserType.class, getPrismContext(), assignment)); + assignRoleDelta = ObjectDelta.createModifyDelta(userOid, userDeltas, UserType.class, getPrismContext()); + assignRoleDelta.setPrismContext(getPrismContext()); WebModelServiceUtils.save(assignRoleDelta, result, task, PageRegistrationConfirmation.this); - result.computeStatusIfUnknown(); - - } - - return result; - - }); - -// SecurityContextHolder.getContext().setAuthentication(null); - + return null; + }, administrator); + } catch (CommonException|RuntimeException e) { + result.recordFatalError("Couldn't assign additional role", e); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't assign additional role", e); + throw e; + } finally { + result.computeStatusIfUnknown(); + } } + private void initLayout(final OperationResult result) { WebMarkupContainer successPanel = new WebMarkupContainer(ID_SUCCESS_PANEL); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java index e30887927a4..2447b62e806 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java @@ -20,7 +20,7 @@ public class SelfRegistrationDto implements Serializable { enum AuthenticationPolicy { - MAIL, SMS, NONE; + MAIL, SMS, NONE } private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java index dfb404f21a5..a4664b55b24 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java @@ -34,13 +34,7 @@ import com.evolveum.midpoint.task.api.TaskManager; import com.evolveum.midpoint.util.DisplayableValue; import com.evolveum.midpoint.util.Producer; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.ObjectNotFoundException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; -import com.evolveum.midpoint.util.exception.SystemException; +import com.evolveum.midpoint.util.exception.*; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.application.DescriptorLoader; @@ -208,7 +202,7 @@ public void decide(Authentication authentication, Object object, Collection T runAs(Producer producer, PrismObject user) throws SchemaException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException { return securityContextManager.runAs(producer, user); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java index 59f751565e8..abc4648af4f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java @@ -68,7 +68,7 @@ public static MidPointPrincipal getPrincipalUser(Authentication authentication) return null; } LOGGER.debug("Principal user in security context holder is {} ({}) but not type of {}", - new Object[]{principal, principal.getClass(), MidPointPrincipal.class.getName()}); + principal, principal.getClass(), MidPointPrincipal.class.getName()); return null; } diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index c80cb083787..575022cdd31 100755 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -1070,6 +1070,7 @@ PageAccounts.total=Total PageAccounts.unlinked=Unlinked PageAccounts.unmatched=Unmatched PageAccount.title=Account '{0}' on '{1}' +PageAccount.tab.details=Details pageAdmin.certification=Certification pageAdmin.certification.description=Certifications, recertifications pageAdmin.configuration=Configuration diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java b/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java new file mode 100644 index 00000000000..1be39b15073 --- /dev/null +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/InternalsConfigController.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2018 Evolveum + * + * 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 com.evolveum.midpoint.common; + +import javax.annotation.PostConstruct; + +import org.apache.commons.configuration.Configuration; + +import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration; +import com.evolveum.midpoint.schema.internals.InternalsConfig; + +/** + * @author semancik + * + */ +public class InternalsConfigController { + + private MidpointConfiguration midpointConfiguration; + + public MidpointConfiguration getMidpointConfiguration() { + return midpointConfiguration; + } + + public void setMidpointConfiguration(MidpointConfiguration midpointConfiguration) { + this.midpointConfiguration = midpointConfiguration; + } + + @PostConstruct + public void init() { + Configuration internalsConfig = midpointConfiguration.getConfiguration(MidpointConfiguration.INTERNALS_CONFIGURATION); + InternalsConfig.set(internalsConfig); + } +} diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java index a814af689d0..bfc7f18e661 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Evolveum + * Copyright (c) 2010-2018 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,6 +49,7 @@ public interface MidpointConfiguration { String DOT_CONFIGURATION = "midpoint.dot"; String WEB_APP_CONFIGURATION = "midpoint.webApplication"; String WORKFLOW_CONFIGURATION = "midpoint.workflow"; + String INTERNALS_CONFIGURATION = "midpoint.internals"; String getMidpointHome(); diff --git a/infra/common/src/main/resources/ctx-common.xml b/infra/common/src/main/resources/ctx-common.xml index 8c12b13a30c..07968a5da3e 100644 --- a/infra/common/src/main/resources/ctx-common.xml +++ b/infra/common/src/main/resources/ctx-common.xml @@ -1,6 +1,6 @@ diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java index a7f851915fa..c1307f94d98 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalsConfig.java @@ -15,6 +15,8 @@ */ package com.evolveum.midpoint.schema.internals; +import org.apache.commons.configuration.Configuration; + /** * @author semancik * @@ -24,12 +26,12 @@ public class InternalsConfig { /** * Checks for consistency of data structures (e.g. prism objects, containers, contexts). */ - public static boolean consistencyChecks = true; + public static boolean consistencyChecks = false; /** * Additional checks that method arguments make sense (e.g. deltas are not duplicated) */ - private static boolean sanityChecks = true; + private static boolean sanityChecks = false; public static boolean encryptionChecks = true; @@ -146,9 +148,32 @@ public static void setAllowClearDataLogging(boolean allowClearDataLogging) { public static void resetTestingPaths() { testingPaths = null; } + + public static void set(Configuration internalsConfig) { + if (internalsConfig.containsKey("developmentMode")) { + boolean developmentMode = internalsConfig.getBoolean("developmentMode"); + if (developmentMode) { + setDevelopmentMode(); + } else { + reset(); + } + } + + consistencyChecks = internalsConfig.getBoolean("consistencyChecks", consistencyChecks); + sanityChecks = internalsConfig.getBoolean("sanityChecks", sanityChecks); + encryptionChecks = internalsConfig.getBoolean("encryptionChecks", encryptionChecks); + readEncryptionChecks = internalsConfig.getBoolean("readEncryptionChecks", readEncryptionChecks); + avoidLoggingChange = internalsConfig.getBoolean("avoidLoggingChange", avoidLoggingChange); + allowClearDataLogging = internalsConfig.getBoolean("allowClearDataLogging", allowClearDataLogging); + prismMonitoring = internalsConfig.getBoolean("prismMonitoring", prismMonitoring); + modelProfiling = internalsConfig.getBoolean("modelProfiling", modelProfiling); + // TODO: testingPaths + detailedAuhotizationLog = internalsConfig.getBoolean("detailedAuhotizationLog", detailedAuhotizationLog); + + } public static void reset() { - consistencyChecks = true; + consistencyChecks = false; sanityChecks = false; encryptionChecks = true; readEncryptionChecks = false; diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties index 5b9406ae1f9..e88b68399ed 100755 --- a/infra/schema/src/main/resources/localization/schema.properties +++ b/infra/schema/src/main/resources/localization/schema.properties @@ -623,6 +623,32 @@ ShadowType.exists=Exists ShadowType.intent=Intent ShadowType.objectClass=Object Class ShadowType.synchronizationSituation=Situation +ShadowType.synchronizationTimestamp=Synchronization timestamp +ShadowType.fullSynchronizationTimestamp=Full synchronization timestamp +ShadowType.synchronizationSituationDescription=Situation description +ShadowType.resourceRef=Resource +ShadowType.pendingOperation=Pending operation +ShadowType.iteration=Iteration +ShadowType.iterationToken=Iteration token +PendingOperationType.details=Details +PendingOperationType.delta= +PendingOperationType.requestTimestamp=Requested +PendingOperationType.operationStartTimestamp=Operation started +PendingOperationType.lastAttemptTimestamp=Last attempt +PendingOperationType.completionTimestamp=Completed +PendingOperationType.executionStatus=Execution +PendingOperationType.resultStatus=Result +PendingOperationType.asynchronousOperationReference=Asynchronous operation reference +PendingOperationType.attemptNumber=Attempt +PendingOperationType.id=Id +PendingOperationType.type=Type +CredentialsType.nonce=Nonce +NonceType.value=Value +SecurityQuestionsCredentialsType.questionAnswer=Question/Answer +SecurityQuestionAnswerType.questionIdentifier=Identifier +SecurityQuestionAnswerType.answer=Answer +SecurityQuestionAnswerType.enabled=Enabled +SecurityQuestionAnswerType.id=Id ShadowKindType.ACCOUNT=Account ShadowKindType.ENTITLEMENT=Entitlement ShadowKindType.GENERIC=Generic diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd index 4ecefe2eaed..84c0819137e 100755 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd @@ -15114,6 +15114,19 @@ + + + +

+ Default display formats for various UI elements. +

+ + + 4.0 + AdminGuiConfigurationType.displayFormats + + + @@ -15145,7 +15158,60 @@ - + + + + + Default display formats for various UI elements. + + + + 4.0 + + + + + + +

+ Pattern used to display date-time values in short notation, used in places where the + space is limited (e.g. in dense table columns). + The pattern is a two character code. The first character is the date style, and the second + character is the time style. Specify a character of 'S' for short style, 'M' for medium, + 'L' for long, and 'F' for full. A date or time may be ommitted by specifying a style character '-'. + The actual presentation of days, months, hours and so on are specified by localization settings. +

+ + + + AdminGuiConfigurationRoleManagementType.assignmentApprovalRequestLimit + + + + + + +

+ Pattern used to display date-time values in long notation, used in places where space is no + concern (e.g. full-screen forms). + The pattern is a two character code. The first character is the date style, and the second + character is the time style. Specify a character of 'S' for short style, 'M' for medium, + 'L' for long, and 'F' for full. A date or time may be ommitted by specifying a style character '-'. + The actual presentation of days, months, hours and so on are specified by localization settings. +

+ + + + AdminGuiConfigurationRoleManagementType.assignmentApprovalRequestLimit + + + + + + + diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportStatus.java b/infra/util/src/main/java/com/evolveum/midpoint/util/CheckedFunction.java similarity index 59% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportStatus.java rename to infra/util/src/main/java/com/evolveum/midpoint/util/CheckedFunction.java index 96b0e6c6da1..ee86f85fac0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceImportStatus.java +++ b/infra/util/src/main/java/com/evolveum/midpoint/util/CheckedFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2013 Evolveum + * Copyright (c) 2010-2018 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,24 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.evolveum.midpoint.web.page.admin.resources.dto; -/** - * @author lazyman - */ -public enum ResourceImportStatus { - - ENABLE("drive_go.png"), +package com.evolveum.midpoint.util; - DISABLE("drive_go_gray.png"); +import com.evolveum.midpoint.util.exception.CommonException; - private String icon; +import java.io.Serializable; - private ResourceImportStatus(String icon) { - this.icon = icon; - } - - public String getIcon() { - return icon; - } +/** + * Almost the same as Function but this one is Serializable and can throw CommonException. + * EXPERIMENTAL + */ +@FunctionalInterface +public interface CheckedFunction extends Serializable { + R apply(T argument) throws CommonException; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncController.java b/infra/util/src/main/java/com/evolveum/midpoint/util/CheckedProducer.java similarity index 60% rename from gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncController.java rename to infra/util/src/main/java/com/evolveum/midpoint/util/CheckedProducer.java index b2a4e44ab0f..784c455f252 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSyncController.java +++ b/infra/util/src/main/java/com/evolveum/midpoint/util/CheckedProducer.java @@ -1,21 +1,29 @@ -/* - * Copyright (c) 2010-2013 Evolveum - * - * 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 com.evolveum.midpoint.web.page.admin.resources.dto; - -public class ResourceSyncController { - -} +/* + * Copyright (c) 2010-2018 Evolveum + * + * 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 com.evolveum.midpoint.util; + +import com.evolveum.midpoint.util.exception.CommonException; + +import java.io.Serializable; + +/** + * Almost the same as Producer but this one can throw CommonException. + * EXPERIMENTAL + */ +@FunctionalInterface +public interface CheckedProducer extends Serializable { + T get() throws CommonException; +} \ No newline at end of file diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java index 1fa263f734f..ec2e7903c57 100644 --- a/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java +++ b/infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java @@ -15,7 +15,9 @@ */ package com.evolveum.midpoint.util; +import com.evolveum.midpoint.util.exception.CommonException; import com.evolveum.midpoint.util.exception.SystemException; +import com.evolveum.midpoint.util.exception.TunnelException; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; @@ -35,7 +37,6 @@ import java.util.Map.Entry; import java.util.function.Function; import java.util.function.Predicate; -import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -671,21 +672,30 @@ public static void throwExceptionAsUnchecked(Throwable t) { MiscUtil.throwException(t); } - @FunctionalInterface - public interface CheckedSupplier { - T get() throws Exception; + public static T runChecked(CheckedFunction, T> function, CheckedProducer checkedProducer) throws CommonException { + try { + return function.apply(() -> { + try { + return checkedProducer.get(); + } catch (CommonException e) { + throw new TunnelException(e); + } + }); + } catch (TunnelException te) { + return unwrapTunnelledException(te); // return is just for formal reasons -- this throws exceptions only + } } - public static Supplier exceptionsToRuntime(CheckedSupplier checkedSupplier) { - return () -> { - try { - return checkedSupplier.get(); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new SystemException(e); - } - }; + @SuppressWarnings("WeakerAccess") + public static T unwrapTunnelledException(TunnelException te) throws CommonException { + Throwable cause = te.getCause(); + if (cause instanceof CommonException) { + throw (CommonException) cause; + } else if (cause instanceof RuntimeException) { + throw (RuntimeException) cause; + } else { + throw te; + } } public static Collection filter(Collection input, Predicate predicate) { diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java b/infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java index 84a8a23c10e..6d142d592f8 100644 --- a/infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java +++ b/infra/util/src/main/java/com/evolveum/midpoint/util/Producer.java @@ -26,6 +26,6 @@ @FunctionalInterface public interface Producer extends Serializable { - T run(); + T run(); // todo shouldn't be 'get'? } diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java index 38b9cd390c9..9233b89e513 100644 --- a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java +++ b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/AuthenticationEvaluator.java @@ -15,6 +15,7 @@ */ package com.evolveum.midpoint.model.api; +import org.jetbrains.annotations.NotNull; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException; import org.springframework.security.authentication.AuthenticationServiceException; @@ -40,6 +41,7 @@ UsernamePasswordAuthenticationToken authenticate(ConnectionEnvironment connEnv, throws BadCredentialsException, AuthenticationCredentialsNotFoundException, DisabledException, LockedException, CredentialsExpiredException, AuthenticationServiceException, AccessDeniedException, UsernameNotFoundException; + @NotNull UserType checkCredentials(ConnectionEnvironment connEnv, T authnCtx) throws BadCredentialsException, AuthenticationCredentialsNotFoundException, DisabledException, LockedException, CredentialsExpiredException, AuthenticationServiceException, AccessDeniedException, UsernameNotFoundException; diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java index 1f8bf074e53..bf6aa3ce57b 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java @@ -116,6 +116,7 @@ public UsernamePasswordAuthenticationToken authenticate(ConnectionEnvironment co } @Override + @NotNull public UserType checkCredentials(ConnectionEnvironment connEnv, T authnCtx) throws BadCredentialsException, AuthenticationCredentialsNotFoundException, DisabledException, LockedException, CredentialsExpiredException, AuthenticationServiceException, AccessDeniedException, UsernameNotFoundException { diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java index ee43f1fb66d..eea7b36226d 100644 --- a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java +++ b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java @@ -4177,7 +4177,7 @@ protected void loginSuperUser(MidPointPrincipal principal) throws SchemaExceptio protected void loginAnonymous() { Authentication authentication = new AnonymousAuthenticationToken("foo", - "anonymousUser", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")); + AuthorizationConstants.ANONYMOUS_USER_PRINCIPAL, AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")); SecurityContextHolder.getContext().setAuthentication(authentication); } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java index a21c06c032a..3907291c21e 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java @@ -651,6 +651,8 @@ private void createTemporaryTable(Session session, final Dialect dialect, final private String createDeleteQuery(String objectTable, String tempTable, String idColumnName) { if (getConfiguration().isUsingMySqlCompatible()) { return createDeleteQueryAsJoin(objectTable, tempTable, idColumnName); + } else if (getConfiguration().isUsingPostgreSQL()) { + return createDeleteQueryAsJoinPostgreSQL(objectTable, tempTable, idColumnName); } else { // todo consider using join for other databases as well return createDeleteQueryAsSubquery(objectTable, tempTable, idColumnName); @@ -662,6 +664,10 @@ private String createDeleteQueryAsJoin(String objectTable, String tempTable, Str + "WHERE main." + idColumnName + " = temp.id"; } + private String createDeleteQueryAsJoinPostgreSQL(String objectTable, String tempTable, String idColumnName) { + return "delete from " + objectTable + " main using " + tempTable + " temp where main." + idColumnName + " = temp.id"; + } + private String createDeleteQueryAsSubquery(String objectTable, String tempTable, String idColumnName) { StringBuilder sb = new StringBuilder(); sb.append("delete from ").append(objectTable); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java index d50cd0b5baa..0f60083f0ec 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java @@ -91,18 +91,21 @@ private void fetchItemsAttempt() { } } + // TODO add "synchronized" before 4.0 release @NotNull - public synchronized RExtItem createOrFindItemDefinition(@NotNull ItemDefinition definition, boolean throwExceptionAfterCreate) { + public RExtItem createOrFindItemDefinition(@NotNull ItemDefinition definition, boolean throwExceptionAfterCreate) { return createOrFindItemByDefinitionInternal(definition, true, throwExceptionAfterCreate); } + // TODO add "synchronized" before 4.0 release @NotNull - public synchronized RExtItem createOrFindItemDefinition(@NotNull ItemDefinition definition) { + public RExtItem createOrFindItemDefinition(@NotNull ItemDefinition definition) { return createOrFindItemByDefinitionInternal(definition, true, true); } + // TODO add "synchronized" before 4.0 release @Nullable - public synchronized RExtItem findItemByDefinition(@NotNull ItemDefinition definition) { + public RExtItem findItemByDefinition(@NotNull ItemDefinition definition) { return createOrFindItemByDefinitionInternal(definition, false, true); } @@ -173,7 +176,8 @@ private void executeAttempts(String operationName, String operationVerb, Runnabl } } - public synchronized RExtItem getItemById(Integer extItemId) { + // TODO add "synchronized" before 4.0 release + public RExtItem getItemById(Integer extItemId) { boolean fresh = fetchItemsIfNeeded(); RExtItem extItem = itemsById.get(extItemId); if (extItem != null || fresh) { diff --git a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java index be7d40d8adb..e02dc3bc102 100644 --- a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java +++ b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityContextManager.java @@ -15,16 +15,14 @@ */ package com.evolveum.midpoint.security.api; +import com.evolveum.midpoint.util.CheckedProducer; +import com.evolveum.midpoint.util.MiscUtil; +import com.evolveum.midpoint.util.exception.*; import org.jetbrains.annotations.Nullable; import org.springframework.security.core.Authentication; import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.util.Producer; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; /** @@ -52,9 +50,23 @@ public interface SecurityContextManager { void setupPreAuthenticatedSecurityContext(PrismObject user) throws SchemaException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException; T runAs(Producer producer, PrismObject user) throws SchemaException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException; - + + /** + * Convenience method to deal with producers that can throw CommonException. + */ + default T runAsChecked(CheckedProducer producer, PrismObject user) throws CommonException { + return MiscUtil.runChecked((p) -> runAs(p, user), producer); + } + T runPrivileged(Producer producer); - + + /** + * Convenience method to deal with producers that can throw CommonException. + */ + default T runPrivilegedChecked(CheckedProducer producer) throws CommonException { + return MiscUtil.runChecked(this::runPrivileged, producer); + } + // runPrivileged method is in SecurityEnforcer. It needs to be there because it works with authorizations. UserProfileService getUserProfileService(); diff --git a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java index 7b1e940d0ac..542ef3e833a 100644 --- a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java +++ b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java @@ -341,7 +341,7 @@ public static MidPointPrincipal getPrincipal() throws SecurityViolationException } Object principalObject = authentication.getPrincipal(); if (!(principalObject instanceof MidPointPrincipal)) { - if (authentication.getPrincipal() instanceof String && "anonymousUser".equals(principalObject)) { + if (authentication.getPrincipal() instanceof String && AuthorizationConstants.ANONYMOUS_USER_PRINCIPAL.equals(principalObject)) { return null; } else { throw new IllegalArgumentException("Expected that spring security principal will be of type "+ diff --git a/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java b/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java index 15b7173d7ca..69c475af9d4 100644 --- a/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java +++ b/repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java @@ -1018,7 +1018,7 @@ private MidPointPrincipal getMidPointPrincipal() { return null; } if (!(principal instanceof MidPointPrincipal)) { - if (authentication.getPrincipal() instanceof String && "anonymousUser".equals(principal)){ + if (authentication.getPrincipal() instanceof String && AuthorizationConstants.ANONYMOUS_USER_PRINCIPAL.equals(principal)) { return null; } LOGGER.warn("Unknown principal type {}", principal.getClass()); diff --git a/repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java b/repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java index 89b2290cc39..b25bcac7a26 100644 --- a/repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java +++ b/repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityContextManagerImpl.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Collection; +import com.evolveum.midpoint.util.exception.*; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; @@ -35,11 +36,6 @@ import com.evolveum.midpoint.security.api.SecurityUtil; import com.evolveum.midpoint.security.api.UserProfileService; import com.evolveum.midpoint.util.Producer; -import com.evolveum.midpoint.util.exception.CommunicationException; -import com.evolveum.midpoint.util.exception.ConfigurationException; -import com.evolveum.midpoint.util.exception.ExpressionEvaluationException; -import com.evolveum.midpoint.util.exception.SchemaException; -import com.evolveum.midpoint.util.exception.SecurityViolationException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.xml.ns._public.common.common_3.AuthorizationType; @@ -105,10 +101,9 @@ public void setupPreAuthenticatedSecurityContext(PrismObject user) thr } setupPreAuthenticatedSecurityContext(principal); } - + @Override public T runAs(Producer producer, PrismObject user) throws SchemaException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException { - LOGGER.debug("Running {} as {}", producer, user); Authentication origAuthentication = SecurityContextHolder.getContext().getAuthentication(); setupPreAuthenticatedSecurityContext(user); @@ -119,8 +114,7 @@ public T runAs(Producer producer, PrismObject user) throws Sche LOGGER.debug("Finished running {} as {}", producer, user); } } - - + @Override public T runPrivileged(Producer producer) { LOGGER.debug("Running {} as privileged", producer); diff --git a/weblogic-build/pom.xml b/weblogic-build/pom.xml index eb2370df2d4..b38f24da683 100644 --- a/weblogic-build/pom.xml +++ b/weblogic-build/pom.xml @@ -40,8 +40,9 @@ com.evolveum.midpoint.gui admin-gui - 3.9 + 4.0-SNAPSHOT war + executable org.apache.abdera