[SYNCOPE-1025] Log level for the domain logger was not set to DEBUG, as instead expected
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/898ce487 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/898ce487 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/898ce487 Branch: refs/heads/2_0_X Commit: 898ce487934a67ff8bfc7c542f9148d2c7ae220c Parents: 691a30b Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Thu Feb 23 17:06:04 2017 +0100 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Thu Feb 23 17:06:04 2017 +0100 ---------------------------------------------------------------------- .../syncope/core/logic/init/LoggerLoader.java | 9 +++--- .../core/provisioning/java/AuditEntry.java | 30 +++++++++++++++++--- 2 files changed, 31 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/898ce487/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java index 9ab3b7b..60d02eb 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/init/LoggerLoader.java @@ -71,13 +71,13 @@ public class LoggerLoader implements SyncopeLoader { ColumnConfig[] columnConfigs = { ColumnConfig.newBuilder(). setConfiguration(ctx.getConfiguration()).setName("EVENT_DATE").setEventTimestamp(true).build(), - ColumnConfig.newBuilder(). + ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER_LEVEL").setPattern("%level").build(), - ColumnConfig.newBuilder(). + ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("LOGGER").setPattern("%logger").build(), - ColumnConfig.newBuilder(). + ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("MESSAGE").setPattern("%message").build(), - ColumnConfig.newBuilder(). + ColumnConfig.newBuilder().setUnicode(false). setConfiguration(ctx.getConfiguration()).setName("THROWABLE").setPattern("%ex{full}").build() }; ColumnMapping[] columnMappings = new ColumnMapping[0]; @@ -100,6 +100,7 @@ public class LoggerLoader implements SyncopeLoader { LoggerConfig logConf = new LoggerConfig( AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), null, false); logConf.addAppender(appender, Level.DEBUG, null); + logConf.setLevel(Level.DEBUG); ctx.getConfiguration().addLogger(AuditManagerImpl.getDomainAuditLoggerName(entry.getKey()), logConf); AuthContextUtils.execWithAuthContext(entry.getKey(), new AuthContextUtils.Executable<Void>() { http://git-wip-us.apache.org/repos/asf/syncope/blob/898ce487/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java index 4b8279f..8d56f53 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditEntry.java @@ -20,7 +20,10 @@ package org.apache.syncope.core.provisioning.java; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.syncope.common.lib.AbstractBaseBean; +import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AuditLoggerName; public class AuditEntry extends AbstractBaseBean { @@ -46,12 +49,31 @@ public class AuditEntry extends AbstractBaseBean { @JsonProperty("input") final Object[] input) { super(); - + this.who = who; this.logger = logger; - this.before = before; - this.output = output; - this.input = input; + this.before = filterUserPassword(before); + this.output = filterUserPassword(output); + this.input = ArrayUtils.clone(input); + if (this.input != null) { + for (int i = 0; i < this.input.length; i++) { + this.input[i] = filterUserPassword(this.input[i]); + } + } + } + + private Object filterUserPassword(final Object object) { + Object filtered; + + if (object instanceof UserTO) { + UserTO user = SerializationUtils.clone((UserTO) object); + user.setPassword(null); + filtered = user; + } else { + filtered = object; + } + + return filtered; } public String getWho() {