Basic implementation of feature for ldap user synchronization as

background service. Introduced configuration property to configure the
synchronization period.

2 files changed, 94 insertions, 1 deletions

diff --git a/src/main/java/com/gitblit/auth/LdapAuthProvider.java b/src/main/java/com/gitblit/auth/LdapAuthProvider.java
index 8fef620d..58fb8219 100644
--- a/src/main/java/com/gitblit/auth/LdapAuthProvider.java
+++ b/src/main/java/com/gitblit/auth/LdapAuthProvider.java
@@ -23,6 +23,8 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -32,8 +34,10 @@ import com.gitblit.Keys;
 import com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
+import com.gitblit.service.LdapSyncService;
 import com.gitblit.utils.ArrayUtils;
 import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.TimeUtils;
 import com.unboundid.ldap.sdk.Attribute;
 import com.unboundid.ldap.sdk.DereferencePolicy;
 import com.unboundid.ldap.sdk.ExtendedResult;
@@ -57,7 +61,7 @@ import com.unboundid.util.ssl.TrustAllTrustManager;
  */
 public class LdapAuthProvider extends UsernamePasswordAuthenticationProvider {
 
-    private AtomicLong lastLdapUserSync = new AtomicLong(0L);
+    private final AtomicLong lastLdapUserSync = new AtomicLong(0L);
 
 	public LdapAuthProvider() {
 		super("ldap");
@@ -78,6 +82,11 @@ public class LdapAuthProvider extends UsernamePasswordAuthenticationProvider {
 	@Override
 	public void setup() {
 		synchronizeLdapUsers();
+		configureLdapSyncService();
+	}
+	
+	public void synchronizeWithLdapService() {
+		synchronizeLdapUsers();
 	}
 
 	protected synchronized void synchronizeLdapUsers() {
@@ -519,4 +528,24 @@ public class LdapAuthProvider extends UsernamePasswordAuthenticationProvider {
 		}
 		return sb.toString();
 	}
+
+	private void configureLdapSyncService() {
+		logger.info("Start configuring ldap sync service");
+		LdapSyncService ldapSyncService = new LdapSyncService(settings, this);
+		if (ldapSyncService.isReady()) {
+			int mins = TimeUtils.convertFrequencyToMinutes(settings.getString(Keys.realm.ldap.synchronizeUsers.ldapSyncPeriod, "5 mins"));
+			if (mins < 5) {
+				mins = 5;
+			}
+			int delay = 1;
+			ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
+			scheduledExecutorService.scheduleAtFixedRate(ldapSyncService, delay, mins,  TimeUnit.MINUTES);
+			logger.info("Ldap sync service will update user and groups every {} minutes.", mins);
+			logger.info("Next scheduled ldap sync is in {} minutes", delay);
+		} else {
+			logger.info("Ldap sync service is disabled.");
+		}
+		logger.info("Finished configuring ldap sync service");
+	}
+
 }
diff --git a/src/main/java/com/gitblit/service/LdapSyncService.java b/src/main/java/com/gitblit/service/LdapSyncService.java
new file mode 100644
index 00000000..84d478aa
--- /dev/null
+++ b/src/main/java/com/gitblit/service/LdapSyncService.java
@@ -0,0 +1,64 @@
+/*

+ * Copyright 2013 gitblit.com.

+ *

+ * 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 com.gitblit.service;

+

+import java.util.concurrent.atomic.AtomicBoolean;

+

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+

+import com.gitblit.IStoredSettings;

+import com.gitblit.Keys;

+import com.gitblit.auth.LdapAuthProvider;

+

+/**

+ * @author Alfred Schmid

+ * 

+ */

+public final class LdapSyncService implements Runnable {

+

+	private final Logger logger = LoggerFactory.getLogger(LdapSyncService.class);

+

+	private final IStoredSettings settings;

+

+	private final LdapAuthProvider ldapAuthProvider;

+

+	private final AtomicBoolean running = new AtomicBoolean(false);

+

+	public LdapSyncService(IStoredSettings settings, LdapAuthProvider ldapAuthProvider) {

+		this.settings = settings;

+		this.ldapAuthProvider = ldapAuthProvider;

+	}

+

+	/**

+	 * 

+	 * @see java.lang.Runnable#run()

+	 */

+	@Override

+	public void run() {

+		logger.info("Starting user and group sync with ldap service");

+		if (!running.getAndSet(true)) {

+			ldapAuthProvider.synchronizeWithLdapService();

+			running.getAndSet(false);

+		}

+		logger.info("Finished user and group sync with ldap service");

+	}

+

+	public boolean isReady() {

+		return settings.getBoolean(Keys.realm.ldap.synchronizeUsers.enable, false);

+	}

+

+}