From 03223516b32758fe9d5602ffb4ce10a8a308f0e9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Fri, 18 Sep 2015 14:30:07 -0400
Subject: [PATCH] Merge pull request #908 from mrjoel/mrjoel-authrequestnotsession
---
src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java b/src/main/java/com/gitblit/transport/ssh/UsernamePasswordAuthenticator.java
index 861bc22..a6d77ec 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;
@@ -26,6 +26,8 @@
import com.gitblit.models.UserModel;
/**
+ *
+ * Authenticates an SSH session with username/password credentials.
*
* @author James Moger
*
@@ -55,7 +57,7 @@
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