From 54900d01b87c39e1b4099b6db4c173a7bbf7136b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 27 Feb 2015 10:21:42 +0000 Subject: [PATCH] Revert previous change git-svn-id: https://svn.argeo.org/commons/trunk@7975 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../jackrabbit/JackrabbitUserAdminService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/useradmin/jackrabbit/JackrabbitUserAdminService.java b/org.argeo.cms/src/org/argeo/cms/internal/useradmin/jackrabbit/JackrabbitUserAdminService.java index 983f8e407..a363515c9 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/useradmin/jackrabbit/JackrabbitUserAdminService.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/useradmin/jackrabbit/JackrabbitUserAdminService.java @@ -23,6 +23,7 @@ import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.core.security.authentication.CryptedSimpleCredentials; import org.apache.jackrabbit.core.security.user.UserAccessControlProvider; import org.argeo.ArgeoException; +import org.argeo.cms.CmsException; import org.argeo.cms.KernelHeader; import org.argeo.cms.internal.auth.GrantedAuthorityPrincipal; import org.argeo.cms.internal.auth.JcrSecurityModel; @@ -128,10 +129,14 @@ public class JackrabbitUserAdminService implements UserAdminService, String newPassword = userDetails.getPassword(); if (!newPassword.trim().equals("")) { if (newPassword.startsWith("{SHA-256}")) { - // Already hashed password - Value v = adminSession.getValueFactory().createValue( - newPassword); - user.setProperty(REP_PASSWORD, v); + // Already hashed password + throw new CmsException("Cannot import hashed password"); + // Value v = adminSession.getValueFactory().createValue( + // newPassword); + // user.setProperty(REP_PASSWORD, v); + // TODO find a way to deal w/ protected property + // see + // http://jackrabbit.apache.org/api/2.2/org/apache/jackrabbit/core/security/user/UserImporter.html } else { SimpleCredentials sp = new SimpleCredentials( userDetails.getUsername(), -- 2.30.2