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=9476658e84f901e175d347493d87d4c1e36bc8bd;hb=4d665b0700136573b05879aa19897d8f448d8ca4;hp=ec4255af9a6a1777583f058fda55cae186e2e902;hpb=4c8c237990cda2b1a9be35532796510d9d5734c5;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 ec4255af9..9476658e8 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,22 +1,12 @@ 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.SortedSet; -import java.util.concurrent.Executor; +import java.util.UUID; import javax.jcr.Node; -import javax.jcr.Property; +import javax.jcr.Repository; import javax.jcr.RepositoryException; 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.ArgeoNames; import org.argeo.jcr.JcrUtils; @@ -24,249 +14,66 @@ 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; -/** - * Maps LDAP attributes and JCR properties. This class is meant to be robust, - * checks of which values should be mandatory should be performed at a higher - * level. - */ +/** Read only mapping from LDAP to user details */ public class JcrUserDetailsContextMapper implements UserDetailsContextMapper, ArgeoNames { - private final static Log log = LogFactory - .getLog(JcrUserDetailsContextMapper.class); + /** Admin session on the security workspace */ + private Session securitySession; + private Repository repository; + private String securityWorkspace = "security"; - private String usernameAttribute; - private String passwordAttribute; - private String homeBasePath; - private String[] userClasses; - - private Map propertyToAttributes = new HashMap(); - private Executor systemExecutor; - private Session session; - - private PasswordEncoder passwordEncoder; - private final Random random; - - public JcrUserDetailsContextMapper() { - random = createRandom(); - } - - private static Random createRandom() { + public void init() { try { - return SecureRandom.getInstance("SHA1PRNG"); - } catch (NoSuchAlgorithmException e) { - return new Random(System.currentTimeMillis()); + securitySession = repository.login(securityWorkspace); + } catch (RepositoryException e) { + JcrUtils.logoutQuietly(securitySession); + throw new ArgeoException( + "Cannot initialize LDAP/JCR user details context mapper", e); } } + public void destroy() { + JcrUtils.logoutQuietly(securitySession); + } + + /** Called during authentication in order to retrieve user details */ public UserDetails mapUserFromContext(final DirContextOperations ctx, final String username, GrantedAuthority[] authorities) { if (ctx == null) - throw new ArgeoException("No LDAP information found for user " - + username); - - final StringBuffer userHomePathT = new StringBuffer(""); - Runnable action = new Runnable() { - public void run() { - String userHomepath = mapLdapToJcr(username, ctx); - userHomePathT.append(userHomepath); - } - }; - - if (SecurityContextHolder.getContext().getAuthentication() == null) { - // authentication - try { - systemExecutor.execute(action); - } finally { - JcrUtils.logoutQuietly(session); - } - } else { - // authenticated user - action.run(); - } + throw new ArgeoException("No LDAP information for user " + username); + Node userHome = JcrUtils.getUserHome(securitySession, username); + if (userHome == null) + throw new ArgeoException("No JCR information for user " + username); // password - SortedSet passwordAttributes = ctx - .getAttributeSortedStringSet(passwordAttribute); - String password; - if (passwordAttributes == null || passwordAttributes.size() == 0) { - throw new ArgeoException("No password found for user " + username); - } else { - byte[] arr = (byte[]) passwordAttributes.first(); - password = new String(arr); - // erase password - Arrays.fill(arr, (byte) 0); - } - JcrUserDetails userDetails = new JcrUserDetails( - userHomePathT.toString(), username, password, true, true, true, - true, authorities); - return userDetails; - } - - /** @return path to the user home node */ - protected String mapLdapToJcr(String username, DirContextOperations ctx) { - try { - Node userHome = JcrUtils.getUserHome(session, username); - if (userHome == null) - userHome = JcrUtils.createUserHome(session, homeBasePath, - username); - String userHomePath = userHome.getPath(); - Node userProfile = userHome.getNode(ARGEO_PROFILE); - if (userHome.hasNode(ARGEO_PROFILE)) { - userProfile = userHome.getNode(ARGEO_PROFILE); - } else { - userProfile = userHome.addNode(ARGEO_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); - - // assign default values - if (!userProfile.hasProperty(Property.JCR_DESCRIPTION)) - userProfile.setProperty(Property.JCR_DESCRIPTION, ""); - if (!userProfile.hasProperty(Property.JCR_TITLE)) - userProfile.setProperty(Property.JCR_TITLE, userProfile - .getProperty(ARGEO_FIRST_NAME).getString() - + " " - + userProfile.getProperty(ARGEO_LAST_NAME).getString()); - - session.save(); - if (log.isTraceEnabled()) - log.trace("Mapped " + ctx.getDn() + " to " + userProfile); - return userHomePath; - } catch (Exception e) { - JcrUtils.discardQuietly(session); - throw new ArgeoException("Cannot synchronize JCR and LDAP", e); - } - } - - public void mapUserToContext(UserDetails user, final DirContextAdapter ctx) { - if (!(user instanceof JcrUserDetails)) - throw new ArgeoException("Unsupported user details: " - + user.getClass()); - - ctx.setAttributeValues("objectClass", userClasses); - ctx.setAttributeValue(usernameAttribute, user.getUsername()); - ctx.setAttributeValue(passwordAttribute, - encodePassword(user.getPassword())); + // SortedSet passwordAttributes = ctx + // .getAttributeSortedStringSet(passwordAttribute); + // String password; + // if (passwordAttributes == null || passwordAttributes.size() == 0) { + // throw new ArgeoException("No password found for user " + username); + // } else { + // byte[] arr = (byte[]) passwordAttributes.first(); + // password = new String(arr); + // // erase password + // Arrays.fill(arr, (byte) 0); + // } - final JcrUserDetails jcrUserDetails = (JcrUserDetails) user; try { - Node userProfile = session.getNode(jcrUserDetails.getHomePath() - + '/' + ARGEO_PROFILE); - for (String jcrProperty : propertyToAttributes.keySet()) - jcrToLdap(userProfile, jcrProperty, ctx); - - if (log.isTraceEnabled()) - log.trace("Mapped " + userProfile + " to " + ctx.getDn()); + // we don't have access to password, so let's not pretend + String password = UUID.randomUUID().toString(); + return new JcrUserDetails(userHome.getNode(ARGEO_PROFILE), + password, authorities); } catch (RepositoryException e) { - throw new ArgeoException("Cannot synchronize JCR and LDAP", e); + throw new ArgeoException("Cannot retrieve user details for " + + username, e); } } - 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, - DirContextOperations ctx) { - try { - String ldapAttribute; - if (propertyToAttributes.containsKey(jcrProperty)) - ldapAttribute = propertyToAttributes.get(jcrProperty); - else - throw new ArgeoException( - "No LDAP attribute mapped for JCR proprty " - + jcrProperty); - - String value = ctx.getStringAttribute(ldapAttribute); - if (value == null) - return; - userProfile.setProperty(jcrProperty, value); - } catch (Exception e) { - throw new ArgeoException("Cannot map JCR property " + jcrProperty - + " from LDAP", e); - } - } - - protected void jcrToLdap(Node userProfile, String jcrProperty, - DirContextOperations ctx) { - try { - String ldapAttribute; - if (propertyToAttributes.containsKey(jcrProperty)) - ldapAttribute = propertyToAttributes.get(jcrProperty); - else - throw new ArgeoException( - "No LDAP attribute mapped for JCR proprty " - + jcrProperty); - - // fix issue with empty 'sn' in LDAP - if (ldapAttribute.equals("sn") - && (!userProfile.hasProperty(jcrProperty) || userProfile - .getProperty(jcrProperty).getString().trim() - .equals(""))) - userProfile.setProperty(jcrProperty, "empty"); - - if (ldapAttribute.equals("description")) { - String value = userProfile.getProperty(jcrProperty).getString(); - if (value.trim().equals("")) - return; - } - - if (!userProfile.hasProperty(jcrProperty)) - return; - String value = userProfile.getProperty(jcrProperty).getString(); - - ctx.setAttributeValue(ldapAttribute, value); - } catch (Exception e) { - throw new ArgeoException("Cannot map JCR property " + jcrProperty - + " from LDAP", e); - } - } - - public void setPropertyToAttributes(Map propertyToAttributes) { - this.propertyToAttributes = propertyToAttributes; - } - - public void setSystemExecutor(Executor systemExecutor) { - this.systemExecutor = systemExecutor; - } - - public void setHomeBasePath(String homeBasePath) { - this.homeBasePath = homeBasePath; - } - - public void setUsernameAttribute(String usernameAttribute) { - this.usernameAttribute = usernameAttribute; - } - - 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; + public void mapUserToContext(UserDetails user, final DirContextAdapter ctx) { + throw new UnsupportedOperationException("LDAP access is read-only"); } }