From aaecd8f2a36d2c0d780b42425aa57725fe708551 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] Move cache to IKeyManager and implement isStale() in FileKeyManager --- src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java b/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java index 4f61047..66fe057 100644 --- a/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java +++ b/src/main/java/com/gitblit/transport/ssh/SshSessionFactory.java @@ -27,8 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.gitblit.utils.IdGenerator; - /** * @@ -39,10 +37,7 @@ private final Logger log = LoggerFactory.getLogger(getClass()); - private final IdGenerator idGenerator; - - public SshSessionFactory(IdGenerator idGenerator) { - this.idGenerator = idGenerator; + public SshSessionFactory() { } @Override @@ -57,21 +52,21 @@ } } - final GitblitServerSession s = (GitblitServerSession) super + final GitblitServerSession session = (GitblitServerSession) super .createSession(io); SocketAddress peer = io.getRemoteAddress(); - SshSession session = new SshSession(idGenerator.next(), peer); - s.setAttribute(SshSession.KEY, session); + SshDaemonClient client = new SshDaemonClient(peer); + session.setAttribute(SshDaemonClient.KEY, client); // TODO(davido): Log a session close without authentication as a // failure. - s.addCloseSessionListener(new SshFutureListener<CloseFuture>() { + session.addCloseSessionListener(new SshFutureListener<CloseFuture>() { @Override public void operationComplete(CloseFuture future) { log.info("connection closed on " + io); } }); - return s; + return session; } @Override -- Gitblit v1.9.1