[SYNCOPE-1896] Fixing ConnectorObject serialization for Audit

Author: ilgrosso

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAuditManager.java

@@ -149,16 +149,20 @@ public void audit(
             auditEntry.setWho(who);
             auditEntry.setLogger(auditLoggerName);
             auditEntry.setDate(OffsetDateTime.now());
-            auditEntry.setBefore(POJOHelper.serialize((maskSensitive(before))));
+            auditEntry.setBefore(before instanceof String
+                    ? (String) before
+                    : POJOHelper.serialize((maskSensitive(before))));
             if (throwable == null) {
-                auditEntry.setOutput(POJOHelper.serialize((maskSensitive(output))));
+                auditEntry.setOutput(output instanceof String
+                        ? (String) output
+                        : POJOHelper.serialize((maskSensitive(output))));
             } else {
                 auditEntry.setOutput(throwable.getMessage());
                 auditEntry.setThrowable(ExceptionUtils2.getFullStackTrace(throwable));
             }
             if (input != null) {
                 auditEntry.getInputs().addAll(Arrays.stream(input).
-                        map(DefaultAuditManager::maskSensitive).map(POJOHelper::serialize).
+                        map(item -> item instanceof String ? (String) item : POJOHelper.serialize(maskSensitive(item))).
                         collect(Collectors.toList()));
             }
 

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java

@@ -42,6 +42,8 @@
 import org.apache.syncope.common.lib.types.UnmatchingRule;
 import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.ExternalResource;
+import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
+import org.apache.syncope.core.persistence.api.entity.group.Group;
 import org.apache.syncope.core.persistence.api.entity.task.PushTask;
 import org.apache.syncope.core.persistence.api.entity.user.User;
 import org.apache.syncope.core.provisioning.api.AuditManager;
@@ -54,6 +56,7 @@
 import org.apache.syncope.core.provisioning.api.pushpull.IgnoreProvisionException;
 import org.apache.syncope.core.provisioning.api.pushpull.PushActions;
 import org.apache.syncope.core.provisioning.api.pushpull.SyncopePushResultHandler;
+import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
 import org.apache.syncope.core.provisioning.java.job.AfterHandlingJob;
 import org.apache.syncope.core.provisioning.java.propagation.DefaultPropagationReporter;
 import org.apache.syncope.core.spring.security.AuthContextUtils;
@@ -95,7 +98,7 @@ protected void update(
             final Boolean enable,
             final ConnectorObject beforeObj,
             final ProvisioningReport result) {
-        
+
         List<String> ownedResources = getAnyUtils().getAllResources(any).stream().
                 map(ExternalResource::getKey).collect(Collectors.toList());
 
@@ -493,9 +496,13 @@ protected void doHandle(final Any<?> any, final Provision provision) throws JobE
                             profile.getTask().getResource().getKey(),
                             operation,
                             resultStatus,
-                            beforeObj,
-                            output,
-                            any));
+                            beforeObj == null ? null : POJOHelper.serialize(beforeObj),
+                            output == null ? null : output instanceof Exception ? output : POJOHelper.serialize(output),
+                            any instanceof User
+                                    ? userDataBinder.getUserTO((User) any, true)
+                                    : any instanceof Group
+                                            ? groupDataBinder.getGroupTO((Group) any, true)
+                                            : anyObjectDataBinder.getAnyObjectTO((AnyObject) any, true)));
                     AfterHandlingJob.schedule(scheduler, jobMap);
                 }
             }

core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPushResultHandler.java

@@ -49,6 +49,7 @@
 import org.apache.syncope.core.provisioning.api.pushpull.IgnoreProvisionException;
 import org.apache.syncope.core.provisioning.api.pushpull.PushActions;
 import org.apache.syncope.core.provisioning.api.pushpull.RealmPushResultHandler;
+import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
 import org.apache.syncope.core.provisioning.java.job.AfterHandlingJob;
 import org.apache.syncope.core.provisioning.java.propagation.DefaultPropagationReporter;
 import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
@@ -441,9 +442,9 @@ private void doHandle(final Realm realm) throws JobExecutionException {
                             profile.getTask().getResource().getKey(),
                             operation,
                             resultStatus,
-                            beforeObj,
-                            output,
-                            realm));
+                            beforeObj == null ? null : POJOHelper.serialize(beforeObj),
+                            output == null ? null : output instanceof Exception ? output : POJOHelper.serialize(output),
+                            binder.getRealmTO(realm, true)));
                     AfterHandlingJob.schedule(scheduler, jobMap);
                 }
             }