From ed552ba47c02779c270ffd62841d6d1048dade70 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 22 Nov 2015 14:37:16 -0500 Subject: [PATCH] Merge branch 'develop' --- src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java index c4e69dc..e9e2d7e 100644 --- a/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java +++ b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java @@ -17,7 +17,7 @@ import java.util.Locale; -import org.apache.sshd.server.PasswordAuthenticator; +import org.apache.sshd.server.auth.password.PasswordAuthenticator; import org.apache.sshd.server.session.ServerSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,13 +51,13 @@ } username = username.toLowerCase(Locale.US); - UserModel user = authManager.authenticate(username, password.toCharArray()); + UserModel user = authManager.authenticate(username, password.toCharArray(), null); if (user != null) { client.setUser(user); return true; } - log.warn("could not authenticate {} for SSH using the supplied password", username); + log.warn("could not authenticate {} ({}) for SSH using the supplied password", username, client.getRemoteAddress()); return false; } } -- Gitblit v1.9.1