You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/10/16 07:10:11 UTC
[2/2] syncope git commit: More tolerant support to (S)SSHA conversion
between LDAP and Syncope
More tolerant support to (S)SSHA conversion between LDAP and Syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d641ee22
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d641ee22
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d641ee22
Branch: refs/heads/master
Commit: d641ee2228dd17615f04a6386619d749ef0363d6
Parents: 6edd8c7
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Oct 16 09:07:37 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Oct 16 09:09:57 2017 +0200
----------------------------------------------------------------------
.../java/propagation/LDAPPasswordPropagationActions.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d641ee22/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
index 08d4c7a..8d79c7c 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/LDAPPasswordPropagationActions.java
@@ -108,8 +108,14 @@ public class LDAPPasswordPropagationActions implements PropagationActions {
return true;
}
- // Special check for "SHA" (user sync'd from LDAP)
- return "SHA".equals(connectorAlgorithm) && "SHA1".equals(userAlgorithm.name());
+ // Special check for "SHA" and "SSHA" (user pulled from LDAP)
+ if (("SHA".equals(connectorAlgorithm) && userAlgorithm.name().startsWith("SHA"))
+ || ("SSHA".equals(connectorAlgorithm) && userAlgorithm.name().startsWith("SSHA"))) {
+
+ return true;
+ }
+
+ return false;
}
}