This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit d45f83e002736376115b776af0cb69e28989079d Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Jan 22 15:02:28 2016 +0100 Hide JDBC connection password from toString --- .../nuiton/topia/persistence/BeanTopiaConfiguration.java | 11 ++++++++++- .../topia/persistence/jdbc/BeanJdbcConfiguration.java | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/BeanTopiaConfiguration.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/BeanTopiaConfiguration.java index 9ee2908..2067dbb 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/BeanTopiaConfiguration.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/BeanTopiaConfiguration.java @@ -22,6 +22,7 @@ package org.nuiton.topia.persistence; * #L% */ +import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.internal.FullyQualifiedNamePlusUuidTopiaIdFactory; import org.nuiton.topia.persistence.jdbc.BeanJdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; @@ -168,8 +169,16 @@ public class BeanTopiaConfiguration extends BeanJdbcConfiguration implements Top addDeclaredService(serviceName, serviceClassName, Collections.<String, String>emptyMap()); } + public String dangerousToString() { + return new TopiaConfigurationBuilder().toMap(this).toString(); + } + @Override public String toString() { - return new TopiaConfigurationBuilder().toMap(this).toString(); + String safeToString = StringUtils.replace( + dangerousToString(), + getJdbcConnectionPassword(), + "***** hidden by BeanTopiaConfiguration#toString *****"); + return safeToString; } } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/BeanJdbcConfiguration.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/BeanJdbcConfiguration.java index 5f3da70..1295026 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/BeanJdbcConfiguration.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/BeanJdbcConfiguration.java @@ -23,6 +23,7 @@ package org.nuiton.topia.persistence.jdbc; */ import com.google.common.base.MoreObjects; +import org.apache.commons.lang3.StringUtils; import java.sql.Driver; @@ -72,8 +73,7 @@ public class BeanJdbcConfiguration implements JdbcConfiguration { this.jdbcConnectionPassword = jdbcConnectionPassword; } - @Override - public String toString() { + public String dangerousToString() { return MoreObjects.toStringHelper(this) .add("jdbcConnectionUrl", jdbcConnectionUrl) .add("jdbcConnectionUser", jdbcConnectionUser) @@ -81,4 +81,13 @@ public class BeanJdbcConfiguration implements JdbcConfiguration { .add("jdbcDriverClass", jdbcDriverClass) .toString(); } + + @Override + public String toString() { + String safeToString = StringUtils.replace( + dangerousToString(), + getJdbcConnectionPassword(), + "***** hidden by BeanTopiaConfiguration#toString *****"); + return safeToString; + } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.