[SYNCOPE-1372] Restoring check before insertion into password history
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1b9bc460 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1b9bc460 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1b9bc460 Branch: refs/heads/2_1_X Commit: 1b9bc4607eb1a49649cdaef09a5ae82b9eecc759 Parents: 0e542bd Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Sep 17 12:08:08 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Sep 17 12:11:32 2018 +0200 ---------------------------------------------------------------------- .../org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/1b9bc460/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java index cbe6159..b85147f 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java @@ -320,7 +320,9 @@ public class JPAUserDAO extends AbstractAnyDAO<User> implements UserDAO { } // update user's password history with encrypted password - if (maxPPSpecHistory > 0 && user.getPassword() != null) { + if (maxPPSpecHistory > 0 && user.getPassword() != null + && !user.getPasswordHistory().contains(user.getPassword())) { + user.getPasswordHistory().add(user.getPassword()); } // keep only the last maxPPSpecHistory items in user's password history
