From f1f303660b21f7a8492e283ff120bc6623f4cb01 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 Feb 2015 10:02:14 -0500
Subject: [PATCH] issue-527: Synchronize changes from upstream Bugtraq
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 87795c0..1033637 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -27,10 +27,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.ISessionManager;
+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.
@@ -42,17 +43,11 @@
private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class);
- private final ISessionManager sessionManager;
+ private final IGitblit gitblit;
- private final IRepositoryManager repositoryManager;
-
- public RepositoryResolver(
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
-
- super(repositoryManager.getRepositoriesFolder(), true);
- this.sessionManager = sessionManager;
- this.repositoryManager = repositoryManager;
+ public RepositoryResolver(IGitblit gitblit) {
+ super(gitblit.getRepositoriesFolder(), true);
+ this.gitblit = gitblit;
}
/**
@@ -74,6 +69,9 @@
// git request
GitDaemonClient client = (GitDaemonClient) req;
client.setRepositoryName(name);
+ } else if (req instanceof SshDaemonClient) {
+ SshDaemonClient client = (SshDaemonClient) req;
+ client.setRepositoryName(name);
}
return repo;
}
@@ -83,10 +81,10 @@
*/
@Override
protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException {
- RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
+ RepositoryModel model = gitblit.getRepositoryModel(repositoryName);
+ UserModel user = UserModel.ANONYMOUS;
String scheme = null;
- UserModel user = null;
String origin = null;
if (req instanceof GitDaemonClient) {
@@ -95,16 +93,19 @@
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 = sessionManager.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)) {
--
Gitblit v1.9.1