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/RepositoryResolver.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 21a8376..0804819 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.git;
-import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
@@ -28,22 +27,27 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.GitBlit;
+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;
/**
* Resolves repositories and grants export access.
- *
+ *
* @author James Moger
*
*/
public class RepositoryResolver<X> extends FileResolver<X> {
private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class);
-
- public RepositoryResolver(File repositoriesFolder) {
- super(repositoriesFolder, true);
+
+ private final IGitblit gitblit;
+
+ public RepositoryResolver(IGitblit gitblit) {
+ super(gitblit.getRepositoriesFolder(), true);
+ this.gitblit = gitblit;
}
/**
@@ -53,7 +57,7 @@
public Repository open(final X req, final String name)
throws RepositoryNotFoundException, ServiceNotEnabledException {
Repository repo = super.open(req, name);
-
+
// Set repository name for the pack factories
// We do this because the JGit API does not have a consistent way to
// retrieve the repository name from the pack factories or the hooks.
@@ -65,21 +69,24 @@
// git request
GitDaemonClient client = (GitDaemonClient) req;
client.setRepositoryName(name);
+ } else if (req instanceof SshSession) {
+ SshSession s = (SshSession)req;
+ s.setRepositoryName(name);
}
return repo;
}
-
+
/**
* Check if this repository can be served by the requested client connection.
*/
@Override
protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ RepositoryModel model = gitblit.getRepositoryModel(repositoryName);
String scheme = null;
UserModel user = null;
String origin = null;
-
+
if (req instanceof GitDaemonClient) {
// git daemon request
// this is an anonymous/unauthenticated protocol
@@ -90,11 +97,17 @@
} else if (req instanceof HttpServletRequest) {
// http/https request
HttpServletRequest httpRequest = (HttpServletRequest) req;
- scheme = httpRequest.getScheme();
+ scheme = httpRequest.getScheme();
origin = httpRequest.getRemoteAddr();
- user = GitBlit.self().authenticate(httpRequest);
+ user = gitblit.authenticate(httpRequest);
if (user == null) {
user = UserModel.ANONYMOUS;
+ }
+ } else if (req instanceof SshSession) {
+ SshSession s = (SshSession) req;
+ user = gitblit.authenticate(s);
+ if (user == null) {
+ throw new IOException(String.format("User %s not found", s.getRemoteUser()));
}
}
@@ -104,7 +117,7 @@
scheme, repositoryName, user.username, origin));
return true;
}
-
+
// user can not access this git repo
logger.warn(MessageFormat.format("{0}:// access of {1} by {2} from {3} DENIED",
scheme, repositoryName, user.username, origin));
--
Gitblit v1.9.1