Ensure Object Operation policy is always computed

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · Feb 15, 2023 · 7f27e29 · 7f27e29
1 parent fd1ca5f
commit 7f27e29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
@@ -1904,7 +1904,7 @@ public boolean isAdministrativeStatusSupported() throws SchemaException, Configu
     }
 
     public boolean isMarkedReadOnly() {
-        var policy = ShadowMarkManager.get().computeEffectivePolicy(getObjectCurrentOrOld().asObjectable(), new OperationResult("markReadOnly"));
+        var policy = ShadowMarkManager.get().computeEffectivePolicy(getObjectNewOrCurrentOrOld().asObjectable(), new OperationResult("markReadOnly"));
         return !policy.getAdd().isEnabled() && !policy.getModify().isEnabled() && !policy.getDelete().isEnabled();
     }
 }
diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContext.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContext.java
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.provisioning.api.ResourceObjectShadowChangeDescription;
+import com.evolveum.midpoint.repo.common.ShadowMarkManager;
 import com.evolveum.midpoint.schema.constants.ExpressionConstants;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.expression.ExpressionProfile;
@@ -194,7 +195,13 @@ boolean isSynchronizationEnabled() {
     }
 
     public boolean isMarkedSkipSynchronization() {
-        return !shadowedResourceObject.getEffectiveOperationPolicy().getSynchronize().getInbound().isEnabled();
+        var policy = shadowedResourceObject.getEffectiveOperationPolicy();
+        // Policy should not be null if was provided by provisioning-impl, but sometimes in tests
+        // provisioning is skipped, so we need to ensure policy is computed.
+        if (policy == null) {
+            policy = ShadowMarkManager.get().computeEffectivePolicy(shadowedResourceObject, new OperationResult("markedSkipSynchronization"));
+        }
+        return !policy.getSynchronize().getInbound().isEnabled();
     }
 
     public boolean isProtected() {