Update license headers

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.ldap / src / main / java / org / argeo / security / ldap / jcr / JcrLdapSynchronizer.java

diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
index 3a644a6939209abb0213837c747fb72aedc04928..11e8e81998ea449960a1fe6e0a89f360372dd64d 100644 (file)
--- a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
+++ b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/jcr/JcrLdapSynchronizer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.security.ldap.jcr;
 
 import java.security.NoSuchAlgorithmException;
@@ -20,6 +35,7 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 import javax.jcr.query.Query;
+import javax.jcr.version.VersionManager;
 import javax.naming.Binding;
 import javax.naming.Name;
 import javax.naming.NamingException;
@@ -185,10 +201,21 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
                                Node userProfile = it.nextNode();
                                String path = userProfile.getPath();
                                if (!userPaths.contains(path)) {
+                                       log.warn("Path "
+                                                       + path
+                                                       + " not found in LDAP, disabling user "
+                                                       + userProfile.getProperty(ArgeoNames.ARGEO_USER_ID)
+                                                                       .getString());
+                                       VersionManager versionManager = securitySession
+                                                       .getWorkspace().getVersionManager();
+                                       versionManager.checkout(userProfile.getPath());
                                        userProfile.setProperty(ArgeoNames.ARGEO_ENABLED, false);
+                                       securitySession.save();
+                                       versionManager.checkin(userProfile.getPath());
                                }
                        }
                } catch (Exception e) {
+                       JcrUtils.discardQuietly(securitySession);
                        throw new ArgeoException("Cannot synchronized LDAP and JCR", e);
                }
        }
@@ -198,9 +225,9 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
                        final String username, GrantedAuthority[] authorities) {
                if (ctx == null)
                        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);
+               Node userProfile = JcrUtils.createUserProfileIfNeeded(securitySession,
+                               username);
+               JcrUserDetails.checkAccountStatus(userProfile);
 
                // password
                SortedSet<?> passwordAttributes = ctx
@@ -216,8 +243,7 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
                }
 
                try {
-                       return new JcrUserDetails(userHome.getNode(ARGEO_PROFILE),
-                                       password, authorities);
+                       return new JcrUserDetails(userProfile, password, authorities);
                } catch (RepositoryException e) {
                        throw new ArgeoException("Cannot retrieve user details for "
                                        + username, e);
@@ -229,7 +255,7 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
         * 
         * @return path to user profile
         */
-       protected String mapLdapToJcr(DirContextAdapter ctx) {
+       protected synchronized String mapLdapToJcr(DirContextAdapter ctx) {
                Session session = securitySession;
                try {
                        // process
@@ -238,6 +264,20 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
                        Node userProfile; // = userHome.getNode(ARGEO_PROFILE);
                        if (userHome.hasNode(ARGEO_PROFILE)) {
                                userProfile = userHome.getNode(ARGEO_PROFILE);
+
+                               // compatibility with legacy, will be removed
+                               if (!userProfile.hasProperty(ARGEO_ENABLED)) {
+                                       session.getWorkspace().getVersionManager()
+                                                       .checkout(userProfile.getPath());
+                                       userProfile.setProperty(ARGEO_ENABLED, true);
+                                       userProfile.setProperty(ARGEO_ACCOUNT_NON_EXPIRED, true);
+                                       userProfile.setProperty(ARGEO_ACCOUNT_NON_LOCKED, true);
+                                       userProfile
+                                                       .setProperty(ARGEO_CREDENTIALS_NON_EXPIRED, true);
+                                       session.save();
+                                       session.getWorkspace().getVersionManager()
+                                                       .checkin(userProfile.getPath());
+                               }
                        } else {
                                userProfile = JcrUtils.createUserProfile(securitySession,
                                                username);
@@ -336,9 +376,12 @@ public class JcrLdapSynchronizer implements UserDetailsContextMapper,
                        Node userProfile = securitySession.getNode(
                                        jcrUserDetails.getHomePath()).getNode(ARGEO_PROFILE);
                        for (String jcrProperty : propertyToAttributes.keySet()) {
-                               ModificationItem mi = jcrToLdap(jcrProperty, userProfile
-                                               .getProperty(jcrProperty).getString());
-                               ctx.setAttribute(mi.getAttribute());
+                               if (userProfile.hasProperty(jcrProperty)) {
+                                       ModificationItem mi = jcrToLdap(jcrProperty, userProfile
+                                                       .getProperty(jcrProperty).getString());
+                                       if (mi != null)
+                                               ctx.setAttribute(mi.getAttribute());
+                               }
                        }
                        if (log.isTraceEnabled())
                                log.trace("Mapped " + userProfile + " to " + ctx.getDn());