From 8b63e0aaf044b36627e9ce02a1d73618e50700e4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:08 -0400
Subject: [PATCH] Listen for ssh clients on all interfaces, by default
---
src/main/java/com/gitblit/git/GitblitReceivePackFactory.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
index bdf9b1a..b928d85 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java
@@ -31,6 +31,8 @@
import com.gitblit.manager.IGitblit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+import com.gitblit.transport.git.GitDaemonClient;
+import com.gitblit.transport.ssh.SshSession;
import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;
@@ -63,19 +65,17 @@
String repositoryName = "";
String origin = "";
String gitblitUrl = "";
- String repositoryUrl = "";
int timeout = 0;
if (req instanceof HttpServletRequest) {
// http/https request may or may not be authenticated
- HttpServletRequest request = (HttpServletRequest) req;
- repositoryName = request.getAttribute("gitblitRepositoryName").toString();
- origin = request.getRemoteHost();
- gitblitUrl = HttpUtils.getGitblitURL(request);
- repositoryUrl = request.getRequestURI();
+ HttpServletRequest client = (HttpServletRequest) req;
+ repositoryName = client.getAttribute("gitblitRepositoryName").toString();
+ origin = client.getRemoteHost();
+ gitblitUrl = HttpUtils.getGitblitURL(client);
// determine pushing user
- String username = request.getRemoteUser();
+ String username = client.getRemoteUser();
if (!StringUtils.isEmpty(username)) {
UserModel u = gitblit.getUserModel(username);
if (u != null) {
@@ -90,6 +90,13 @@
// set timeout from Git daemon
timeout = client.getDaemon().getTimeout();
+ } else if (req instanceof SshSession) {
+ // SSH request is always authenticated
+ SshSession client = (SshSession) req;
+ repositoryName = client.getRepositoryName();
+ origin = client.getRemoteAddress().toString();
+ String username = client.getRemoteUser();
+ user = gitblit.getUserModel(username);
}
boolean allowAnonymousPushes = settings.getBoolean(Keys.git.allowAnonymousPushes, false);
@@ -98,11 +105,22 @@
throw new ServiceNotEnabledException();
}
+ String url = settings.getString(Keys.web.canonicalUrl, null);
+ if (StringUtils.isEmpty(url)) {
+ url = gitblitUrl;
+ }
+
final RepositoryModel repository = gitblit.getRepositoryModel(repositoryName);
- final GitblitReceivePack rp = new GitblitReceivePack(gitblit, db, repository, user);
- rp.setGitblitUrl(gitblitUrl);
- rp.setRepositoryUrl(repositoryUrl);
+ // Determine which receive pack to use for pushes
+ final GitblitReceivePack rp;
+ if (gitblit.getTicketService().isAcceptingNewPatchsets(repository)) {
+ rp = new PatchsetReceivePack(gitblit, db, repository, user);
+ } else {
+ rp = new GitblitReceivePack(gitblit, db, repository, user);
+ }
+
+ rp.setGitblitUrl(url);
rp.setRefLogIdent(new PersonIdent(user.username, user.username + "@" + origin));
rp.setTimeout(timeout);
--
Gitblit v1.9.1