From a3de33e71a22268105714e01d09c1c2e28bfe2c3 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 10 Apr 2014 18:58:07 -0400
Subject: [PATCH] Fix command dispatching
---
src/main/java/com/gitblit/manager/ServicesManager.java | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index d04b277..df8918e 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -24,11 +24,14 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Constants.AccessPermission;
+import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationToken;
-import com.gitblit.Gitblit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.fanout.FanoutNioService;
@@ -36,7 +39,11 @@
import com.gitblit.fanout.FanoutSocketService;
import com.gitblit.git.GitDaemon;
import com.gitblit.models.FederationModel;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.UserModel;
import com.gitblit.service.FederationPullService;
+import com.gitblit.transport.ssh.SshDaemon;
+import com.gitblit.utils.IdGenerator;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
@@ -48,7 +55,7 @@
* @author James Moger
*
*/
-public class ServicesManager implements IServicesManager {
+public class ServicesManager implements IManager {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -56,13 +63,15 @@
private final IStoredSettings settings;
- private final Gitblit gitblit;
+ private final IGitblit gitblit;
private FanoutService fanoutService;
private GitDaemon gitDaemon;
- public ServicesManager(Gitblit gitblit) {
+ private SshDaemon sshDaemon;
+
+ public ServicesManager(IGitblit gitblit) {
this.settings = gitblit.getSettings();
this.gitblit = gitblit;
}
@@ -72,6 +81,7 @@
configureFederation();
configureFanout();
configureGitDaemon();
+ configureSshDaemon();
return this;
}
@@ -84,6 +94,9 @@
}
if (gitDaemon != null) {
gitDaemon.stop();
+ }
+ if (sshDaemon != null) {
+ sshDaemon.stop();
}
return this;
}
@@ -133,6 +146,20 @@
}
}
+ protected void configureSshDaemon() {
+ int port = settings.getInteger(Keys.git.sshPort, 0);
+ String bindInterface = settings.getString(Keys.git.sshBindInterface, "localhost");
+ if (port > 0) {
+ try {
+ sshDaemon = new SshDaemon(gitblit, new IdGenerator());
+ sshDaemon.start();
+ } catch (IOException e) {
+ sshDaemon = null;
+ logger.error(MessageFormat.format("Failed to start SSH daemon on {0}:{1,number,0}", bindInterface, port), e);
+ }
+ }
+ }
+
protected void configureFanout() {
// startup Fanout PubSub service
if (settings.getInteger(Keys.fanout.port, 0) > 0) {
@@ -163,14 +190,51 @@
}
}
+ public String getGitDaemonUrl(HttpServletRequest request, UserModel user, RepositoryModel repository) {
+ if (gitDaemon != null) {
+ String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
+ if (bindInterface.equals("localhost")
+ && (!request.getServerName().equals("localhost") && !request.getServerName().equals("127.0.0.1"))) {
+ // git daemon is bound to localhost and the request is from elsewhere
+ return null;
+ }
+ if (user.canClone(repository)) {
+ String servername = request.getServerName();
+ String url = gitDaemon.formatUrl(servername, repository.name);
+ return url;
+ }
+ }
+ return null;
+ }
+
+ public AccessPermission getGitDaemonAccessPermission(UserModel user, RepositoryModel repository) {
+ if (gitDaemon != null && user.canClone(repository)) {
+ AccessPermission gitDaemonPermission = user.getRepositoryPermission(repository).permission;
+ if (gitDaemonPermission.atLeast(AccessPermission.CLONE)) {
+ if (repository.accessRestriction.atLeast(AccessRestrictionType.CLONE)) {
+ // can not authenticate clone via anonymous git protocol
+ gitDaemonPermission = AccessPermission.NONE;
+ } else if (repository.accessRestriction.atLeast(AccessRestrictionType.PUSH)) {
+ // can not authenticate push via anonymous git protocol
+ gitDaemonPermission = AccessPermission.CLONE;
+ } else {
+ // normal user permission
+ }
+ }
+ return gitDaemonPermission;
+ }
+ return AccessPermission.NONE;
+ }
+
+
private class FederationPuller extends FederationPullService {
public FederationPuller(FederationModel registration) {
- super(Arrays.asList(registration));
+ super(gitblit, Arrays.asList(registration));
}
public FederationPuller(List<FederationModel> registrations) {
- super(registrations);
+ super(gitblit, registrations);
}
@Override
--
Gitblit v1.9.1