From a8dd379bc357c64d1128bc6790e681e27387dbee 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] Rename & simplify SshSession->SshDaemonClient
---
src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
index 044d264..3631922 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshKeyAuthenticator.java
@@ -43,7 +43,7 @@
protected final Logger log = LoggerFactory.getLogger(getClass());
protected final IKeyManager keyManager;
-
+
protected final IAuthenticationManager authManager;
LoadingCache<String, List<PublicKey>> sshKeyCache = CacheBuilder
@@ -65,9 +65,9 @@
@Override
public boolean authenticate(String username, final PublicKey suppliedKey,
final ServerSession session) {
- final SshSession client = session.getAttribute(SshSession.KEY);
+ final SshDaemonClient client = session.getAttribute(SshDaemonClient.KEY);
- if (client.getRemoteUser() != null) {
+ if (client.getUser() != null) {
// TODO why do we re-authenticate?
log.info("{} has already authenticated!", username);
return true;
@@ -85,7 +85,7 @@
if (key.equals(suppliedKey)) {
UserModel user = authManager.authenticate(username, key);
if (user != null) {
- client.authenticationSuccess(username);
+ client.setUser(user);
return true;
}
}
--
Gitblit v1.9.1