X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ldap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2Fjcr%2FJcrUserDetailsContextMapper.java;h=0e8dbab32abff9c117bf466460c9f88126f7579d;hb=2f510fb09e18bc3d3e902c8131d0037763c5f279;hp=86c788a448e5188f8afd6902188e955b492bf2fb;hpb=802beab5459c8da4970215886babb45d968e4639;p=lgpl%2Fargeo-commons.git diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java index 86c788a44..0e8dbab32 100644 --- a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java +++ b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrUserDetailsContextMapper.java @@ -1,26 +1,33 @@ package org.argeo.security.ldap.jcr; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.Random; +import java.util.concurrent.Executor; import javax.jcr.Node; import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; +import javax.jcr.nodetype.NodeType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.ArgeoNames; +import org.argeo.jcr.ArgeoTypes; import org.argeo.jcr.JcrUtils; -import org.argeo.security.SystemExecutionService; import org.argeo.security.jcr.JcrUserDetails; import org.springframework.ldap.core.DirContextAdapter; import org.springframework.ldap.core.DirContextOperations; import org.springframework.security.GrantedAuthority; +import org.springframework.security.context.SecurityContextHolder; +import org.springframework.security.providers.encoding.PasswordEncoder; import org.springframework.security.userdetails.UserDetails; import org.springframework.security.userdetails.ldap.UserDetailsContextMapper; @@ -29,92 +36,155 @@ import org.springframework.security.userdetails.ldap.UserDetailsContextMapper; * checks of which values should be mandatory should be performed at a higher * level. */ -public class JcrUserDetailsContextMapper implements UserDetailsContextMapper { +public class JcrUserDetailsContextMapper implements UserDetailsContextMapper, + ArgeoNames { private final static Log log = LogFactory .getLog(JcrUserDetailsContextMapper.class); + private String usernameAttribute; + private String passwordAttribute; + private String homeBasePath; + private String[] userClasses; + private Map propertyToAttributes = new HashMap(); - private SystemExecutionService systemExecutionService; - private String homeBasePath = "/home"; - private RepositoryFactory repositoryFactory; + private Executor systemExecutor; + private Session session; + + private PasswordEncoder passwordEncoder; + private final Random random; + + public JcrUserDetailsContextMapper() { + random = createRandom(); + } + + private static Random createRandom() { + try { + return SecureRandom.getInstance("SHA1PRNG"); + } catch (NoSuchAlgorithmException e) { + return new Random(System.currentTimeMillis()); + } + } public UserDetails mapUserFromContext(final DirContextOperations ctx, final String username, GrantedAuthority[] authorities) { - if (repositoryFactory == null) - throw new ArgeoException("No JCR repository factory registered"); - final String userHomePath = usernameToHomePath(username); - systemExecutionService.executeAsSystem(new Runnable() { + // if (repository == null) + // throw new ArgeoException("No JCR repository registered"); + final StringBuffer userHomePathT = new StringBuffer(""); + Runnable action = new Runnable() { public void run() { - Session session = null; - try { - Repository nodeRepo = JcrUtils.getRepositoryByAlias( - repositoryFactory, ArgeoJcrConstants.ALIAS_NODE); - session = nodeRepo.login(); - Node userProfile = JcrUtils.mkdirs(session, userHomePath - + '/' + ArgeoNames.ARGEO_USER_PROFILE); - for (String jcrProperty : propertyToAttributes.keySet()) - ldapToJcr(userProfile, jcrProperty, ctx); - session.save(); - if (log.isDebugEnabled()) - log.debug("Mapped " + ctx.getDn() + " to " - + userProfile); - } catch (RepositoryException e) { - throw new ArgeoException("Cannot synchronize JCR and LDAP", - e); - } finally { - session.logout(); - } + String userHomepath = mapLdapToJcr(username, ctx); + userHomePathT.append(userHomepath); } - }); + }; + if (SecurityContextHolder.getContext().getAuthentication() == null)// authentication + systemExecutor.execute(action); + else + action.run(); // password - byte[] arr = (byte[]) ctx.getAttributeSortedStringSet("userPassword") - .first(); - JcrUserDetails userDetails = new JcrUserDetails(userHomePath, username, - new String(arr), true, true, true, true, authorities); + byte[] arr = (byte[]) ctx + .getAttributeSortedStringSet(passwordAttribute).first(); + JcrUserDetails userDetails = new JcrUserDetails( + userHomePathT.toString(), username, new String(arr), true, + true, true, true, authorities); + // erase password Arrays.fill(arr, (byte) 0); return userDetails; } + /** @return path to the user home node */ + protected String mapLdapToJcr(String username, DirContextOperations ctx) { + // Session session = null; + try { + // Repository nodeRepo = JcrUtils.getRepositoryByAlias( + // repositoryFactory, ArgeoJcrConstants.ALIAS_NODE); + // session = nodeRepo.login(); + Node userHome = JcrUtils.getUserHome(session, username); + if (userHome == null) + userHome = createUserHome(session, username); + String userHomePath = userHome.getPath(); + Node userProfile; + if (userHome.hasNode(ARGEO_USER_PROFILE)) { + userProfile = userHome.getNode(ARGEO_USER_PROFILE); + } else { + userProfile = userHome.addNode(ARGEO_USER_PROFILE); + userProfile.addMixin(NodeType.MIX_TITLE); + userProfile.addMixin(NodeType.MIX_CREATED); + userProfile.addMixin(NodeType.MIX_LAST_MODIFIED); + } + for (String jcrProperty : propertyToAttributes.keySet()) + ldapToJcr(userProfile, jcrProperty, ctx); + session.save(); + if (log.isDebugEnabled()) + log.debug("Mapped " + ctx.getDn() + " to " + userProfile); + return userHomePath; + } catch (RepositoryException e) { + JcrUtils.discardQuietly(session); + throw new ArgeoException("Cannot synchronize JCR and LDAP", e); + } finally { + // JcrUtils.logoutQuietly(session); + } + } + + protected Node createUserHome(Session session, String username) { + try { + Node userHome = JcrUtils.mkdirs(session, + usernameToHomePath(username)); + userHome.addMixin(ArgeoTypes.ARGEO_USER_HOME); + userHome.setProperty(ARGEO_USER_ID, username); + return userHome; + } catch (RepositoryException e) { + throw new ArgeoException("Cannot create home node for user " + + username, e); + } + } + + protected String usernameToHomePath(String username) { + return homeBasePath + '/' + JcrUtils.firstCharsToPath(username, 2) + + '/' + username; + } + public void mapUserToContext(UserDetails user, final DirContextAdapter ctx) { if (!(user instanceof JcrUserDetails)) throw new ArgeoException("Unsupported user details: " + user.getClass()); - ctx.setAttributeValues("objectClass", new String[] { "inetOrgPerson" }); - ctx.setAttributeValue("uid", user.getUsername()); - ctx.setAttributeValue("userPassword", user.getPassword()); + ctx.setAttributeValues("objectClass", userClasses); + ctx.setAttributeValue(usernameAttribute, user.getUsername()); + ctx.setAttributeValue(passwordAttribute, + encodePassword(user.getPassword())); final JcrUserDetails jcrUserDetails = (JcrUserDetails) user; - systemExecutionService.executeAsSystem(new Runnable() { - public void run() { - Session session = null; - try { - Repository nodeRepo = JcrUtils.getRepositoryByAlias( - repositoryFactory, ArgeoJcrConstants.ALIAS_NODE); - session = nodeRepo.login(); - Node userProfile = session.getNode(jcrUserDetails - .getHomePath() - + '/' - + ArgeoNames.ARGEO_USER_PROFILE); - for (String jcrProperty : propertyToAttributes.keySet()) - jcrToLdap(userProfile, jcrProperty, ctx); - if (log.isDebugEnabled()) - log.debug("Mapped " + userProfile + " to " - + ctx.getDn()); - } catch (RepositoryException e) { - throw new ArgeoException("Cannot synchronize JCR and LDAP", - e); - } finally { - session.logout(); - } - } - }); + // systemExecutor.execute(new Runnable() { + // public void run() { +// Session session = null; + try { + // Repository nodeRepo = JcrUtils.getRepositoryByAlias( + // repositoryFactory, ArgeoJcrConstants.ALIAS_NODE); + // session = nodeRepo.login(); + Node userProfile = session.getNode(jcrUserDetails.getHomePath() + + '/' + ARGEO_USER_PROFILE); + for (String jcrProperty : propertyToAttributes.keySet()) + jcrToLdap(userProfile, jcrProperty, ctx); + if (log.isDebugEnabled()) + log.debug("Mapped " + userProfile + " to " + ctx.getDn()); + } catch (RepositoryException e) { + throw new ArgeoException("Cannot synchronize JCR and LDAP", e); + } finally { + // session.logout(); + } + // } + // }); } - protected String usernameToHomePath(String username) { - return homeBasePath + '/' + JcrUtils.firstCharsToPath(username, 2) - + '/' + username; + protected String encodePassword(String password) { + if (!password.startsWith("{")) { + byte[] salt = new byte[16]; + random.nextBytes(salt); + return passwordEncoder.encodePassword(password, salt); + } else { + return password; + } } protected void ldapToJcr(Node userProfile, String jcrProperty, @@ -163,22 +233,42 @@ public class JcrUserDetailsContextMapper implements UserDetailsContextMapper { this.propertyToAttributes = propertyToAttributes; } - public void setSystemExecutionService( - SystemExecutionService systemExecutionService) { - this.systemExecutionService = systemExecutionService; + public void setSystemExecutor(Executor systemExecutor) { + this.systemExecutor = systemExecutor; } public void setHomeBasePath(String homeBasePath) { this.homeBasePath = homeBasePath; } - public void register(RepositoryFactory repositoryFactory, - Map parameters) { - this.repositoryFactory = repositoryFactory; + // public void register(RepositoryFactory repositoryFactory, + // Map parameters) { + // this.repositoryFactory = repositoryFactory; + // } + // + // public void unregister(RepositoryFactory repositoryFactory, + // Map parameters) { + // this.repositoryFactory = null; + // } + + public void setUsernameAttribute(String usernameAttribute) { + this.usernameAttribute = usernameAttribute; } - public void unregister(RepositoryFactory repositoryFactory, - Map parameters) { - this.repositoryFactory = null; + public void setPasswordAttribute(String passwordAttribute) { + this.passwordAttribute = passwordAttribute; } + + public void setUserClasses(String[] userClasses) { + this.userClasses = userClasses; + } + + public void setPasswordEncoder(PasswordEncoder passwordEncoder) { + this.passwordEncoder = passwordEncoder; + } + + public void setSession(Session session) { + this.session = session; + } + }