Repository: syncope Updated Branches: refs/heads/2_0_X 33a15f155 -> 4525e3c9b refs/heads/master 6edd8c772 -> d641ee222
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/4525e3c9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4525e3c9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4525e3c9 Branch: refs/heads/2_0_X Commit: 4525e3c9bdc4cba595df091dbe5de0fff8cd60e2 Parents: 33a15f1 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Oct 16 09:07:37 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Oct 16 09:07:37 2017 +0200 ---------------------------------------------------------------------- .../java/propagation/LDAPPasswordPropagationActions.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/4525e3c9/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 5d5c5b1..256892f 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 @@ -99,7 +99,7 @@ public class LDAPPasswordPropagationActions extends DefaultPropagationActions { @Override public boolean evaluate(final ConnConfProperty property) { return "passwordHashAlgorithm".equals(property.getSchema().getName()) - && property.getValues() != null && !property.getValues().isEmpty(); + && property.getValues() != null && !property.getValues().isEmpty(); } }); @@ -117,8 +117,10 @@ public class LDAPPasswordPropagationActions extends DefaultPropagationActions { return true; } - // Special check for "SHA" (user sync'd from LDAP) - if ("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; }
