From 44e2ee1d05a9d455ae60dd64058b31f006d551b7 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] Revise SSH public key integration with AuthenticationManager
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index c859f6f..ad5dcf0 100644
--- a/src/main/java/com/gitblit/git/RepositoryResolver.java
+++ b/src/main/java/com/gitblit/git/RepositoryResolver.java
@@ -30,6 +30,7 @@
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;
/**
@@ -103,11 +104,9 @@
user = UserModel.ANONYMOUS;
}
} else if (req instanceof SshSession) {
+ // ssh is always authenticated
SshSession s = (SshSession) req;
- user = gitblit.authenticate(s);
- if (user == null) {
- throw new IOException(String.format("User %s not found", s.getRemoteUser()));
- }
+ user = gitblit.getUserModel(s.getRemoteUser());
}
if (user.canClone(model)) {
--
Gitblit v1.9.1