From b5361179d924eab162e17d7923f60d91cffb2d08 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] Extract key manager interface and implement a file-based key manager
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 87795c0..0804819 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.SshSession;
/**
* 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 SshSession) {
+ SshSession s = (SshSession)req;
+ s.setRepositoryName(name);
}
return repo;
}
@@ -83,7 +81,7 @@
*/
@Override
protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException {
- RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
+ RepositoryModel model = gitblit.getRepositoryModel(repositoryName);
String scheme = null;
UserModel user = null;
@@ -101,10 +99,16 @@
HttpServletRequest httpRequest = (HttpServletRequest) req;
scheme = httpRequest.getScheme();
origin = httpRequest.getRemoteAddr();
- user = sessionManager.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()));
+ }
}
if (user.canClone(model)) {
--
Gitblit v1.9.1