Repository: syncope
Updated Branches:
  refs/heads/2_0_X f9fabbf62 -> c1f858fd8
  refs/heads/2_1_X 0e542bdb2 -> 1b9bc4607
  refs/heads/master b8d40101e -> 3e0c00355


[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/c1f858fd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c1f858fd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c1f858fd

Branch: refs/heads/2_0_X
Commit: c1f858fd8d475b5b8e701e114f93bc2bd2b6db80
Parents: f9fabbf
Author: Francesco Chicchiriccò <[email protected]>
Authored: Mon Sep 17 12:08:08 2018 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Mon Sep 17 12:08:08 2018 +0200

----------------------------------------------------------------------
 .../apache/syncope/core/persistence/jpa/dao/JPAUserDAO.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/c1f858fd/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 b8c5839..effb07d 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
@@ -349,6 +349,7 @@ public class JPAUserDAO extends AbstractAnyDAO<User> 
implements UserDAO {
                             : pwdHistory.subList(policy.getHistoryLength() >= 
pwdHistory.size()
                                     ? 0
                                     : pwdHistory.size() - 
policy.getHistoryLength(), pwdHistory.size())) {
+
                         matching |= ENCRYPTOR.verify(user.getClearPassword(), 
user.getCipherAlgorithm(), oldPwdValue);
                     }
                 }
@@ -362,7 +363,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
@@ -590,5 +593,4 @@ public class JPAUserDAO extends AbstractAnyDAO<User> 
implements UserDAO {
     public Collection<String> findAllResourceKeys(final String key) {
         return CollectionUtils.collect(findAllResources(authFind(key)), 
EntityUtils.keyTransformer());
     }
-
 }

Reply via email to