fix NP when unautorized user load prism object on details page

Evolveum · Feb 23, 2024 · d84d92d · d84d92d
1 parent 781774d
commit d84d92d
Showing 1 changed file with 8 additions and 1 deletion.
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
@@ -599,7 +599,7 @@ private void overwritePageParameters(ContainerPanelConfigurationType config) {
     private PrismObject<O> loadPrismObject() {
         Task task = createSimpleTask(OPERATION_LOAD_OBJECT);
         OperationResult result = task.getResult();
-        PrismObject<O> prismObject;
+        PrismObject<O> prismObject = null;
         try {
             if (!isEditObject()) {
                 prismObject = getPrismContext().createObject(getType());
@@ -608,12 +608,19 @@ private PrismObject<O> loadPrismObject() {
                 prismObject = WebModelServiceUtils.loadObject(getType(), focusOid, getOperationOptions(), false, this, task, result);
                 LOGGER.trace("Loading object: Existing object (loadled): {} -> {}", focusOid, prismObject);
             }
+        } catch (RestartResponseException e) {
+            //ignore restart exception
         } catch (Exception ex) {
             result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex);
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex);
             throw redirectBackViaRestartResponseException();
         }
         result.computeStatusIfUnknown();
+        if (prismObject == null && result.isFatalError()) {
+            getSession().getFeedbackMessages().clear();
+            getSession().error(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"));
+            throw new RestartResponseException(PageError404.class);
+        }
         showResult(result, false);
         return prismObject;
     }