This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c7a132c4557b4c2c919f21e17015c851acaae854 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Dec 3 12:09:06 2021 +0700 JAMES-3674 PBKDF2 should be the default choice --- .../apache/james/user/cassandra/CassandraRepositoryConfiguration.java | 2 +- .../data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersDAO.java | 2 +- .../src/main/java/org/apache/james/user/memory/MemoryUsersDAO.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraRepositoryConfiguration.java b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraRepositoryConfiguration.java index 8c3c8d1..8d96edd 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraRepositoryConfiguration.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/user/cassandra/CassandraRepositoryConfiguration.java @@ -26,7 +26,7 @@ import org.apache.james.user.lib.model.Algorithm; import org.apache.james.user.lib.model.Algorithm.HashingMode; public class CassandraRepositoryConfiguration { - public static final String DEFAULT_ALGORITHM = "SHA-512"; + public static final String DEFAULT_ALGORITHM = "PBKDF2"; public static final String DEFAULT_HASHING_MODE = HashingMode.PLAIN.name(); public static final CassandraRepositoryConfiguration DEFAULT = new CassandraRepositoryConfiguration( diff --git a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersDAO.java b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersDAO.java index d50ded0..fc12e0e 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersDAO.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersDAO.java @@ -56,7 +56,7 @@ public class JPAUsersDAO implements UsersDAO, Configurable { @Override public void configure(HierarchicalConfiguration<ImmutableNode> config) { - algo = config.getString("algorithm", "SHA-512"); + algo = config.getString("algorithm", "PBKDF2"); } /** diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersDAO.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersDAO.java index 0f93a90..91daeb6 100644 --- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersDAO.java +++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersDAO.java @@ -42,12 +42,12 @@ public class MemoryUsersDAO implements UsersDAO, Configurable { MemoryUsersDAO() { this.userByName = new HashMap<>(); - this.algo = Algorithm.of("SHA-512"); + this.algo = Algorithm.of("PBKDF2"); } @Override public void configure(HierarchicalConfiguration<ImmutableNode> config) { - algo = Algorithm.of(config.getString("algorithm", "SHA-512"), config.getString("hashingMode", PLAIN.name())); + algo = Algorithm.of(config.getString("algorithm", "PBKDF2"), config.getString("hashingMode", PLAIN.name())); } public void clear() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
