From 4ccdfe90b73c140b330b9f7838d6cb580c98229a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:07 -0400
Subject: [PATCH] Refer to receive pack client requests as 'client'
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 39d1f39..0804819 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -27,9 +27,11 @@
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.
@@ -41,9 +43,9 @@
private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class);
- private final Gitblit gitblit;
+ private final IGitblit gitblit;
- public RepositoryResolver(Gitblit gitblit) {
+ public RepositoryResolver(IGitblit gitblit) {
super(gitblit.getRepositoriesFolder(), true);
this.gitblit = gitblit;
}
@@ -67,6 +69,9 @@
// git request
GitDaemonClient client = (GitDaemonClient) req;
client.setRepositoryName(name);
+ } else if (req instanceof SshSession) {
+ SshSession s = (SshSession)req;
+ s.setRepositoryName(name);
}
return repo;
}
@@ -98,6 +103,12 @@
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()));
+ }
}
if (user.canClone(model)) {
--
Gitblit v1.9.1