Updated Branches: refs/heads/master 25995ffe4 -> a49dee379
[SSHD-195] Fix welcome banner implementation Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5bb83665 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5bb83665 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5bb83665 Branch: refs/heads/master Commit: 5bb836651ad5e805fd367f375a574f92d2085776 Parents: 25995ff Author: Guillaume Nodet <[email protected]> Authored: Wed Jul 17 09:00:49 2013 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Wed Jul 17 09:00:49 2013 +0200 ---------------------------------------------------------------------- .../apache/sshd/server/session/ServerSession.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb83665/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java index eead762..f095ed7 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java @@ -66,7 +66,6 @@ public class ServerSession extends AbstractSession { private boolean allowMoreSessions = true; private final AgentForwardSupport agentForward; private final X11ForwardSupport x11Forward; - private String welcomeBanner = null; private HandshakingUserAuth currentAuth; @@ -79,7 +78,6 @@ public class ServerSession extends AbstractSession { idleTimeout = getIntProperty(ServerFactoryManager.IDLE_TIMEOUT, idleTimeout); agentForward = new AgentForwardSupport(this); x11Forward = new X11ForwardSupport(this); - welcomeBanner = factoryManager.getProperties().get(ServerFactoryManager.WELCOME_BANNER); log.info("Session created from {}", ioSession.getRemoteAddress()); sendServerIdentification(); sendKexInit(); @@ -405,12 +403,6 @@ public class ServerSession extends AbstractSession { } else { log.debug("Unsupported authentication method '{}'", method); - if (welcomeBanner != null) { - buffer = createBuffer(SshConstants.Message.SSH_MSG_USERAUTH_BANNER, 0); - buffer.putString(welcomeBanner); - buffer.putString("\n"); - writePacket(buffer); - } } } else { try { @@ -451,6 +443,14 @@ public class ServerSession extends AbstractSession { } } + String welcomeBanner = factoryManager.getProperties().get(ServerFactoryManager.WELCOME_BANNER); + if (welcomeBanner != null) { + buffer = createBuffer(SshConstants.Message.SSH_MSG_USERAUTH_BANNER, 0); + buffer.putString(welcomeBanner); + buffer.putString("\n"); + writePacket(buffer); + } + buffer = createBuffer(SshConstants.Message.SSH_MSG_USERAUTH_SUCCESS, 0); writePacket(buffer); setState(State.Running);
