fix redirect to error 404 page for hidden details panel

Evolveum · Feb 23, 2024 · 1014a79 · 1014a79
1 parent a443b65
commit 1014a79
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -15,8 +15,11 @@
 import com.evolveum.midpoint.gui.api.util.WebPrismUtil;
 import com.evolveum.midpoint.gui.impl.component.menu.LeftMenuAuthzUtil;
 
+import com.evolveum.midpoint.web.page.error.PageError404;
+
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -496,13 +499,22 @@ public void refresh(AjaxRequestTarget target, boolean soft) {
     }
 
     private ContainerPanelConfigurationType findDefaultConfiguration() {
+        String panelId = WebComponentUtil.getPanelIdentifierFromParams(getPageParameters());
 
-        ContainerPanelConfigurationType defaultConfiguration = findDefaultConfiguration(getPanelConfigurations().getObject(),
-                WebComponentUtil.getPanelIdentifierFromParams(getPageParameters()));
+        ContainerPanelConfigurationType defaultConfiguration = findDefaultConfiguration(getPanelConfigurations().getObject(), panelId);
 
-        if (defaultConfiguration != null) {
+        if (defaultConfiguration != null && WebComponentUtil.getElementVisibility(defaultConfiguration.getVisibility())) {
             return defaultConfiguration;
         }
+
+        if (panelId != null) {
+            //wrong panel id or hidden panel
+            getSession().error(
+                    createStringResource(
+                            "AbstractPageObjectDetails.panelNotFound", panelId, getPageTitleModel().getObject()).getString());
+            throw new RestartResponseException(PageError404.class);
+        }
+
         return getPanelConfigurations().getObject()
                 .stream()
                 .filter(config -> isApplicableForOperation(config) && WebComponentUtil.getElementVisibility(config.getVisibility()))