From afbcba32133f1c85ef50a6515fabad2aa745b614 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 29 Sep 2014 10:01:35 -0400
Subject: [PATCH] Merge branch 'ticket/192' into develop
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 60 +++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index fb5db71..1033637 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;
@@ -23,28 +22,32 @@
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.transport.DaemonClient;
import org.eclipse.jgit.transport.resolver.FileResolver;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
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.SshDaemonClient;
/**
* 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;
}
/**
@@ -54,40 +57,55 @@
public Repository open(final X req, final String name)
throws RepositoryNotFoundException, ServiceNotEnabledException {
Repository repo = super.open(req, name);
- // XXX Set repository name for the pack factories
+
+ // 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.
- repo.getConfig().setString("gitblit", null, "repositoryName", name);
+ if (req instanceof HttpServletRequest) {
+ // http/https request
+ HttpServletRequest client = (HttpServletRequest) req;
+ client.setAttribute("gitblitRepositoryName", name);
+ } else if (req instanceof GitDaemonClient) {
+ // git request
+ GitDaemonClient client = (GitDaemonClient) req;
+ client.setRepositoryName(name);
+ } else if (req instanceof SshDaemonClient) {
+ SshDaemonClient client = (SshDaemonClient) req;
+ client.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);
+ UserModel user = UserModel.ANONYMOUS;
String scheme = null;
- UserModel user = null;
String origin = null;
-
- if (req instanceof DaemonClient) {
+
+ if (req instanceof GitDaemonClient) {
// git daemon request
// this is an anonymous/unauthenticated protocol
- DaemonClient client = (DaemonClient) req;
+ GitDaemonClient client = (GitDaemonClient) req;
scheme = "git";
origin = client.getRemoteAddress().toString();
- user = UserModel.ANONYMOUS;
} else if (req instanceof HttpServletRequest) {
// http/https request
- HttpServletRequest httpRequest = (HttpServletRequest) req;
- scheme = httpRequest.getScheme();
- origin = httpRequest.getRemoteAddr();
- user = GitBlit.self().authenticate(httpRequest);
+ HttpServletRequest client = (HttpServletRequest) req;
+ scheme = client.getScheme();
+ origin = client.getRemoteAddr();
+ user = gitblit.authenticate(client);
if (user == null) {
user = UserModel.ANONYMOUS;
}
+ } else if (req instanceof SshDaemonClient) {
+ // ssh is always authenticated
+ SshDaemonClient client = (SshDaemonClient) req;
+ user = client.getUser();
}
if (user.canClone(model)) {
@@ -96,7 +114,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