From 1501a6774ebcb427c50e740f2c4b36f4b8967782 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Oct 2014 09:55:10 -0400
Subject: [PATCH] Merge release 1.6.2
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 0804819..1033637 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -31,7 +31,7 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.transport.git.GitDaemonClient;
-import com.gitblit.transport.ssh.SshSession;
+import com.gitblit.transport.ssh.SshDaemonClient;
/**
* Resolves repositories and grants export access.
@@ -69,9 +69,9 @@
// git request
GitDaemonClient client = (GitDaemonClient) req;
client.setRepositoryName(name);
- } else if (req instanceof SshSession) {
- SshSession s = (SshSession)req;
- s.setRepositoryName(name);
+ } else if (req instanceof SshDaemonClient) {
+ SshDaemonClient client = (SshDaemonClient) req;
+ client.setRepositoryName(name);
}
return repo;
}
@@ -83,8 +83,8 @@
protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException {
RepositoryModel model = gitblit.getRepositoryModel(repositoryName);
+ UserModel user = UserModel.ANONYMOUS;
String scheme = null;
- UserModel user = null;
String origin = null;
if (req instanceof GitDaemonClient) {
@@ -93,22 +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 = gitblit.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 SshSession) {
- SshSession s = (SshSession) req;
- user = gitblit.authenticate(s);
- if (user == null) {
- throw new IOException(String.format("User %s not found", s.getRemoteUser()));
- }
+ } else if (req instanceof SshDaemonClient) {
+ // ssh is always authenticated
+ SshDaemonClient client = (SshDaemonClient) req;
+ user = client.getUser();
}
if (user.canClone(model)) {
--
Gitblit v1.9.1